From 6c808113feba9f10b97c60e2c5ff1ffdc4a104cc Mon Sep 17 00:00:00 2001 From: Lance Willett Date: Wed, 9 Oct 2013 21:41:54 +0000 Subject: [PATCH] Twenty Fourteen: merge recent stylesheet changes to RTL, and file miscellaneous CSS cleanup. RTL still needs more responsive fixes, see #25332 -- and a11y menu fixes, see #25054. git-svn-id: https://develop.svn.wordpress.org/trunk@25749 602fd350-edb4-49c9-b593-d223f7449a82 --- .../themes/twentyfourteen/editor-style.css | 6 +- .../twentyfourteen/inc/custom-header.php | 2 +- src/wp-content/themes/twentyfourteen/rtl.css | 118 ++++++++++-------- .../themes/twentyfourteen/style.css | 66 +++++----- 4 files changed, 104 insertions(+), 88 deletions(-) diff --git a/src/wp-content/themes/twentyfourteen/editor-style.css b/src/wp-content/themes/twentyfourteen/editor-style.css index 7eea182836..3c67e3b5d2 100644 --- a/src/wp-content/themes/twentyfourteen/editor-style.css +++ b/src/wp-content/themes/twentyfourteen/editor-style.css @@ -151,9 +151,9 @@ pre { font-size: 15px; line-height: 1.6; margin-bottom: 24px; - padding: 12px; - overflow: auto; max-width: 100%; + overflow: auto; + padding: 12px; } blockquote, @@ -385,7 +385,7 @@ img { } .mceTemp + ul, -.mceTemp + ol { +.mceTemp + ol { list-style-position: inside; } diff --git a/src/wp-content/themes/twentyfourteen/inc/custom-header.php b/src/wp-content/themes/twentyfourteen/inc/custom-header.php index 110c349e2e..89b89b6d14 100644 --- a/src/wp-content/themes/twentyfourteen/inc/custom-header.php +++ b/src/wp-content/themes/twentyfourteen/inc/custom-header.php @@ -65,7 +65,7 @@ function twentyfourteen_header_style() { // If the user has set a custom color for the text use that else : ?> - .site-title a { + .site-title a { color: # !important; } diff --git a/src/wp-content/themes/twentyfourteen/rtl.css b/src/wp-content/themes/twentyfourteen/rtl.css index 9676ed994f..feb5f99049 100644 --- a/src/wp-content/themes/twentyfourteen/rtl.css +++ b/src/wp-content/themes/twentyfourteen/rtl.css @@ -30,11 +30,11 @@ li > ol { margin-left: auto; } -blockquote.pull.alignright { +.site-content blockquote.alignright { margin: 7px 0 7px 24px; } -blockquote.pull.alignleft { +.site-content blockquote.alignleft { margin: 7px 24px 7px 0; } @@ -76,13 +76,7 @@ blockquote.pull.alignleft { .search-toggle { float: right; -} - -.genericon-search:before { - margin-right: -8px; - right: 50%; - left: auto; - margin-left: auto; + padding: 25px 0 0 10px; } .search-box .search-field { @@ -143,13 +137,13 @@ blockquote.pull.alignleft { } .more-link .meta-nav, -.more-formatted-posts-link .meta-nav { +..post-format-archive-link .meta-nav { right: 0; left: auto; } .more-link:hover .meta-nav, -.more-formatted-posts-link:hover .meta-nav { +..post-format-archive-link:hover .meta-nav { right: 5px; left: auto; } @@ -190,7 +184,7 @@ blockquote.pull.alignleft { /* =Post Formatted posts column ----------------------------------------------- */ -.ephemera .widget-title:before { +.widget_twentyfourteen_ephemera .widget-title:before { margin-left: 10px; margin-right: auto; } @@ -200,12 +194,14 @@ blockquote.pull.alignleft { ----------------------------------------------- */ img.alignright, -.wp-caption.alignright { +.wp-caption.alignright, +blockquote.alignright { margin: 7px 0 7px 24px; } img.alignleft, -.wp-caption.alignleft { +.wp-caption.alignleft, +blockquote.alignleft { margin: 7px 24px 7px 0; } @@ -223,8 +219,8 @@ img.alignleft, margin-right: auto; } -.post-navigation .nav-previous, -.post-navigation .nav-next, +.post-navigation [rel="prev"], +.post-navigation [rel="next"], .image-navigation .previous-image, .image-navigation .next-image { text-align: right; @@ -249,13 +245,8 @@ img.alignleft, padding-left: 0; } -.comment-author .comment-author-avatar { - right: 0; - left: auto; -} - .comment-author .avatar { - right: 2px; + right: 0; left: auto; } @@ -271,15 +262,29 @@ img.alignleft, } .comment-list .children { - margin-right: 20px; + margin-right: 18px; margin-left: auto; } .comment .comment-respond { - margin-right: 47px; + margin-right: 36px; margin-left: auto; } +.comment-edit-link { + margin-left: 0; + margin-right: 10px; +} + +.comment-edit-link:before { + margin: 3px 0 0 2px; +} + +.comment-reply-link:before, +.comment-reply-login:before { + margin: 3px 0 0 3px; +} + /* =Widgets ----------------------------------------------- */ @@ -319,7 +324,7 @@ img.alignleft, .content-sidebar .widget .children, .content-sidebar .widget .sub-menu { - margin:0 20px 0 0; + margin: 0 20px 0 0; } .content-sidebar .widget .widgets-multi-column-grid li { @@ -327,6 +332,19 @@ img.alignleft, } +/* =Contributor Page +----------------------------------------------- */ + +.contributor-avatar { + float: right; + margin: 0 0 20px 30px; +} + +.contributor-posts-link:before { + margin: -3px -3px -2px 5px; +} + + /* =Media Queries ----------------------------------------------- */ @@ -341,12 +359,11 @@ img.alignleft, @media screen and (min-width: 400px) { .content-area .featured-post:before, .content-area .post-format a:before, - .content-area .post-format + .entry-date a:before, + .content-area .entry-date a:before, .content-area .entry-date a:before, .content-area .byline a:before, .content-area .comments-link a:before, .entry-comment .edit-link a:before, - .attachment .entry-date:before, .content-area .full-size-link a:before, .content-area .parent-post-link a:before { margin: 0 0 0 2px; @@ -373,9 +390,8 @@ img.alignleft, margin: -1px 0 0 3px; } - .content-area .post-format + .entry-date a:before, .content-area .entry-date a:before, - .attachment .entry-date:before { + .attachment span.entry-date:before { margin: 0 0 0 1px; } @@ -401,13 +417,13 @@ img.alignleft, margin: 0 0 0 33.33333333%; } - #content-sidebar { + .content-sidebar { float: left; margin: 0 -30.35714285% 0 0; padding: 36px 0 24px 10px; } - .post-formatted-posts { + .ephemera { float: left; margin: 0 -30.35714285% 0 0; padding: 36px 0 0 10px; @@ -424,14 +440,14 @@ img.alignleft, padding-left: 0; } - .comment-meta, + .comment-metadata, .comment-content { padding-right: 60px; padding-left: 0; } .comments-title, - .nocomments, + .no-comments, .comment-respond, .comments-area article, .comment-list .trackback, @@ -453,8 +469,8 @@ img.alignleft, .full-width .comments-title, .full-width .comment-respond, .full-width .comments-area article, - .full-width .comment-list li.trackback, - .full-width .comment-list li.pingback { + .full-width .comment-list .trackback, + .full-width .comment-list .pingback { padding-left: 6.04307432%; padding-right: 6.04307432%; } @@ -494,11 +510,11 @@ img.alignleft, } .comments-title, - .nocomments, + .no-comments, .comment-respond, .comments-area article, - .comment-list li.trackback, - .comment-list li.pingback, + .comment-list .trackback, + .comment-list .pingback, .post-navigation [rel="prev"], .post-navigation [rel="next"] { padding-left: 12.39493534%; @@ -520,7 +536,7 @@ img.alignleft, padding-left: 0; } - #content-sidebar { + .content-sidebar { padding-top: 72px; } @@ -536,12 +552,12 @@ img.alignleft, padding-right: 11.30926724%; } - blockquote.pull.alignright { + .site-content blockquote.alignright { margin-right: -20%; margin-left: auto; } - blockquote.pull.alignleft { + .site-content blockquote.alignleft { margin-left: -20%; margin-right: auto; } @@ -591,7 +607,7 @@ img.alignleft, } .content-sidebar, - .post-formatted-posts { + .ephemera { margin: 0 -27.31707317% 0 0; } @@ -616,7 +632,7 @@ img.alignleft, } .comments-title, - .nocomments, + .no-comments, .comment-respond, .comments-area article, .comment-list .trackback, @@ -650,22 +666,22 @@ img.alignleft, padding-right: 5.882236%; } - blockquote.pull.alignright { + .site-content blockquote.alignright { margin-right: 0; margin-left: auto; } - blockquote.pull.alignleft { + .site-content blockquote.alignleft { margin-left: 0; margin-right: auto; } - #supplementary { + .site-footer { padding-left: 0; padding-right: 0; } - #supplementary .widget-area { + .site-footer .widget-area { float: right; } } @@ -685,7 +701,7 @@ img.alignleft, } .comments-title, - .nocomments, + .no-comments, .comment-respond, .comments-area article, .comment-list .trackback, @@ -738,12 +754,12 @@ img.alignleft, padding-left: 0; } - blockquote.pull.alignright { + .site-content blockquote.alignright { margin-right: -20%; margin-left: auto; } - blockquote.pull.alignleft { + .site-content blockquote.alignleft { margin-left: -20%; margin-right: auto; } @@ -751,7 +767,7 @@ img.alignleft, @media screen and (min-width: 1230px) { .content-sidebar, - .post-formatted-posts { + .ephemera { padding-left: 0; } diff --git a/src/wp-content/themes/twentyfourteen/style.css b/src/wp-content/themes/twentyfourteen/style.css index 408490a950..5731eb4fbb 100644 --- a/src/wp-content/themes/twentyfourteen/style.css +++ b/src/wp-content/themes/twentyfourteen/style.css @@ -226,9 +226,9 @@ pre { font-size: 15px; line-height: 1.6; margin-bottom: 24px; - padding: 12px; - overflow: auto; max-width: 100%; + overflow: auto; + padding: 12px; } code, kbd, tt, var { font: 15px/1.6 Monaco, Consolas, 'Andale Mono', 'DejaVu Sans Mono', monospace; @@ -474,14 +474,14 @@ input[type="submit"] { .search-toggle:before, .contributor-posts-link:before, .widget_twentyfourteen_ephemera .widget-title:before { - display: inline-block; -webkit-font-smoothing: antialiased; - font-size: 16px; - line-height: 1; + display: inline-block; font-family: 'Genericons'; - text-decoration: inherit; - font-weight: normal; + font-size: 16px; font-style: normal; + font-weight: normal; + line-height: 1; + text-decoration: inherit; vertical-align: top; } @@ -583,15 +583,15 @@ body { } #nav-toggle { background-color: #000; + line-height: 1; padding: 16px; position: absolute; top:0; right: 0; - line-height: 1; } #nav-toggle:before { - content: '\F419'; color: #fff; + content: '\F419'; } #nav-toggle:hover { cursor: pointer; @@ -705,8 +705,8 @@ body { } .primary-navigation ul ul a { padding: 9px 12px; - width: 148px; white-space: normal; + width: 148px; } .primary-navigation ul ul li { } @@ -738,8 +738,8 @@ body { max-width: 474px; } .secondary-navigation a { - display: block; color: #fff; + display: block; font-weight: 700; padding: 7px 0 7px; text-transform: uppercase; @@ -865,7 +865,7 @@ body { clear: both; color: #767676; font-size: 12px; - font-weight:400; + font-weight: 400; line-height: 1.3333333333; } .entry-meta a { @@ -1160,7 +1160,7 @@ footer.entry-meta .entry-title a:hover { margin: 0; } .entry-content .edit-link { - clear:both; + clear: both; display: block; } @@ -1580,12 +1580,12 @@ span > object { padding: 0 10px; } .nav-links { - border-top: 1px solid rgba(0, 0, 0, 0.1); - } + border-top: 1px solid rgba(0, 0, 0, 0.1); +} .post-navigation [rel="prev"], .post-navigation [rel="next"], .image-navigation .previous-image, -.image-navigation .next-image { +.image-navigation .next-image { border-bottom: 1px solid rgba(0, 0, 0, 0.1); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -1602,8 +1602,8 @@ span > object { color: #767676; display: block; font-size: 12px; - line-height: 2; font-weight: 900; + line-height: 2; text-transform: uppercase; } .site-content .post-navigation a, @@ -1772,8 +1772,8 @@ span > object { border: none; } .comment-respond { - padding: 0; margin-bottom: 24px; + padding: 0; } .comment .comment-respond { margin-left: 36px; @@ -1902,8 +1902,8 @@ span > object { } .widget select, .widget iframe { - max-width: 99%; margin-left: 1px; + max-width: 99%; } .widget table:last-child, .widget iframe:last-child, @@ -1913,7 +1913,7 @@ span > object { margin-bottom: 0; } -/* Caledar widget*/ +/* Calendar widget*/ .widget_calendar a { background-color: #24890d; color: #fff; @@ -1957,7 +1957,7 @@ span > object { /* Cloud Widgets */ .wp_widget_tag_cloud div, .widget_tag_cloud div { - word-wrap: break-word; + word-wrap: break-word; } /* RSS Widget */ @@ -2063,14 +2063,14 @@ span > object { padding: 8px 0 9px; } .content-sidebar .widget li:first-child { - border-top: none; + border-top: none; } .content-sidebar .widget .children, .content-sidebar .widget .sub-menu { - margin:0 0 0 20px; + margin: 0 0 0 20px; } .content-sidebar .widget li li { - border-top: none; + border-top: none; padding-bottom: 0; } .content-sidebar .widget_calendar table, @@ -2121,10 +2121,10 @@ span > object { max-width: 474px; } .contributor-avatar { - float: left; - padding: 2px; border: 1px solid rgba(0, 0, 0, 0.1); + float: left; margin: 0 30px 20px 0; + padding: 2px; } .contributor-avatar .avatar { vertical-align: middle; @@ -2184,11 +2184,11 @@ span > object { padding: 0; } .list-view .content-area .entry-title { - font-size: 15px; - font-weight: 900; - line-height: 1.2; - margin-bottom: 6px; - text-transform: none; + font-size: 15px; + font-weight: 900; + line-height: 1.2; + margin-bottom: 6px; + text-transform: none; } .list-view .content-area .entry-meta { background-color: transparent; @@ -2420,7 +2420,7 @@ span > object { margin-left: -168px; } .contributor-summary { - float: left + float: left; } } @@ -2511,8 +2511,8 @@ span > object { background-color: transparent; border-bottom: 0; clear: none; - font-size: 11px; float: left; + font-size: 11px; line-height: 1.6363636363; margin: 0 0 0 -100%; min-height: 100vh;