<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[21401] trunk/wp-content/themes/twentytwelve: Twenty Twelve: CSS and markup improvements for better child theme support, part 1.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21401">21401</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2012-08-02 17:50:52 +0000 (Thu, 02 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: CSS and markup improvements for better child theme support, part 1.
Move all media queries to bottom of document.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvertlcss">trunk/wp-content/themes/twentytwelve/rtl.css</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvestylecss">trunk/wp-content/themes/twentytwelve/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvertlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/rtl.css (21400 => 21401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/rtl.css 2012-08-01 22:58:25 UTC (rev 21400)
+++ trunk/wp-content/themes/twentytwelve/rtl.css 2012-08-02 17:50:52 UTC (rev 21401)
</span><span class="lines">@@ -156,12 +156,6 @@
</span><span class="cx"> margin: 8px 0 8px 24px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (min-width: 600px) {
- .page-template-homepage-php #secondary aside.widget_text img {
- float: right;
- margin: 8px 0 8px 24px;
- }
-}
</del><span class="cx">
</span><span class="cx"> /* =Widget styling
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="lines">@@ -186,4 +180,15 @@
</span><span class="cx"> padding-left: 1.714285714rem;
</span><span class="cx"> text-align: left;
</span><span class="cx"> padding-right: 0;
</span><ins>+}
+
+/* =Media queries
+-------------------------------------------------------------- */
+
+/* Minimum width of 600 pixels. */
+@media screen and (min-width: 600px) {
+ .page-template-homepage-php #secondary aside.widget_text img {
+ float: right;
+ margin: 8px 0 8px 24px;
+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvestylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/style.css (21400 => 21401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/style.css 2012-08-01 22:58:25 UTC (rev 21400)
+++ trunk/wp-content/themes/twentytwelve/style.css 2012-08-02 17:50:52 UTC (rev 21401)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> Author: the WordPress team
</span><span class="cx"> Author URI: http://wordpress.org/
</span><span class="cx"> Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a homepage template with a its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
</span><del>-Version: 0.6
</del><ins>+Version: 0.7
</ins><span class="cx"> License: GNU General Public License v2 or later
</span><span class="cx"> License URI: http://www.gnu.org/licenses/gpl-2.0.html
</span><span class="cx"> Tags: light, gray, white, one-column, two-columns, right-sidebar, flexible-width, responsive-width, custom-background, custom-header, custom-menu, featured-images, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx"> This stylesheet uses rem values with a pixel fallback. The rem
</span><span class="cx"> values (and line heights) are calculated using two variables:
</span><span class="cx">
</span><del>-$rembase: 14;
-$line-height: 24;
</del><ins>+$rembase: 14;
+$line-height: 24;
</ins><span class="cx">
</span><span class="cx"> ---------- Examples
</span><span class="cx">
</span><span class="lines">@@ -200,7 +200,6 @@
</span><span class="cx"> border-radius: 3px;
</span><span class="cx"> box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> .menu-toggle,
</span><span class="cx"> input#searchsubmit,
</span><span class="cx"> article.post-password-required input[type=submit] {
</span><span class="lines">@@ -381,19 +380,6 @@
</span><span class="cx"> padding-top: 1.714285714rem;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><del>-@media screen and (min-width: 600px) {
- #author-avatar {
- float: left;
- margin-top: 8px;
- margin-top: 0.571428571rem;
- }
-}
-@media screen and (min-width: 600px) {
- #author-description {
- float: right;
- width: 80%;
- }
-}
</del><span class="cx"> #author-description p {
</span><span class="cx"> color: #777;
</span><span class="cx"> font-size: 13px;
</span><span class="lines">@@ -437,38 +423,6 @@
</span><span class="cx"> padding: 0 1.714285714rem;
</span><span class="cx"> background-color: #fff;
</span><span class="cx"> }
</span><del>-@media screen and (min-width: 600px) {
- #page {
- margin: 0 auto;
- max-width: 960px;
- max-width: 68.571428571rem;
- overflow: hidden;
- }
-}
-@media screen and (min-width: 960px) {
- body {
- background-color: #e6e6e6;
- }
- body #page {
- padding: 0 40px;
- padding: 0 2.857142857rem;
- margin-top: 48px;
- margin-top: 3.428571429rem;
- margin-bottom: 48px;
- margin-bottom: 3.428571429rem;
- box-shadow: 0 2px 6px rgba(100, 100, 100, 0.3);
- }
- body.custom-background-empty {
- background-color: #fff;
- }
- body.custom-background-empty #page,
- body.custom-background-white #page {
- padding: 0;
- margin-top: 0;
- margin-bottom: 0;
- box-shadow: none;
- }
-}
</del><span class="cx"> #main {
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="lines">@@ -476,30 +430,10 @@
</span><span class="cx"> margin: 24px 0 0;
</span><span class="cx"> margin: 1.714285714rem 0 0;
</span><span class="cx"> }
</span><del>-@media screen and (min-width: 600px) {
- #primary {
- float: left;
- width: 65.104166667%;
- }
-}
-@media screen and (min-width: 600px) {
- body.page-template-full-width-page-php #primary,
- body.page-template-homepage-php #primary,
- body.single-attachment #primary,
- body.full-width #primary {
- width: 100%;
- }
-}
</del><span class="cx"> #secondary {
</span><span class="cx"> margin: 24px 0 0;
</span><span class="cx"> margin: 1.714285714rem 0 0;
</span><span class="cx"> }
</span><del>-@media screen and (min-width: 600px) {
- #secondary {
- float: right;
- width: 26.041666667%;
- }
-}
</del><span class="cx">
</span><span class="cx"> /* Header */
</span><span class="cx"> .site-header {
</span><span class="lines">@@ -510,12 +444,6 @@
</span><span class="cx"> .site-header hgroup h2 {
</span><span class="cx"> text-align: center;
</span><span class="cx"> }
</span><del>-@media screen and (min-width: 600px) {
- .site-header hgroup h1,
- .site-header hgroup h2 {
- text-align: left;
- }
-}
</del><span class="cx"> .site-header hgroup h1 a,
</span><span class="cx"> .site-header hgroup h2 a {
</span><span class="cx"> color: #515151;
</span><span class="lines">@@ -531,13 +459,6 @@
</span><span class="cx"> font-size: 1.714285714rem;
</span><span class="cx"> line-height: 2;
</span><span class="cx"> }
</span><del>-@media screen and (min-width: 600px) {
- .site-header hgroup h1 {
- font-size: 26px;
- font-size: 1.857142857rem;
- line-height: 1.846153846;
- }
-}
</del><span class="cx"> .site-header hgroup h2 {
</span><span class="cx"> font-weight: normal;
</span><span class="cx"> font-size: 13px;
</span><span class="lines">@@ -717,7 +638,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-/* =Basic post styling
</del><ins>+/* =Main content
</ins><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> .entry-meta {
</span><span class="lines">@@ -740,13 +661,6 @@
</span><span class="cx"> header.entry-header .entry-title a {
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><del>-@media screen and (min-width: 600px) {
- header.entry-header .entry-title {
- font-size: 22px;
- font-size: 1.571428571rem;
- line-height: 1.090909091;
- }
-}
</del><span class="cx"> header.entry-header .entry-format {
</span><span class="cx"> margin-top: 24px;
</span><span class="cx"> margin-top: 1.714285714rem;
</span><span class="lines">@@ -995,7 +909,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-/* =Styling for the archive view
</del><ins>+/* =Archives
</ins><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> .archive #content .archive-header,
</span><span class="lines">@@ -1016,7 +930,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-/* =Styling for the single image attachment view
</del><ins>+/* =Single image attachment view
</ins><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> .image-attachment div.attachment {
</span><span class="lines">@@ -1035,7 +949,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-/* =Aside post styling
</del><ins>+/* =Aside post format
</ins><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> article.format-aside h1 {
</span><span class="lines">@@ -1066,9 +980,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-/* =Image post styling
</del><ins>+/* =Post formats
</ins><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><ins>+/* Image posts */
</ins><span class="cx"> article.format-image footer h1 {
</span><span class="cx"> font-size: 13px;
</span><span class="cx"> font-size: 0.928571429rem;
</span><span class="lines">@@ -1081,10 +996,7 @@
</span><span class="cx"> line-height: 2.181818182;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-/* =Link post styling
--------------------------------------------------------------- */
-
</del><ins>+/* Link posts */
</ins><span class="cx"> article.format-link header {
</span><span class="cx"> padding: 0 10px;
</span><span class="cx"> padding: 0 0.714285714rem;
</span><span class="lines">@@ -1110,10 +1022,7 @@
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-/* =Quote post styling
--------------------------------------------------------------- */
-
</del><ins>+/* Quote posts */
</ins><span class="cx"> article.format-quote .entry-content p {
</span><span class="cx"> margin: 0;
</span><span class="cx"> padding-bottom: 24px;
</span><span class="lines">@@ -1132,7 +1041,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-/* =Comment styling
</del><ins>+/* =Comments
</ins><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> #comments-title {
</span><span class="lines">@@ -1289,14 +1198,6 @@
</span><span class="cx"> border-radius: 3px;
</span><span class="cx"> width: 96%;
</span><span class="cx"> }
</span><del>-@media screen and (min-width: 600px) {
- #respond form input[type="text"] {
- width: 46.333333333%;
- }
- #respond form textarea.blog-textarea {
- width: 79.666666667%;
- }
-}
</del><span class="cx"> #respond form p.form-allowed-tags {
</span><span class="cx"> margin: 0;
</span><span class="cx"> font-size: 12px;
</span><span class="lines">@@ -1315,27 +1216,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-/* =Home page template styling
</del><ins>+/* =Homepage template
</ins><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> .page-template-homepage-php #content article {
</span><span class="cx"> border: 0;
</span><span class="cx"> margin-bottom: 0;
</span><span class="cx"> }
</span><del>-@media screen and (min-width: 600px) {
- .page-template-homepage-php #content,
- .page-template-homepage-php article {
- overflow: hidden;
- }
- .page-template-homepage-php.has-post-thumbnail article {
- float: left;
- width: 47.916666667%;
- }
- .entry-page-image {
- float: right;
- width: 47.916666667%;
- }
-}
</del><span class="cx"> .page-template-homepage-php #secondary {
</span><span class="cx"> clear: both;
</span><span class="cx"> float: none;
</span><span class="lines">@@ -1365,23 +1252,9 @@
</span><span class="cx"> margin: 8px 24px 8px 0;
</span><span class="cx"> margin: 0.571428571rem 1.714285714rem 0.571428571rem 0;
</span><span class="cx"> }
</span><del>-@media screen and (min-width: 600px) {
- .page-template-homepage-php #secondary aside {
- float: left;
- width: 51.875%;
- margin-bottom: 24px;
- margin-bottom: 1.714285714rem;
- }
- .page-template-homepage-php #secondary aside:nth-child(even) {
- float: right;
- width: 39.0625%;
- margin: 0 0 24px;
- margin: 0 0 1.714285714rem;
- }
-}
</del><span class="cx">
</span><span class="cx">
</span><del>-/* =Widget styling
</del><ins>+/* =Widgets
</ins><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> .widget ul ul {
</span><span class="lines">@@ -1425,6 +1298,113 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+/* =Media queries
+-------------------------------------------------------------- */
+
+/* Minimum width of 600 pixels. */
+@media screen and (min-width: 600px) {
+ #author-avatar {
+ float: left;
+ margin-top: 8px;
+ margin-top: 0.571428571rem;
+ }
+ #author-description {
+ float: right;
+ width: 80%;
+ }
+ #page {
+ margin: 0 auto;
+ max-width: 960px;
+ max-width: 68.571428571rem;
+ overflow: hidden;
+ }
+ #primary {
+ float: left;
+ width: 65.104166667%;
+ }
+ body.page-template-full-width-page-php #primary,
+ body.page-template-homepage-php #primary,
+ body.single-attachment #primary,
+ body.full-width #primary {
+ width: 100%;
+ }
+ #secondary {
+ float: right;
+ width: 26.041666667%;
+ }
+ .site-header hgroup h1,
+ .site-header hgroup h2 {
+ text-align: left;
+ }
+ .site-header hgroup h1 {
+ font-size: 26px;
+ font-size: 1.857142857rem;
+ line-height: 1.846153846;
+ }
+ header.entry-header .entry-title {
+ font-size: 22px;
+ font-size: 1.571428571rem;
+ line-height: 1.090909091;
+ }
+ #respond form input[type="text"] {
+ width: 46.333333333%;
+ }
+ #respond form textarea.blog-textarea {
+ width: 79.666666667%;
+ }
+ .page-template-homepage-php #content,
+ .page-template-homepage-php article {
+ overflow: hidden;
+ }
+ .page-template-homepage-php.has-post-thumbnail article {
+ float: left;
+ width: 47.916666667%;
+ }
+ .entry-page-image {
+ float: right;
+ width: 47.916666667%;
+ }
+ .page-template-homepage-php #secondary aside {
+ float: left;
+ width: 51.875%;
+ margin-bottom: 24px;
+ margin-bottom: 1.714285714rem;
+ }
+ .page-template-homepage-php #secondary aside:nth-child(even) {
+ float: right;
+ width: 39.0625%;
+ margin: 0 0 24px;
+ margin: 0 0 1.714285714rem;
+ }
+}
+
+/* Minimum width of 960 pixels. */
+@media screen and (min-width: 960px) {
+ body {
+ background-color: #e6e6e6;
+ }
+ body #page {
+ padding: 0 40px;
+ padding: 0 2.857142857rem;
+ margin-top: 48px;
+ margin-top: 3.428571429rem;
+ margin-bottom: 48px;
+ margin-bottom: 3.428571429rem;
+ box-shadow: 0 2px 6px rgba(100, 100, 100, 0.3);
+ }
+ body.custom-background-empty {
+ background-color: #fff;
+ }
+ body.custom-background-empty #page,
+ body.custom-background-white #page {
+ padding: 0;
+ margin-top: 0;
+ margin-bottom: 0;
+ box-shadow: none;
+ }
+}
+
+
</ins><span class="cx"> /* =Print
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>