Skip to content

Commit

Permalink
jquery.com: Merge blog.jquery.com theme into base and jquery.com
Browse files Browse the repository at this point in the history
The remaining differences are tiny and this way we avoid having
to rename the active theme, which makes both staging the deployment,
and the actual deployment, easier.

Settle some blog utilities in places that we can reuse across
all three of blog.jquery.com, blog.jqueryui.com,
and blog.jquerymobile.com:

* Move sidebar.php to theme/jquery/sidebar-blogpost.php.
  This is the same for all three sites and can be a boolean toggle
  instead.

* Move single.php to theme/jquery.com/
  This was already previously abstracted as single-blogpost.php
  in the base theme, so this is only a stub file to load that.

  Given that there are no blog posts on jquery.com itself,
  this is safe to put in the jquery.com theme and thus have the
  two be shared. If there were to be blog posts there at some point,
  this would naturally be the appropiate way to style them anyway.

  The only site that can't easily be shared is api.jquery.com, given
  that it structures its API pages as single "posts", thus needing
  at least something somewhere to make sure single.php renders like
  an API page instead of dated blog post.

Remove twentyeleven remnants:

* Remove sidebar-footer.php. There are no `get_sidebar( 'footer' )`
  calls in this repo. This was a leftover from the twentyeleven
  theme.
* Remove redundant copy of license.txt, already in the top of the repo.
* Remove readme.txt, specific to Twenty Eleven.

Ref jquery/infrastructure-puppet#17
  • Loading branch information
Krinkle committed Apr 17, 2024
1 parent e535964 commit d77ba33
Show file tree
Hide file tree
Showing 11 changed files with 159 additions and 496 deletions.
2 changes: 1 addition & 1 deletion sites.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function jquery_sites() {
'blogdescription' => 'New Wave JavaScript',
'jquery_author' => 'jQuery Team - jquery.com',
'jquery_description' => 'jQuery: The Write Less, Do More, JavaScript Library',
'stylesheet' => 'blog.jquery.com',
'stylesheet' => 'jquery.com',
'jquery_body_class' => 'jquery',
'permalink_structure' => '/%year%/%monthnum%/%day%/%postname%/',
'jquery_is_blog' => true,
Expand Down
Binary file removed themes/blog.jquery.com/i/favicon.ico
Binary file not shown.
169 changes: 0 additions & 169 deletions themes/blog.jquery.com/style.css

This file was deleted.

File renamed without changes.
135 changes: 134 additions & 1 deletion themes/jquery.com/style.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
Theme Name: jquery-com
Template: jquery
Description: Theme for jquery.com and blog.jquery.com
*/


a,
.title {
color: #b24926;
Expand Down Expand Up @@ -197,3 +197,136 @@ a,
padding-left: 10%;
padding-right: 10%;
}

/* Blog comments */

#comments-title,
#content h2#comments-title {
margin-top: 2.6em;
text-transform: uppercase;
}
.nopassword,
.nocomments {
font-size: 24px;
font-weight: 100;
margin: 26px 0;
}
.commentlist {
list-style: none;
margin: 0 auto;
}
.content .commentlist {
width: 100%; /* reset the width for the one-column layout */
}
#comments .commentlist > li.comment {
background: #f6f6f6;
border: 1px solid #ddd;
border-radius: 3px;
margin: 0 0 1em 60px;
padding: 5px 12px 0;
position: relative;
word-wrap: break-word;
}
#comments .commentlist > li.pingback {
margin: 0 0 1em 60px;
padding: 0;
}
.comment-meta .fn {
font-style: normal;
font-weight: bold;
}
.comment-meta {
color: #666;
font-size: 12px;
line-height: 2.2em;
}
#comments .commentlist > li.bypostauthor {
border-color: #0769ad; /* jQuery Primary Blue */
}
#comments .commentlist > li.bypostauthor .comment-meta {
background: #ddd;
border-radius: 3px 3px 0 0;
color: inherit;
margin: -5px -12px 5px -12px;
padding: 5px 12px;
}
.commentlist .avatar {
border-radius: 3px;
box-shadow: 0 1px 2px #ccc;
left: -82px;
padding: 0;
position: absolute;
top: 0;
}
a.comment-reply-link {
background: #eee;
border-radius: 3px;
color: #666;
display: inline-block;
font-size: 12px;
padding: 0 8px;
text-decoration: none;
}
a.comment-reply-link:hover,
a.comment-reply-link:focus,
a.comment-reply-link:active {
background: #888;
color: #fff;
}
a.comment-reply-link > span {
display: inline-block;
position: relative;
top: -1px;
}

/* Blog comment form */

#respond {
background: #f6f6f6;
border: 1px solid #ddd;
border-radius: 3px;
margin: 0 0 1.625em;
padding: 1.625em;
}
#respond form {
padding: 0;
}
#respond p {
margin: 10px 0;
}
#respond .comment-notes,
#respond .logged-in-as,
#respond label {
font-size: 12px;
}
#respond label {
line-height: 2.2em;
}
#respond .comment-form-comment label {
display: block;
}
#respond .required {
color: #bd3500;
font-weight: bold;
}
#respond input[type="text"],
#respond textarea {
background: #fff;
border-radius: 5px;
padding: 10px;
}
#respond textarea {
resize: vertical;
width: 95%;
}
#respond input[type=text] {
display: block;
height: 24px;
width: 75%;
}
#respond .form-submit {
text-align: right;
}
#respond input[type=submit] {
float: none;
}
20 changes: 19 additions & 1 deletion themes/jquery/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -1954,7 +1954,8 @@ footer .books li a cite {
text-decoration: none;
}

.entry-meta {
.entry-meta,
.entry-posted {
color: #999;
font-size: 12px;
}
Expand Down Expand Up @@ -1982,6 +1983,23 @@ footer .books li a cite {
margin-bottom: 0.75em;
}

/* WordPress requirements for theme and content */

.assistive-text,
.screen-reader-text {
position: absolute !important;
clip: rect(1px, 1px, 1px, 1px);
overflow: hidden;
height: 1px;
width: 1px;
}
.alignright {
float: right;
}
.alignleft {
float: left;
}

/* Listing Pages (categories, searches, etc.)
========================================================================== */

Expand Down
Loading

0 comments on commit d77ba33

Please sign in to comment.