Skip to content

Commit d77ba33

Browse files
committed
jquery.com: Merge blog.jquery.com theme into base and jquery.com
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
1 parent e535964 commit d77ba33

File tree

11 files changed

+159
-496
lines changed

11 files changed

+159
-496
lines changed

sites.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function jquery_sites() {
3030
'blogdescription' => 'New Wave JavaScript',
3131
'jquery_author' => 'jQuery Team - jquery.com',
3232
'jquery_description' => 'jQuery: The Write Less, Do More, JavaScript Library',
33-
'stylesheet' => 'blog.jquery.com',
33+
'stylesheet' => 'jquery.com',
3434
'jquery_body_class' => 'jquery',
3535
'permalink_structure' => '/%year%/%monthnum%/%day%/%postname%/',
3636
'jquery_is_blog' => true,

themes/blog.jquery.com/i/favicon.ico

-17.7 KB
Binary file not shown.

themes/blog.jquery.com/style.css

-169
This file was deleted.
File renamed without changes.

themes/jquery.com/style.css

+134-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
Theme Name: jquery-com
33
Template: jquery
4+
Description: Theme for jquery.com and blog.jquery.com
45
*/
56

6-
77
a,
88
.title {
99
color: #b24926;
@@ -197,3 +197,136 @@ a,
197197
padding-left: 10%;
198198
padding-right: 10%;
199199
}
200+
201+
/* Blog comments */
202+
203+
#comments-title,
204+
#content h2#comments-title {
205+
margin-top: 2.6em;
206+
text-transform: uppercase;
207+
}
208+
.nopassword,
209+
.nocomments {
210+
font-size: 24px;
211+
font-weight: 100;
212+
margin: 26px 0;
213+
}
214+
.commentlist {
215+
list-style: none;
216+
margin: 0 auto;
217+
}
218+
.content .commentlist {
219+
width: 100%; /* reset the width for the one-column layout */
220+
}
221+
#comments .commentlist > li.comment {
222+
background: #f6f6f6;
223+
border: 1px solid #ddd;
224+
border-radius: 3px;
225+
margin: 0 0 1em 60px;
226+
padding: 5px 12px 0;
227+
position: relative;
228+
word-wrap: break-word;
229+
}
230+
#comments .commentlist > li.pingback {
231+
margin: 0 0 1em 60px;
232+
padding: 0;
233+
}
234+
.comment-meta .fn {
235+
font-style: normal;
236+
font-weight: bold;
237+
}
238+
.comment-meta {
239+
color: #666;
240+
font-size: 12px;
241+
line-height: 2.2em;
242+
}
243+
#comments .commentlist > li.bypostauthor {
244+
border-color: #0769ad; /* jQuery Primary Blue */
245+
}
246+
#comments .commentlist > li.bypostauthor .comment-meta {
247+
background: #ddd;
248+
border-radius: 3px 3px 0 0;
249+
color: inherit;
250+
margin: -5px -12px 5px -12px;
251+
padding: 5px 12px;
252+
}
253+
.commentlist .avatar {
254+
border-radius: 3px;
255+
box-shadow: 0 1px 2px #ccc;
256+
left: -82px;
257+
padding: 0;
258+
position: absolute;
259+
top: 0;
260+
}
261+
a.comment-reply-link {
262+
background: #eee;
263+
border-radius: 3px;
264+
color: #666;
265+
display: inline-block;
266+
font-size: 12px;
267+
padding: 0 8px;
268+
text-decoration: none;
269+
}
270+
a.comment-reply-link:hover,
271+
a.comment-reply-link:focus,
272+
a.comment-reply-link:active {
273+
background: #888;
274+
color: #fff;
275+
}
276+
a.comment-reply-link > span {
277+
display: inline-block;
278+
position: relative;
279+
top: -1px;
280+
}
281+
282+
/* Blog comment form */
283+
284+
#respond {
285+
background: #f6f6f6;
286+
border: 1px solid #ddd;
287+
border-radius: 3px;
288+
margin: 0 0 1.625em;
289+
padding: 1.625em;
290+
}
291+
#respond form {
292+
padding: 0;
293+
}
294+
#respond p {
295+
margin: 10px 0;
296+
}
297+
#respond .comment-notes,
298+
#respond .logged-in-as,
299+
#respond label {
300+
font-size: 12px;
301+
}
302+
#respond label {
303+
line-height: 2.2em;
304+
}
305+
#respond .comment-form-comment label {
306+
display: block;
307+
}
308+
#respond .required {
309+
color: #bd3500;
310+
font-weight: bold;
311+
}
312+
#respond input[type="text"],
313+
#respond textarea {
314+
background: #fff;
315+
border-radius: 5px;
316+
padding: 10px;
317+
}
318+
#respond textarea {
319+
resize: vertical;
320+
width: 95%;
321+
}
322+
#respond input[type=text] {
323+
display: block;
324+
height: 24px;
325+
width: 75%;
326+
}
327+
#respond .form-submit {
328+
text-align: right;
329+
}
330+
#respond input[type=submit] {
331+
float: none;
332+
}

themes/jquery/css/base.css

+19-1
Original file line numberDiff line numberDiff line change
@@ -1954,7 +1954,8 @@ footer .books li a cite {
19541954
text-decoration: none;
19551955
}
19561956

1957-
.entry-meta {
1957+
.entry-meta,
1958+
.entry-posted {
19581959
color: #999;
19591960
font-size: 12px;
19601961
}
@@ -1982,6 +1983,23 @@ footer .books li a cite {
19821983
margin-bottom: 0.75em;
19831984
}
19841985

1986+
/* WordPress requirements for theme and content */
1987+
1988+
.assistive-text,
1989+
.screen-reader-text {
1990+
position: absolute !important;
1991+
clip: rect(1px, 1px, 1px, 1px);
1992+
overflow: hidden;
1993+
height: 1px;
1994+
width: 1px;
1995+
}
1996+
.alignright {
1997+
float: right;
1998+
}
1999+
.alignleft {
2000+
float: left;
2001+
}
2002+
19852003
/* Listing Pages (categories, searches, etc.)
19862004
========================================================================== */
19872005

0 commit comments

Comments
 (0)