<!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>[21404] trunk/wp-content/themes/twentytwelve: Twenty Twelve: CSS and markup improvements for better child theme support, part 3.</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/21404">21404</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2012-08-02 19:12:11 +0000 (Thu, 02 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: CSS and markup improvements for better child theme support, part 3. See <a href="http://core.trac.wordpress.org/ticket/21379">#21379</a>.
* Add classes like `.site` and `.site-content` in addition to the set of IDs already present, making things much better for child themes to have more than one generic element like `nav` inside the content container.
* Bump JS version after selector change.
* Move `image-attachment` to `post_class()` output
More exhaustive notes in the ticket on each id and class change.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelve404php">trunk/wp-content/themes/twentytwelve/404.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvearchivephp">trunk/wp-content/themes/twentytwelve/archive.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelveauthorphp">trunk/wp-content/themes/twentytwelve/author.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvecommentsphp">trunk/wp-content/themes/twentytwelve/comments.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvefooterphp">trunk/wp-content/themes/twentytwelve/footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvefullwidthpagephp">trunk/wp-content/themes/twentytwelve/full-width-page.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelveheaderphp">trunk/wp-content/themes/twentytwelve/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvehomepagephp">trunk/wp-content/themes/twentytwelve/homepage.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelveimagephp">trunk/wp-content/themes/twentytwelve/image.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelveindexphp">trunk/wp-content/themes/twentytwelve/index.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvejsthemejs">trunk/wp-content/themes/twentytwelve/js/theme.js</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvepagephp">trunk/wp-content/themes/twentytwelve/page.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvertlcss">trunk/wp-content/themes/twentytwelve/rtl.css</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvesearchphp">trunk/wp-content/themes/twentytwelve/search.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvesinglephp">trunk/wp-content/themes/twentytwelve/single.php</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="trunkwpcontentthemestwentytwelve404php"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/404.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/404.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/404.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>- <div id="primary">
</del><ins>+ <div id="primary" class="site-content">
</ins><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><span class="cx"> <article id="post-0" class="post error404 no-results not-found">
</span><span class="lines">@@ -24,6 +24,6 @@
</span><span class="cx"> </article><!-- #post-0 -->
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><del>- </div><!-- #primary -->
</del><ins>+ </div><!-- #primary .site-content -->
</ins><span class="cx">
</span><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvearchivephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/archive.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/archive.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/archive.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>- <section id="primary">
</del><ins>+ <section id="primary" class="site-content">
</ins><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><span class="cx"> <?php if ( have_posts() ) : ?>
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><del>- </section><!-- #primary -->
</del><ins>+ </section><!-- #primary .site-content -->
</ins><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelveauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/author.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/author.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/author.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>- <section id="primary">
</del><ins>+ <section id="primary" class="site-content">
</ins><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><span class="cx"> <?php if ( have_posts() ) : ?>
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><del>- </section><!-- #primary -->
</del><ins>+ </section><!-- #primary .site-content -->
</ins><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvecommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/comments.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/comments.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/comments.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -21,12 +21,12 @@
</span><span class="cx"> if ( post_password_required() )
</span><span class="cx"> return;
</span><span class="cx"> ?>
</span><del>- <div id="comments">
</del><ins>+<div id="comments" class="comments-area">
</ins><span class="cx">
</span><span class="cx"> <?php // You can start editing here -- including this comment! ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( have_comments() ) : ?>
</span><del>- <h2 id="comments-title">
</del><ins>+ <h2 class="comments-title">
</ins><span class="cx"> <?php
</span><span class="cx"> printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ),
</span><span class="cx"> number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> </ol><!-- .commentlist -->
</span><span class="cx">
</span><span class="cx"> <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
</span><del>- <nav id="comment-nav-below" role="navigation">
</del><ins>+ <nav id="comment-nav-below" class="navigation" role="navigation">
</ins><span class="cx"> <h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', 'twentytwelve' ); ?></h1>
</span><span class="cx"> <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentytwelve' ) ); ?></div>
</span><span class="cx"> <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentytwelve' ) ); ?></div>
</span><span class="lines">@@ -53,4 +53,4 @@
</span><span class="cx">
</span><span class="cx"> <?php comment_form(); ?>
</span><span class="cx">
</span><del>-</div><!-- #comments -->
</del><span class="cx">\ No newline at end of file
</span><ins>+</div><!-- #comments .comments-area -->
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvefooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/footer.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/footer.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/footer.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -9,14 +9,14 @@
</span><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="cx"> */
</span><span class="cx"> ?>
</span><del>- </div><!-- #main -->
</del><ins>+ </div><!-- #main .wrapper -->
</ins><span class="cx"> <footer id="colophon" role="contentinfo">
</span><span class="cx"> <div class="site-info">
</span><span class="cx"> <?php do_action( 'twentytwelve_credits' ); ?>
</span><span class="cx"> <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'twentytwelve' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?></a>
</span><span class="cx"> </div><!-- .site-info -->
</span><span class="cx"> </footer><!-- #colophon -->
</span><del>-</div><!-- #page -->
</del><ins>+</div><!-- #page .site -->
</ins><span class="cx">
</span><span class="cx"> <?php wp_footer(); ?>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvefullwidthpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/full-width-page.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/full-width-page.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/full-width-page.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>- <div id="primary">
</del><ins>+ <div id="primary" class="site-content">
</ins><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="lines">@@ -18,6 +18,6 @@
</span><span class="cx"> <?php endwhile; // end of the loop. ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><del>- </div><!-- #primary -->
</del><ins>+ </div><!-- #primary .site-content -->
</ins><span class="cx">
</span><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> * JavaScript for handling navigation menus and the resized
</span><span class="cx"> * styles for small screen sizes.
</span><span class="cx"> */
</span><del>- wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/theme.js', array( 'jquery' ), '20130320', true );
</del><ins>+ wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/theme.js', array( 'jquery' ), '20120802', true );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Load special font CSS file.
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> global $wp_query;
</span><span class="cx">
</span><span class="cx"> if ( $wp_query->max_num_pages > 1 ) : ?>
</span><del>- <nav id="<?php echo $nav_id; ?>" role="navigation">
</del><ins>+ <nav id="<?php echo $nav_id; ?>" class="navigation" role="navigation">
</ins><span class="cx"> <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
</span><span class="cx"> <div class="nav-previous alignleft"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
</span><span class="cx"> <div class="nav-next alignright"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelveheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/header.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/header.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/header.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -23,14 +23,14 @@
</span><span class="cx"> </head>
</span><span class="cx">
</span><span class="cx"> <body <?php body_class(); ?>>
</span><del>-<div id="page" class="hfeed">
</del><ins>+<div id="page" class="hfeed site">
</ins><span class="cx"> <header id="masthead" class="site-header" role="banner">
</span><span class="cx"> <hgroup>
</span><span class="cx"> <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
</span><span class="cx"> <h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
</span><span class="cx"> </hgroup>
</span><span class="cx">
</span><del>- <nav class="site-navigation main-navigation" role="navigation">
</del><ins>+ <nav class="main-navigation" role="navigation">
</ins><span class="cx"> <h3 class="assistive-text"><?php _e( 'Show navigation', 'twentytwelve' ); ?></h3>
</span><span class="cx"> <div class="skip-link assistive-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a></div>
</span><span class="cx"> <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
</span><span class="lines">@@ -42,4 +42,4 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </header><!-- #masthead -->
</span><span class="cx">
</span><del>- <div id="main">
</del><span class="cx">\ No newline at end of file
</span><ins>+ <div id="main" class="wrapper">
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvehomepagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/homepage.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/homepage.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/homepage.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>- <div id="primary">
</del><ins>+ <div id="primary" class="site-content">
</ins><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> <?php endwhile; // end of the loop. ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><del>- </div><!-- #primary -->
</del><ins>+ </div><!-- #primary .site-content -->
</ins><span class="cx">
</span><span class="cx"> <?php get_sidebar( 'home' ); ?>
</span><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelveimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/image.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/image.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/image.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -9,12 +9,12 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>- <div id="primary" class="image-attachment">
</del><ins>+ <div id="primary" class="site-content">
</ins><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><del>- <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</del><ins>+ <article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
</ins><span class="cx"> <header class="entry-header">
</span><span class="cx"> <h1 class="entry-title"><?php the_title(); ?></h1>
</span><span class="cx">
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </footer><!-- .entry-meta -->
</span><span class="cx">
</span><del>- <nav id="image-navigation" role="navigation">
</del><ins>+ <nav id="image-navigation" class="navigation" role="navigation">
</ins><span class="cx"> <span class="previous-image"><?php previous_image_link( false, __( '&larr; Previous', 'twentytwelve' ) ); ?></span>
</span><span class="cx"> <span class="next-image"><?php next_image_link( false, __( 'Next &rarr;', 'twentytwelve' ) ); ?></span>
</span><span class="cx"> </nav><!-- #image-navigation -->
</span><span class="lines">@@ -97,6 +97,6 @@
</span><span class="cx"> <?php endwhile; // end of the loop. ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><del>- </div><!-- #primary -->
</del><ins>+ </div><!-- #primary .site-content -->
</ins><span class="cx">
</span><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelveindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/index.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/index.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/index.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>- <div id="primary">
</del><ins>+ <div id="primary" class="site-content">
</ins><span class="cx"> <div id="content" role="main">
</span><span class="cx"> <?php if ( have_posts() ) : ?>
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <?php endif; // end have_posts() check ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><del>- </div><!-- #primary -->
</del><ins>+ </div><!-- #primary .site-content -->
</ins><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvejsthemejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/js/theme.js (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/js/theme.js 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/js/theme.js 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -10,8 +10,8 @@
</span><span class="cx"> timeout = false;
</span><span class="cx">
</span><span class="cx"> $.fn.smallMenu = function() {
</span><del>- masthead.find( '.site-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' );
- masthead.find( '.site-navigation h3' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' );
</del><ins>+ masthead.find( '.main-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' );
+ masthead.find( '.main-navigation h3' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' );
</ins><span class="cx">
</span><span class="cx"> $( '.menu-toggle' ).off( 'click' ).click( function() {
</span><span class="cx"> masthead.find( '.menu' ).slideToggle();
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> if ( ! largeWindow.matches ) {
</span><span class="cx"> $.fn.smallMenu();
</span><span class="cx"> } else {
</span><del>- masthead.find( '.site-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' );
- masthead.find( '.site-navigation h3' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' );
</del><ins>+ masthead.find( '.main-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' );
+ masthead.find( '.main-navigation h3' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' );
</ins><span class="cx"> masthead.find( '.menu' ).removeAttr( 'style' );
</span><span class="cx"> }
</span><span class="cx"> }, 200 );
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvepagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/page.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/page.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/page.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>- <div id="primary">
</del><ins>+ <div id="primary" class="site-content">
</ins><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> <?php endwhile; // end of the loop. ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><del>- </div><!-- #primary -->
</del><ins>+ </div><!-- #primary .site-content -->
</ins><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvertlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/rtl.css (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/rtl.css 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/rtl.css 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -24,11 +24,11 @@
</span><span class="cx"> .alignleft {
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><del>-#content .gallery-columns-4 .gallery-item {
</del><ins>+.site-content .gallery-columns-4 .gallery-item {
</ins><span class="cx"> padding-left: 2%;
</span><span class="cx"> padding-right: 0;
</span><span class="cx"> }
</span><del>-#content .gallery-columns-5 .gallery-item {
</del><ins>+.site-content .gallery-columns-5 .gallery-item {
</ins><span class="cx"> padding-left: 2%;
</span><span class="cx"> padding-right: 0;
</span><span class="cx"> }
</span><span class="lines">@@ -117,20 +117,20 @@
</span><span class="cx"> /* =Comment styling
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-#comments article header img {
</del><ins>+.comments-area article header img {
</ins><span class="cx"> float: right;
</span><span class="cx"> }
</span><del>-#comments article header cite,
-#comments article header time {
</del><ins>+.comments-area article header cite,
+.comments-area article header time {
</ins><span class="cx"> margin-right: 85px;
</span><span class="cx"> margin-right: 6.071428571rem;
</span><span class="cx"> margin-left: auto;
</span><span class="cx"> }
</span><del>-#comments article header h4 {
</del><ins>+.comments-area article header h4 {
</ins><span class="cx"> left: 0;
</span><span class="cx"> right: auto;
</span><span class="cx"> }
</span><del>-#comments li.bypostauthor cite span {
</del><ins>+.comments-area li.bypostauthor cite span {
</ins><span class="cx"> margin-right: 5px;
</span><span class="cx"> margin-right: 0.357142857rem;
</span><span class="cx"> margin-left: auto;
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> /* =Home page template styling
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-.page-template-homepage-php #secondary aside.widget_text img {
</del><ins>+.page-template-homepage-php .widget-area .widget_text img {
</ins><span class="cx"> float: right;
</span><span class="cx"> margin: 8px 0 8px 24px;
</span><span class="cx"> }
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> /* =Widget styling
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-.widget ul ul {
</del><ins>+.widget-area .widget ul ul {
</ins><span class="cx"> margin-right: 12px;
</span><span class="cx"> margin-right: 0.857142857rem;
</span><span class="cx"> margin-left: auto;
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx">
</span><span class="cx"> /* Minimum width of 600 pixels. */
</span><span class="cx"> @media screen and (min-width: 600px) {
</span><del>- .page-template-homepage-php #secondary aside.widget_text img {
</del><ins>+ .page-template-homepage-php .widget-area .widget_text img {
</ins><span class="cx"> float: right;
</span><span class="cx"> margin: 8px 0 8px 24px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvesearchphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/search.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/search.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/search.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>- <section id="primary">
</del><ins>+ <section id="primary" class="site-content">
</ins><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><span class="cx"> <?php if ( have_posts() ) : ?>
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><del>- </section><!-- #primary -->
</del><ins>+ </section><!-- #primary .site-content -->
</ins><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvesinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/single.php (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/single.php 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/single.php 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -9,18 +9,18 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>- <div id="primary">
</del><ins>+ <div id="primary" class="site-content">
</ins><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <?php get_template_part( 'content', get_post_format() ); ?>
</span><span class="cx">
</span><del>- <nav id="nav-single">
</del><ins>+ <nav class="nav-single">
</ins><span class="cx"> <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
</span><span class="cx"> <span class="nav-previous"><?php previous_post_link( '%link', __( '<span class="meta-nav">&larr;</span>', 'twentytwelve' ) . ' %title' ); ?></span>
</span><span class="cx"> <span class="nav-next"><?php next_post_link( '%link', '%title ' . __( '<span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></span>
</span><del>- </nav><!-- #nav-single -->
</del><ins>+ </nav><!-- .nav-single -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> // If comments are open or we have at least one comment, load up the comment template
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> <?php endwhile; // end of the loop. ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><del>- </div><!-- #primary -->
</del><ins>+ </div><!-- #primary .site-content -->
</ins><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><span class="cx"> <?php get_footer(); ?>
</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 (21403 => 21404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/style.css 2012-08-02 18:31:14 UTC (rev 21403)
+++ trunk/wp-content/themes/twentytwelve/style.css 2012-08-02 19:12:11 UTC (rev 21404)
</span><span class="lines">@@ -329,17 +329,17 @@
</span><span class="cx"> width: 100%;
</span><span class="cx"> height: auto;
</span><span class="cx"> }
</span><del>-#content .gallery-columns-4 .gallery-item {
</del><ins>+.site-content .gallery-columns-4 .gallery-item {
</ins><span class="cx"> width: 23%;
</span><span class="cx"> padding-right: 2%;
</span><span class="cx"> }
</span><del>-#content .gallery-columns-5 .gallery-item {
</del><ins>+.site-content .gallery-columns-5 .gallery-item {
</ins><span class="cx"> width: 18%;
</span><span class="cx"> padding-right: 2%;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Navigation */
</span><del>-#content nav {
</del><ins>+.site-content nav {
</ins><span class="cx"> clear: both;
</span><span class="cx"> line-height: 2;
</span><span class="cx"> overflow: hidden;
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> text-align: right;
</span><span class="cx"> width: 50%;
</span><span class="cx"> }
</span><del>-#nav-single + #comments,
</del><ins>+.nav-single + .comments-area,
</ins><span class="cx"> #comment-nav-above {
</span><span class="cx"> margin: 48px 0;
</span><span class="cx"> margin: 3.428571429rem 0;
</span><span class="lines">@@ -418,19 +418,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Page structure */
</span><del>-#page {
</del><ins>+.wrapper {
+ overflow: hidden;
+}
+.site {
</ins><span class="cx"> padding: 0 24px;
</span><span class="cx"> padding: 0 1.714285714rem;
</span><span class="cx"> background-color: #fff;
</span><span class="cx"> }
</span><del>-#main {
- overflow: hidden;
-}
-#primary {
</del><ins>+.site-content {
</ins><span class="cx"> margin: 24px 0 0;
</span><span class="cx"> margin: 1.714285714rem 0 0;
</span><span class="cx"> }
</span><del>-#secondary {
</del><ins>+.widget-area {
</ins><span class="cx"> margin: 24px 0 0;
</span><span class="cx"> margin: 1.714285714rem 0 0;
</span><span class="cx"> }
</span><span class="lines">@@ -592,24 +592,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Sidebar */
</span><del>-#secondary aside {
</del><ins>+.widget-area .widget {
</ins><span class="cx"> margin-bottom: 48px;
</span><span class="cx"> margin-bottom: 3.428571429rem;
</span><span class="cx"> }
</span><del>-#secondary aside h3 {
</del><ins>+.widget-area .widget h3 {
</ins><span class="cx"> margin-bottom: 24px;
</span><span class="cx"> margin-bottom: 1.714285714rem;
</span><span class="cx"> }
</span><del>-#secondary aside p,
-#secondary aside li {
</del><ins>+.widget-area .widget p,
+.widget-area .widget li {
</ins><span class="cx"> font-size: 13px;
</span><span class="cx"> font-size: 0.928571429rem;
</span><span class="cx"> line-height: 1.846153846;
</span><span class="cx"> }
</span><del>-#secondary aside a {
</del><ins>+.widget-area .widget a {
</ins><span class="cx"> color: #777;
</span><span class="cx"> }
</span><del>-#secondary aside a:hover {
</del><ins>+.widget-area .widget a:hover {
</ins><span class="cx"> color: #21759b;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -884,7 +884,7 @@
</span><span class="cx"> border-top: 1px solid #ededed;
</span><span class="cx"> padding: 6px 10px 6px 0;
</span><span class="cx"> }
</span><del>-#content article {
</del><ins>+.site-content article {
</ins><span class="cx"> padding-bottom: 24px;
</span><span class="cx"> padding-bottom: 1.714285714rem;
</span><span class="cx"> margin-bottom: 72px;
</span><span class="lines">@@ -912,7 +912,7 @@
</span><span class="cx"> /* =Archives
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-.archive #content .archive-header,
</del><ins>+.archive .site-content .archive-header,
</ins><span class="cx"> .search .page-header {
</span><span class="cx"> margin-bottom: 48px;
</span><span class="cx"> margin-bottom: 3.428571429rem;
</span><span class="lines">@@ -1044,7 +1044,7 @@
</span><span class="cx"> /* =Comments
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-#comments-title {
</del><ins>+.comments-title {
</ins><span class="cx"> margin-bottom: 48px;
</span><span class="cx"> margin-bottom: 3.428571429rem;
</span><span class="cx"> font-size: 16px;
</span><span class="lines">@@ -1052,55 +1052,55 @@
</span><span class="cx"> line-height: 1.5;
</span><span class="cx"> font-weight: normal;
</span><span class="cx"> }
</span><del>-#comments article {
</del><ins>+.comments-area article {
</ins><span class="cx"> margin: 24px 0;
</span><span class="cx"> margin: 1.714285714rem 0;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><del>-#comments article header {
</del><ins>+.comments-area article header {
</ins><span class="cx"> margin: 0 0 48px;
</span><span class="cx"> margin: 0 0 3.428571429rem;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><del>-#comments article header img {
</del><ins>+.comments-area article header img {
</ins><span class="cx"> float: left;
</span><span class="cx"> padding: 0;
</span><span class="cx"> line-height: 0;
</span><span class="cx"> }
</span><del>-#comments article header cite,
-#comments article header time {
</del><ins>+.comments-area article header cite,
+.comments-area article header time {
</ins><span class="cx"> display: block;
</span><span class="cx"> margin-left: 85px;
</span><span class="cx"> margin-left: 6.071428571rem;
</span><span class="cx"> }
</span><del>-#comments article header cite {
</del><ins>+.comments-area article header cite {
</ins><span class="cx"> font-style: normal;
</span><span class="cx"> font-size: 15px;
</span><span class="cx"> font-size: 1.071428571rem;
</span><span class="cx"> line-height: 1.6;
</span><span class="cx"> }
</span><del>-#comments article header time {
</del><ins>+.comments-area article header time {
</ins><span class="cx"> line-height: 1.714285714;
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> font-size: 12px;
</span><span class="cx"> font-size: 0.857142857rem;
</span><span class="cx"> color: #5e5e5e;
</span><span class="cx"> }
</span><del>-#comments article header a {
</del><ins>+.comments-area article header a {
</ins><span class="cx"> text-decoration: none;
</span><span class="cx"> color: #5e5e5e;
</span><span class="cx"> }
</span><del>-#comments article header a:hover {
</del><ins>+.comments-area article header a:hover {
</ins><span class="cx"> color: #21759b;
</span><span class="cx"> }
</span><del>-#comments article header cite a {
</del><ins>+.comments-area article header cite a {
</ins><span class="cx"> color: #444;
</span><span class="cx"> }
</span><del>-#comments article header cite a:hover {
</del><ins>+.comments-area article header cite a:hover {
</ins><span class="cx"> text-decoration: underline;
</span><span class="cx"> }
</span><del>-#comments article header h4 {
</del><ins>+.comments-area article header h4 {
</ins><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span><span class="cx"> right: 0;
</span><span class="lines">@@ -1120,12 +1120,12 @@
</span><span class="cx"> border-radius: 3px;
</span><span class="cx"> border: 1px solid #007cbd;
</span><span class="cx"> }
</span><del>-#comments article p {
</del><ins>+.comments-area article p {
</ins><span class="cx"> margin: 24px 0;
</span><span class="cx"> margin: 1.714285714rem 0;
</span><span class="cx"> line-height: 1.714285714;
</span><span class="cx"> }
</span><del>-#comments li.bypostauthor cite span {
</del><ins>+.comments-area li.bypostauthor cite span {
</ins><span class="cx"> margin-left: 5px;
</span><span class="cx"> margin-left: 0.357142857rem;
</span><span class="cx"> padding: 2px 5px;
</span><span class="lines">@@ -1219,11 +1219,11 @@
</span><span class="cx"> /* =Homepage template
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-.page-template-homepage-php #content article {
</del><ins>+.page-template-homepage-php .site-content article {
</ins><span class="cx"> border: 0;
</span><span class="cx"> margin-bottom: 0;
</span><span class="cx"> }
</span><del>-.page-template-homepage-php #secondary {
</del><ins>+.page-template-homepage-php .widget-area {
</ins><span class="cx"> clear: both;
</span><span class="cx"> float: none;
</span><span class="cx"> width: auto;
</span><span class="lines">@@ -1231,7 +1231,7 @@
</span><span class="cx"> padding-top: 1.714285714rem;
</span><span class="cx"> border-top: 1px solid #ededed;
</span><span class="cx"> }
</span><del>-.page-template-homepage-php #secondary aside li {
</del><ins>+.page-template-homepage-php .widget-area .widget li {
</ins><span class="cx"> margin: 8px 0 0;
</span><span class="cx"> margin: 0.571428571rem 0 0;
</span><span class="cx"> font-size: 13px;
</span><span class="lines">@@ -1241,13 +1241,13 @@
</span><span class="cx"> list-style-type: square;
</span><span class="cx"> list-style-position: inside;
</span><span class="cx"> }
</span><del>-.page-template-homepage-php #secondary aside li a {
</del><ins>+.page-template-homepage-php .widget-area .widget li a {
</ins><span class="cx"> color: #777;
</span><span class="cx"> }
</span><del>-.page-template-homepage-php #secondary aside li a:hover {
</del><ins>+.page-template-homepage-php .widget-area .widget li a:hover {
</ins><span class="cx"> color: #21759b;
</span><span class="cx"> }
</span><del>-.page-template-homepage-php #secondary aside.widget_text img {
</del><ins>+.page-template-homepage-php .widget-area .widget_text img {
</ins><span class="cx"> float: left;
</span><span class="cx"> margin: 8px 24px 8px 0;
</span><span class="cx"> margin: 0.571428571rem 1.714285714rem 0.571428571rem 0;
</span><span class="lines">@@ -1257,7 +1257,7 @@
</span><span class="cx"> /* =Widgets
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-.widget ul ul {
</del><ins>+.widget-area .widget ul ul {
</ins><span class="cx"> margin-left: 12px;
</span><span class="cx"> margin-left: 0.857142857rem;
</span><span class="cx"> }
</span><span class="lines">@@ -1312,23 +1312,23 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 80%;
</span><span class="cx"> }
</span><del>- #page {
</del><ins>+ .site {
</ins><span class="cx"> margin: 0 auto;
</span><span class="cx"> max-width: 960px;
</span><span class="cx"> max-width: 68.571428571rem;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><del>- #primary {
</del><ins>+ .site-content {
</ins><span class="cx"> float: left;
</span><span class="cx"> width: 65.104166667%;
</span><span class="cx"> }
</span><del>- body.page-template-full-width-page-php #primary,
- body.page-template-homepage-php #primary,
- body.single-attachment #primary,
- body.full-width #primary {
</del><ins>+ body.page-template-full-width-page-php .site-content,
+ body.page-template-homepage-php .site-content,
+ body.single-attachment .site-content,
+ body.full-width .site-content {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><del>- #secondary {
</del><ins>+ .widget-area {
</ins><span class="cx"> float: right;
</span><span class="cx"> width: 26.041666667%;
</span><span class="cx"> }
</span><span class="lines">@@ -1352,7 +1352,7 @@
</span><span class="cx"> #respond form textarea.blog-textarea {
</span><span class="cx"> width: 79.666666667%;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php #content,
</del><ins>+ .page-template-homepage-php .site-content,
</ins><span class="cx"> .page-template-homepage-php article {
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="lines">@@ -1364,13 +1364,13 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 47.916666667%;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php #secondary aside {
</del><ins>+ .page-template-homepage-php .widget-area .widget {
</ins><span class="cx"> float: left;
</span><span class="cx"> width: 51.875%;
</span><span class="cx"> margin-bottom: 24px;
</span><span class="cx"> margin-bottom: 1.714285714rem;
</span><span class="cx"> }
</span><del>- .page-template-homepage-php #secondary aside:nth-child(even) {
</del><ins>+ .page-template-homepage-php .widget-area .widget:nth-child(even) {
</ins><span class="cx"> float: right;
</span><span class="cx"> width: 39.0625%;
</span><span class="cx"> margin: 0 0 24px;
</span><span class="lines">@@ -1383,7 +1383,7 @@
</span><span class="cx"> body {
</span><span class="cx"> background-color: #e6e6e6;
</span><span class="cx"> }
</span><del>- body #page {
</del><ins>+ body .site {
</ins><span class="cx"> padding: 0 40px;
</span><span class="cx"> padding: 0 2.857142857rem;
</span><span class="cx"> margin-top: 48px;
</span><span class="lines">@@ -1395,8 +1395,8 @@
</span><span class="cx"> body.custom-background-empty {
</span><span class="cx"> background-color: #fff;
</span><span class="cx"> }
</span><del>- body.custom-background-empty #page,
- body.custom-background-white #page {
</del><ins>+ body.custom-background-empty .site,
+ body.custom-background-white .site {
</ins><span class="cx"> padding: 0;
</span><span class="cx"> margin-top: 0;
</span><span class="cx"> margin-bottom: 0;
</span><span class="lines">@@ -1424,7 +1424,7 @@
</span><span class="cx"> border-radius: 0;
</span><span class="cx"> box-shadow: none;
</span><span class="cx"> }
</span><del>- #page {
</del><ins>+ .site {
</ins><span class="cx"> clear: both !important;
</span><span class="cx"> display: block !important;
</span><span class="cx"> float: none !important;
</span><span class="lines">@@ -1448,23 +1448,23 @@
</span><span class="cx"> img.header-image {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><del>- nav.site-navigation {
</del><ins>+ nav.main-navigation {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><del>- #main {
</del><ins>+ .wrapper {
</ins><span class="cx"> border-top: none;
</span><span class="cx"> box-shadow: none;
</span><span class="cx"> }
</span><del>- #primary {
</del><ins>+ .site-content {
</ins><span class="cx"> float: left;
</span><span class="cx"> margin: 0;
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><del>- #content {
</del><ins>+ .site-content {
</ins><span class="cx"> margin: 0;
</span><span class="cx"> width: auto;
</span><span class="cx"> }
</span><del>- .singular #content {
</del><ins>+ .singular .site-content {
</ins><span class="cx"> margin: 0;
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><span class="lines">@@ -1474,13 +1474,13 @@
</span><span class="cx"> .entry-meta .edit-link a {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><del>- #content nav {
</del><ins>+ .site-content nav {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx"> .singular .entry-header,
</span><span class="cx"> .singular .entry-content,
</span><span class="cx"> .singular footer.entry-meta,
</span><del>- .singular #comments-title {
</del><ins>+ .singular .comments-title {
</ins><span class="cx"> margin: 0;
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><span class="lines">@@ -1508,7 +1508,7 @@
</span><span class="cx"> #respond {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><del>- #secondary {
</del><ins>+ .widget-area {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx"> #colophon {
</span><span class="lines">@@ -1527,8 +1527,8 @@
</span><span class="cx"> top: 2.2em;
</span><span class="cx"> width: 39px;
</span><span class="cx"> }
</span><del>- #comments article header cite,
- #comments article header time {
</del><ins>+ .comments-area article header cite,
+ .comments-area article header time {
</ins><span class="cx"> margin-left: 50px;
</span><span class="cx"> margin-left: 3.57142857rem;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>