<!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>[26217] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: remove `main-content` element where not necessary, props iamtakashi.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/26217">26217</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-11-15 19:01:00 +0000 (Fri, 15 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: remove `main-content` element where not necessary, props iamtakashi. See <a href="http://core.trac.wordpress.org/ticket/25946">#25946</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteen404php">trunk/src/wp-content/themes/twentyfourteen/404.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenarchivephp">trunk/src/wp-content/themes/twentyfourteen/archive.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencategoryphp">trunk/src/wp-content/themes/twentyfourteen/category.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenimagephp">trunk/src/wp-content/themes/twentyfourteen/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensearchphp">trunk/src/wp-content/themes/twentyfourteen/search.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensinglephp">trunk/src/wp-content/themes/twentyfourteen/single.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteentagphp">trunk/src/wp-content/themes/twentyfourteen/tag.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteentaxonomypost_formatphp">trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteen404php"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/404.php (26216 => 26217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/404.php 2013-11-15 16:41:39 UTC (rev 26216)
+++ trunk/src/wp-content/themes/twentyfourteen/404.php 2013-11-15 19:01:00 UTC (rev 26217)
</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="main-content" class="main-content">
</del><ins>+
</ins><span class="cx"> <div id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><span class="lines">@@ -25,9 +25,8 @@
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #primary -->
</span><del>- <?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
</del><span class="cx">
</span><span class="cx"> <?php
</span><ins>+get_sidebar( 'content' );
</ins><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/archive.php (26216 => 26217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/archive.php 2013-11-15 16:41:39 UTC (rev 26216)
+++ trunk/src/wp-content/themes/twentyfourteen/archive.php 2013-11-15 19:01:00 UTC (rev 26217)
</span><span class="lines">@@ -19,7 +19,6 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>-<div id="main-content" class="main-content">
</del><span class="cx"> <section id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><span class="lines">@@ -60,9 +59,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </section><!-- #primary -->
</span><del>- <?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
</del><span class="cx">
</span><span class="cx"> <?php
</span><ins>+get_sidebar( 'content' );
</ins><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/category.php (26216 => 26217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/category.php 2013-11-15 16:41:39 UTC (rev 26216)
+++ trunk/src/wp-content/themes/twentyfourteen/category.php 2013-11-15 19:01:00 UTC (rev 26217)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>-<div id="main-content" class="main-content">
</del><span class="cx"> <section id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><span class="lines">@@ -44,9 +43,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </section><!-- #primary -->
</span><del>- <?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
</del><span class="cx">
</span><span class="cx"> <?php
</span><ins>+get_sidebar( 'content' );
</ins><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php (26216 => 26217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-11-15 16:41:39 UTC (rev 26216)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-11-15 19:01:00 UTC (rev 26217)
</span><span class="lines">@@ -217,6 +217,8 @@
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_scripts() {
</span><ins>+ global $wp_styles;
+
</ins><span class="cx"> // Add Lato font, used in the main stylesheet.
</span><span class="cx"> wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
</span><span class="cx">
</span><span class="lines">@@ -228,7 +230,7 @@
</span><span class="cx">
</span><span class="cx"> // Load the Internet Explorer specific stylesheet.
</span><span class="cx"> wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), '20131110' );
</span><del>- wp_style_add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
</del><ins>+ $wp_styles->add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
</ins><span class="cx">
</span><span class="cx"> if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
</span><span class="cx"> wp_enqueue_script( 'comment-reply' );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/image.php (26216 => 26217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/image.php 2013-11-15 16:41:39 UTC (rev 26216)
+++ trunk/src/wp-content/themes/twentyfourteen/image.php 2013-11-15 19:01:00 UTC (rev 26217)
</span><span class="lines">@@ -12,7 +12,6 @@
</span><span class="cx"> get_header();
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<div id="main-content" class="main-content">
</del><span class="cx"> <section id="primary" class="content-area image-attachment">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><span class="lines">@@ -85,7 +84,6 @@
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </section><!-- #primary -->
</span><del>-</div><!-- #main-content -->
</del><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> get_sidebar();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/search.php (26216 => 26217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/search.php 2013-11-15 16:41:39 UTC (rev 26216)
+++ trunk/src/wp-content/themes/twentyfourteen/search.php 2013-11-15 19:01:00 UTC (rev 26217)
</span><span class="lines">@@ -9,7 +9,6 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>-<div id="main-content" class="main-content">
</del><span class="cx"> <section id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><span class="lines">@@ -35,10 +34,9 @@
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </section><!-- #primary -->
</span><del>- <?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
</del><span class="cx">
</span><span class="cx"> <?php
</span><ins>+get_sidebar( 'content' );
</ins><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/single.php (26216 => 26217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/single.php 2013-11-15 16:41:39 UTC (rev 26216)
+++ trunk/src/wp-content/themes/twentyfourteen/single.php 2013-11-15 19:01:00 UTC (rev 26217)
</span><span class="lines">@@ -9,7 +9,6 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>-<div id="main-content" class="main-content">
</del><span class="cx"> <div id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx"> <?php
</span><span class="lines">@@ -27,9 +26,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #primary -->
</span><del>- <?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
</del><span class="cx">
</span><span class="cx"> <?php
</span><ins>+get_sidebar( 'content' );
</ins><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteentagphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/tag.php (26216 => 26217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/tag.php 2013-11-15 16:41:39 UTC (rev 26216)
+++ trunk/src/wp-content/themes/twentyfourteen/tag.php 2013-11-15 19:01:00 UTC (rev 26217)
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>-<div id="main-content" class="main-content">
</del><span class="cx"> <section id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><span class="lines">@@ -46,9 +45,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </section><!-- #primary -->
</span><del>- <?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
</del><span class="cx">
</span><span class="cx"> <?php
</span><ins>+get_sidebar( 'content' );
</ins><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteentaxonomypost_formatphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php (26216 => 26217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php 2013-11-15 16:41:39 UTC (rev 26216)
+++ trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php 2013-11-15 19:01:00 UTC (rev 26217)
</span><span class="lines">@@ -15,7 +15,6 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>-<div id="main-content" class="main-content">
</del><span class="cx"> <section id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><span class="lines">@@ -68,9 +67,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </section><!-- #primary -->
</span><del>- <?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
</del><span class="cx">
</span><span class="cx"> <?php
</span><ins>+get_sidebar( 'content' );
</ins><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span></span></pre>
</div>
</div>
</body>
</html>