From 66beb266a1d5a96f6fc2a2e4c6589def093ff674 Mon Sep 17 00:00:00 2001 From: iandstewart Date: Mon, 30 May 2011 01:29:55 +0000 Subject: [PATCH] Twenty Eleven: bug fixes and enhancements ... * Improvements to the dark color scheme; Props matveb * Remove link colors from the dark color scheme and let the default link color cascade * Check for multiple authors before showing author information on single posts * Remove the span before the edit link on the image template * Add a comment icon; Props hugobaeta * Replace the default reply text with an icon to prevent i18n issues with the design; Props matveb * Don't output sidebar on the no sidebar layout * Use the search form styling from the header for all search forms * Style fixes for no search results page * Fixes for fancy blockquote styles * Style fixes for the showcase slider * Margin for galleries * Only showing the top post navigation on paged results * Remove floats from images for the smallest screen sizes git-svn-id: http://svn.automattic.com/wordpress/trunk@18072 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../themes/twentyeleven/colors/dark.css | 38 +++---- .../themes/twentyeleven/content-single.php | 2 +- wp-content/themes/twentyeleven/image.php | 2 +- .../twentyeleven/images/icon-comment.png | Bin 0 -> 3062 bytes .../themes/twentyeleven/inc/theme-options.php | 7 +- wp-content/themes/twentyeleven/sidebar.php | 6 ++ wp-content/themes/twentyeleven/style.css | 101 ++++++++++++++---- 7 files changed, 111 insertions(+), 45 deletions(-) create mode 100644 wp-content/themes/twentyeleven/images/icon-comment.png diff --git a/wp-content/themes/twentyeleven/colors/dark.css b/wp-content/themes/twentyeleven/colors/dark.css index 5020f5760..8bb86d053 100644 --- a/wp-content/themes/twentyeleven/colors/dark.css +++ b/wp-content/themes/twentyeleven/colors/dark.css @@ -41,10 +41,12 @@ textarea { input[type=text]:focus, textarea:focus { } +input#s { + background-color: #ddd; +} /* Links */ a { - color: #e4741f; } @@ -52,7 +54,7 @@ a { ----------------------------------------------- */ #branding { - border-top: 2px solid #444; + border-top: 2px solid #0a0a0a; } #site-title a { color: #eee; @@ -60,7 +62,6 @@ a { #site-title a:hover, #site-title a:focus, #site-title a:active { - color: #e4741f; } #site-description { color: #858585; @@ -100,7 +101,6 @@ a { .entry-title a:hover, .entry-title a:focus, .entry-title a:active { - color: #e4741f; } .entry-meta { color: #999; @@ -166,16 +166,12 @@ a { /* Comments link */ .entry-header .comments-link a { - background: #111; + background: #1a1a1a; border-color: #222; color: #888; } -.entry-header .comments-link a:hover, -.entry-header .comments-link a:focus, -.entry-header .comments-link a:active { - background: #888; - border-color: #aaa; - color: #000; +.entry-header .comments-link a .leave-reply { + background-position-y: -24px; } /* Singular content styles for Posts and Pages */ @@ -205,6 +201,17 @@ a { } +/* =Image +----------------------------------------------- */ + +.format-image .entry-meta .edit-link a { + color: #ddd; +} +.format-image .entry-meta .edit-link a:hover { + color: #fff; +} + + /* =error404 ----------------------------------------------- */ .error404 #main #searchform { @@ -255,7 +262,6 @@ article.feature-image.small .entry-summary p a { color: #111; } article.feature-image.small .entry-summary p a:hover { - background: #e4741f; color: #40220c; } @@ -308,7 +314,6 @@ section.recent-posts .other-recent-posts a[rel="bookmark"] { color: #ccc; } section.recent-posts .other-recent-posts a[rel="bookmark"]:hover { - color: #e4741f; } section.recent-posts .other-recent-posts .comments-link a, section.recent-posts .other-recent-posts .comments-link > span { @@ -320,8 +325,6 @@ section.recent-posts .other-recent-posts .comments-link > span { color: #777; } section.recent-posts .other-recent-posts .comments-link a:hover { - color: #e4741f; - border-color: #e4741f; } @@ -368,8 +371,6 @@ section.recent-posts .other-recent-posts .comments-link a:hover { color: #777; } .widget_search #searchsubmit:active { - background: #e4741f; - border-color: #f79e5a; -webkit-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1); box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1); @@ -484,7 +485,6 @@ section.recent-posts .other-recent-posts .comments-link a:hover { text-shadow: 0 -1px 0 rgba(0,0,0,0.3); } #respond input#submit:active { - background: #e4741f; color: #40220c; } #respond #cancel-comment-reply-link { @@ -513,7 +513,7 @@ section.recent-posts .other-recent-posts .comments-link a:hover { /* Site Generator Line */ #site-generator { background: #060606; - border-color: #222; + border-color: #000; } diff --git a/wp-content/themes/twentyeleven/content-single.php b/wp-content/themes/twentyeleven/content-single.php index 1311aa927..7900c7434 100644 --- a/wp-content/themes/twentyeleven/content-single.php +++ b/wp-content/themes/twentyeleven/content-single.php @@ -53,7 +53,7 @@ ?> ', '' ); ?> - +
diff --git a/wp-content/themes/twentyeleven/image.php b/wp-content/themes/twentyeleven/image.php index d89b7a380..f5bce65ff 100644 --- a/wp-content/themes/twentyeleven/image.php +++ b/wp-content/themes/twentyeleven/image.php @@ -36,7 +36,7 @@ get_header(); ?> get_the_title( $post->post_parent ) ); ?> - | ', '' ); ?> + ', '' ); ?>
diff --git a/wp-content/themes/twentyeleven/images/icon-comment.png b/wp-content/themes/twentyeleven/images/icon-comment.png new file mode 100644 index 0000000000000000000000000000000000000000..b97b44f01c4be89f428bd1996916ebd78b601b06 GIT binary patch literal 3062 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 Eg3A7=mjD0& literal 0 HcmV?d00001 diff --git a/wp-content/themes/twentyeleven/inc/theme-options.php b/wp-content/themes/twentyeleven/inc/theme-options.php index 213048d14..8e8e49127 100644 --- a/wp-content/themes/twentyeleven/inc/theme-options.php +++ b/wp-content/themes/twentyeleven/inc/theme-options.php @@ -327,9 +327,12 @@ function twentyeleven_print_link_color_style() { section.recent-posts .other-recent-posts .comments-link a:hover { border-color: ; } - article.feature-image.small .entry-summary p a:hover { + article.feature-image.small .entry-summary p a:hover, + .entry-header .comments-link a:hover, + .entry-header .comments-link a:focus, + .entry-header .comments-link a:active { background: ; - } + } + \ No newline at end of file diff --git a/wp-content/themes/twentyeleven/style.css b/wp-content/themes/twentyeleven/style.css index 20860b1af..9ccc42d82 100644 --- a/wp-content/themes/twentyeleven/style.css +++ b/wp-content/themes/twentyeleven/style.css @@ -424,6 +424,8 @@ sup { sub { top: .5ex; } + +/* Forms */ input[type=text], textarea { background: #fafafa; @@ -444,6 +446,18 @@ textarea { input[type=text] { padding: 3px; } +input#s { + background: url(images/search.png) no-repeat 5px 6px; + -moz-border-radius: 2px; + border-radius: 2px; + font-size: 14px; + height: 22px; + line-height: 1.2em; + padding: 4px 10px 4px 28px; +} +input#searchsubmit { + display: none; +} /* Links */ a { @@ -595,14 +609,7 @@ a:hover { margin: 0; } #branding #s { - background: url(images/search.png) no-repeat 5px 6px; - -moz-border-radius: 2px; - border-radius: 2px; float: right; - font-size: 14px; - height: 22px; - line-height: 1.2em; - padding: 4px 10px 4px 28px; -webkit-transition-duration: 400ms; -webkit-transition-property: width, background; -webkit-transition-timing-function: ease; @@ -665,13 +672,15 @@ a:hover { letter-spacing: 0; text-transform: none; } -.hentry { +.hentry, +.no-results { border-bottom: 1px solid #ddd; margin: 0 0 1.625em; padding: 0 0 1.625em; position: relative; } -.hentry:last-child { +.hentry:last-child, +.no-results { border-bottom: none; } .blog .sticky .entry-header .entry-meta { @@ -750,6 +759,9 @@ a:hover { border-top: 1px solid #ddd; padding: 6px 10px 6px 0; } +.entry-content #s { + width: 75%; +} .comment-content ul, .comment-content ol { margin-bottom: 1.625em; @@ -863,7 +875,7 @@ dl.gallery-item { position: absolute; text-align: center; text-decoration: none; - top: 0; + top: .5em; right: 0; width: 48px; height: 48px; @@ -871,16 +883,27 @@ dl.gallery-item { .entry-header .comments-link a:hover, .entry-header .comments-link a:focus, .entry-header .comments-link a:active { - background: #777; - border-color: #555; + background: #1b8be0; + border-color: #1573bb; + border-color: rgba(0,0,0,0.2); color: #fff; + color: rgba(255,255,255,0.8); } .entry-header .comments-link .leave-reply { - font-size: 14px; - font-weight: bold; + background: url(images/icon-comment.png) no-repeat; + color: transparent; + display: inline-block; + font-family: "Arial Unicode MS", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 26px; + height: 24px; + line-height: 12px; + opacity: 0.25; position: relative; - text-transform: lowercase; - top: -1px; + width: 24px; +} +.entry-header .comments-link a:hover .leave-reply { + background-position-y: -24px; + opacity: 0.5; } /* Post Formats Headings @@ -936,15 +959,29 @@ article.format-status .entry-content { top: 0; left: 0; } -.singular blockquote.pull { +blockquote.pull { font-size: 21px; font-weight: bold; line-height: 1.6125em; + margin: 0 0 1.625em; + text-align: center; +} +.singular blockquote.pull { margin: 0 -22.25% 1.625em; } +.pull.alignleft { + margin: 0 1.625em 0 0; + text-align: right; + width: 33%; +} .singular .pull.alignleft { margin: 0 1.625em 0 -22.25%; } +.pull.alignright { + margin: 0 0 0 1.625em; + text-align: left; + width: 33%; +} .singular .pull.alignright { margin: 0 -22.25% 0 1.625em; } @@ -1246,7 +1283,7 @@ article.feature-image.small .entry-summary p a:hover { /* Large featured post */ section.feature-image.large { border: none; - max-height: 300px; + max-height: 288px; padding: 0; width: 100%; } @@ -1290,7 +1327,7 @@ section.feature-image.large img { .featured-posts { border-bottom: 1px solid #e8e8e8; display: block; - height: 340px; + height: 328px; margin: 1.625em -8.9% 20px; max-width: 1000px; padding: 0; @@ -1301,7 +1338,7 @@ section.feature-image.large img { } .featured-posts section.featured-post { background: #fff; - height: 300px; + height: 288px; left: 0; margin: 0; position: absolute; @@ -1309,6 +1346,7 @@ section.feature-image.large img { width: auto; } .featured-posts section.featured-post.large { + max-width: 100%; overflow: hidden; } .featured-posts section.featured-post { @@ -1503,6 +1541,9 @@ p img, left: 10px; top: 7px; } +.gallery { + margin: 0 auto 1.625em !important; +} .gallery-caption { } img#wpstats { @@ -1527,6 +1568,12 @@ img#wpstats { #nav-above { padding: 0 0 1.625em; } +#nav-above { + display: none; +} +.paged #nav-above { + display: block; +} .nav-previous { float: left; width: 50%; @@ -1598,7 +1645,7 @@ img#wpstats { margin: 0 0 1.625em; } .widget_search #s { - width: 58%; + width: 77%; } .widget_search #searchsubmit { background: #ddd; @@ -2076,7 +2123,10 @@ p.comment-form-comment { } /* Simplify the showcase template */ .page-template-showcase-php .featured-posts { - height: 280px; + min-height: 280px; + } + .featured-posts section.featured-post { + height: auto; } .page-template-showcase-php section.recent-posts { float: none; @@ -2186,6 +2236,13 @@ p.comment-form-comment { #branding #searchform { top: 1.625em !important; } + /* Floated content doesn't work well at this size */ + .alignleft, + .alignright { + float: none; + margin-left: 0; + margin-right: 0; + } /* Make sure the post-post navigation doesn't collide with anything */ #nav-single { display: block;