<!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>[25985] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: allow any page to be set as the front page, removing requirement for `front-page.php` template file.</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/25985">25985</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-10-29 19:05:02 +0000 (Tue, 29 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: allow any page to be set as the front page, removing requirement for `front-page.php` template file. Props iamtakashi, fixes <a href="http://core.trac.wordpress.org/ticket/25685">#25685</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="#trunksrcwpcontentthemestwentyfourteencontributorpagephp">trunk/src/wp-content/themes/twentyfourteen/contributor-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfullwidthpagephp">trunk/src/wp-content/themes/twentyfourteen/full-width-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenimagephp">trunk/src/wp-content/themes/twentyfourteen/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenindexphp">trunk/src/wp-content/themes/twentyfourteen/index.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenpagephp">trunk/src/wp-content/themes/twentyfourteen/page.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="#trunksrcwpcontentthemestwentyfourteenstylecss">trunk/src/wp-content/themes/twentyfourteen/style.css</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>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfrontpagephp">trunk/src/wp-content/themes/twentyfourteen/front-page.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 (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/404.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/404.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><ins>+<div id="main-content" class="main-content">
</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">@@ -24,8 +25,9 @@
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #primary -->
</span><ins>+ <?php get_sidebar( 'content' ); ?>
+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><del>-get_sidebar( 'content' );
</del><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 (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/archive.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/archive.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><ins>+<div id="main-content" class="main-content">
</ins><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">@@ -59,8 +60,9 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </section><!-- #primary -->
</span><ins>+ <?php get_sidebar( 'content' ); ?>
+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><del>-get_sidebar( 'content' );
</del><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 (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/category.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/category.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><ins>+<div id="main-content" class="main-content">
</ins><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">@@ -43,8 +44,9 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </section><!-- #primary -->
</span><ins>+ <?php get_sidebar( 'content' ); ?>
+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><del>-get_sidebar( 'content' );
</del><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontributorpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/contributor-page.php (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/contributor-page.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/contributor-page.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -9,6 +9,13 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><ins>+<div id="main-content" class="main-content">
+
+<?php
+ if ( is_front_page() && twentyfourteen_has_featured_posts() )
+ get_template_part( 'featured-content' );
+?>
+
</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"> <?php
</span><span class="lines">@@ -34,6 +41,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #primary -->
</span><ins>+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> get_sidebar();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfrontpagephp"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-content/themes/twentyfourteen/front-page.php (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/front-page.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/front-page.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-<?php
-/**
- * The template for displaying the home page
- *
- * @package WordPress
- * @subpackage Twenty_Fourteen
- * @since Twenty Fourteen 1.0
- */
-
-get_header(); ?>
-
-<div class="front-page-content-wrapper">
-
- <?php
- if ( twentyfourteen_has_featured_posts() )
- get_template_part( 'featured-content' );
- ?>
-
- <div id="primary" class="content-area">
- <div id="content" class="site-content" role="main">
- <?php
- if ( have_posts() ) :
- while ( have_posts() ) :
- the_post();
-
- get_template_part( 'content', get_post_format() );
-
- comments_template();
- endwhile;
- twentyfourteen_paging_nav();
-
- else :
- get_template_part( 'content', 'none' );
-
- endif;
- ?>
- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area -->
-
- <?php get_sidebar( 'content' ); ?>
-
-</div><!-- .front-page-content-wrapper -->
-
-<?php
-get_sidebar();
-get_footer();
</del></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfullwidthpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/full-width-page.php (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/full-width-page.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/full-width-page.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -9,6 +9,13 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><ins>+<div id="main-content" class="main-content">
+
+<?php
+ if ( is_front_page() && twentyfourteen_has_featured_posts() )
+ get_template_part( 'featured-content' );
+?>
+
</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"> <?php
</span><span class="lines">@@ -24,6 +31,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #primary -->
</span><ins>+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> get_sidebar();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/image.php (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/image.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/image.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -12,78 +12,80 @@
</span><span class="cx"> get_header();
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<section id="primary" class="content-area image-attachment">
- <div id="content" class="site-content" role="main">
</del><ins>+<div id="main-content" class="main-content">
+ <section id="primary" class="content-area image-attachment">
+ <div id="content" class="site-content" role="main">
</ins><span class="cx">
</span><del>- <?php while ( have_posts() ) : the_post(); ?>
</del><ins>+ <?php while ( have_posts() ) : the_post(); ?>
</ins><span class="cx">
</span><del>- <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <header class="entry-header">
- <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
</del><ins>+ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
</ins><span class="cx">
</span><del>- <div class="entry-meta">
</del><ins>+ <div class="entry-meta">
</ins><span class="cx">
</span><del>- <span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time></span>
</del><ins>+ <span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time></span>
</ins><span class="cx">
</span><del>- <span class="full-size-link"><a href="<?php echo wp_get_attachment_url(); ?>"><?php echo $metadata['width']; ?> × <?php echo $metadata['height']; ?></a></span>
</del><ins>+ <span class="full-size-link"><a href="<?php echo wp_get_attachment_url(); ?>"><?php echo $metadata['width']; ?> × <?php echo $metadata['height']; ?></a></span>
</ins><span class="cx">
</span><del>- <span class="parent-post-link"><a href="<?php echo get_permalink( $post->post_parent ); ?>" rel="gallery"><?php echo get_the_title( $post->post_parent ); ?></a></span>
- <?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
- </div><!-- .entry-meta -->
- </header><!-- .entry-header -->
</del><ins>+ <span class="parent-post-link"><a href="<?php echo get_permalink( $post->post_parent ); ?>" rel="gallery"><?php echo get_the_title( $post->post_parent ); ?></a></span>
+ <?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-meta -->
+ </header><!-- .entry-header -->
</ins><span class="cx">
</span><del>- <div class="entry-content">
- <div class="entry-attachment">
- <div class="attachment">
- <?php twentyfourteen_the_attached_image(); ?>
- </div><!-- .attachment -->
</del><ins>+ <div class="entry-content">
+ <div class="entry-attachment">
+ <div class="attachment">
+ <?php twentyfourteen_the_attached_image(); ?>
+ </div><!-- .attachment -->
</ins><span class="cx">
</span><del>- <?php if ( has_excerpt() ) : ?>
- <div class="entry-caption">
- <?php the_excerpt(); ?>
- </div><!-- .entry-caption -->
- <?php endif; ?>
- </div><!-- .entry-attachment -->
</del><ins>+ <?php if ( has_excerpt() ) : ?>
+ <div class="entry-caption">
+ <?php the_excerpt(); ?>
+ </div><!-- .entry-caption -->
+ <?php endif; ?>
+ </div><!-- .entry-attachment -->
</ins><span class="cx">
</span><del>- <?php
- the_content();
- wp_link_pages( array(
- 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
- 'after' => '</div>',
- 'link_before' => '<span>',
- 'link_after' => '</span>',
- ) );
- ?>
- </div><!-- .entry-content -->
</del><ins>+ <?php
+ the_content();
+ wp_link_pages( array(
+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+ 'after' => '</div>',
+ 'link_before' => '<span>',
+ 'link_after' => '</span>',
+ ) );
+ ?>
+ </div><!-- .entry-content -->
</ins><span class="cx">
</span><del>- <footer class="entry-meta">
- <?php
- if ( comments_open() && pings_open() ) : // Comments and trackbacks open
- printf( __( '<a class="comment-link" href="#respond">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() );
- elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open
- printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() );
- elseif ( comments_open() && ! pings_open() ) : // Only comments open
- _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond">post a comment</a>.', 'twentyfourteen' );
- elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed
- _e( 'Both comments and trackbacks are currently closed.', 'twentyfourteen' );
- endif;
- ?>
- </footer><!-- .entry-meta -->
- </article><!-- #post-## -->
</del><ins>+ <footer class="entry-meta">
+ <?php
+ if ( comments_open() && pings_open() ) : // Comments and trackbacks open
+ printf( __( '<a class="comment-link" href="#respond">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() );
+ elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open
+ printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() );
+ elseif ( comments_open() && ! pings_open() ) : // Only comments open
+ _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond">post a comment</a>.', 'twentyfourteen' );
+ elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed
+ _e( 'Both comments and trackbacks are currently closed.', 'twentyfourteen' );
+ endif;
+ ?>
+ </footer><!-- .entry-meta -->
+ </article><!-- #post-## -->
</ins><span class="cx">
</span><del>- <nav id="image-navigation" class="navigation image-navigation">
- <div class="nav-links">
- <?php previous_image_link( false, __( '<div class="previous-image">Previous Image</div>', 'twentyfourteen' ) ); ?>
- <?php next_image_link( false, __( '<div class="next-image">Next Image</div>', 'twentyfourteen' ) ); ?>
- </div><!-- .nav-links -->
- </nav><!-- #image-navigation -->
</del><ins>+ <nav id="image-navigation" class="navigation image-navigation">
+ <div class="nav-links">
+ <?php previous_image_link( false, __( '<div class="previous-image">Previous Image</div>', 'twentyfourteen' ) ); ?>
+ <?php next_image_link( false, __( '<div class="next-image">Next Image</div>', 'twentyfourteen' ) ); ?>
+ </div><!-- .nav-links -->
+ </nav><!-- #image-navigation -->
</ins><span class="cx">
</span><del>- <?php comments_template(); ?>
</del><ins>+ <?php comments_template(); ?>
</ins><span class="cx">
</span><del>- <?php endwhile; // end of the loop. ?>
</del><ins>+ <?php endwhile; // end of the loop. ?>
</ins><span class="cx">
</span><del>- </div><!-- #content -->
-</section><!-- #primary -->
</del><ins>+ </div><!-- #content -->
+ </section><!-- #primary -->
+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> get_sidebar();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/index.php (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/index.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/index.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -15,6 +15,13 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><ins>+<div id="main-content" class="main-content">
+
+<?php
+ if ( is_front_page() && twentyfourteen_has_featured_posts() )
+ get_template_part( 'featured-content' );
+?>
+
</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">@@ -35,8 +42,9 @@
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #primary -->
</span><ins>+ <?php get_sidebar( 'content' ); ?>
+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><del>-get_sidebar( 'content' );
</del><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/page.php (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/page.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/page.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -13,6 +13,12 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><ins>+<div id="main-content" class="main-content">
+
+<?php
+ if ( is_front_page() && twentyfourteen_has_featured_posts() )
+ get_template_part( 'featured-content' );
+?>
</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">@@ -30,8 +36,9 @@
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #primary -->
</span><ins>+ <?php get_sidebar( 'content' ); ?>
+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><del>-get_sidebar( 'content' );
</del><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/search.php (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/search.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/search.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><ins>+<div id="main-content" class="main-content">
</ins><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">@@ -34,8 +35,10 @@
</span><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </section><!-- #primary -->
</span><ins>+ <?php get_sidebar( 'content' ); ?>
+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><del>-get_sidebar( 'content' );
</del><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span><ins>+
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/single.php (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/single.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/single.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -9,25 +9,27 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><del>-<div id="primary" class="content-area">
- <div id="content" class="site-content" role="main">
- <?php
- while ( have_posts() ) :
- the_post();
</del><ins>+<div id="main-content" class="main-content">
+ <div id="primary" class="content-area">
+ <div id="content" class="site-content" role="main">
+ <?php
+ while ( have_posts() ) :
+ the_post();
</ins><span class="cx">
</span><del>- get_template_part( 'content', get_post_format() );
</del><ins>+ get_template_part( 'content', get_post_format() );
</ins><span class="cx">
</span><del>- twentyfourteen_post_nav();
</del><ins>+ twentyfourteen_post_nav();
</ins><span class="cx">
</span><del>- // If comments are open or we have at least one comment, load up the comment template.
- if ( comments_open() || get_comments_number() )
- comments_template();
- endwhile;
- ?>
- </div><!-- #content -->
-</div><!-- #primary -->
</del><ins>+ // If comments are open or we have at least one comment, load up the comment template.
+ if ( comments_open() || get_comments_number() )
+ comments_template();
+ endwhile;
+ ?>
+ </div><!-- #content -->
+ </div><!-- #primary -->
+ <?php get_sidebar( 'content' ); ?>
+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><del>-get_sidebar( 'content' );
</del><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/style.css (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/style.css 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/style.css 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx"> Use it to make something cool, have fun, and share what you've learned with others.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Table of Contents:
</span><span class="cx"> *
</span><span class="lines">@@ -34,9 +33,8 @@
</span><span class="cx"> * 6.8 - Archives
</span><span class="cx"> * 6.9 - Contributor Page
</span><span class="cx"> * 6.10 - 404 Page
</span><del>- * 6.11 - Front Page
- * 6.12 - Full-width
- * 6.13 - Comments
</del><ins>+ * 6.11 - Full-width
+ * 6.12 - Comments
</ins><span class="cx"> * 7.0 - Sidebar
</span><span class="cx"> * 7.1 - Widgets
</span><span class="cx"> * 7.2 - Content Sidebar Widgets
</span><span class="lines">@@ -770,7 +768,11 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.main-content {
+ width: 100%;
+}
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * 4.0 Header
</span><span class="cx"> * -----------------------------------------------------------------------------
</span><span class="lines">@@ -1721,20 +1723,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 6.11 Front Page
</del><ins>+ * 6.11 Full-width
</ins><span class="cx"> * -----------------------------------------------------------------------------
</span><span class="cx"> */
</span><span class="cx">
</span><del>-.front-page-content-wrapper {
- width: 100%;
-}
-
-
-/**
- * 6.12 Full-width
- * -----------------------------------------------------------------------------
- */
-
</del><span class="cx"> .full-width.singular .content-area {
</span><span class="cx"> padding-top: 0;
</span><span class="cx"> }
</span><span class="lines">@@ -1754,7 +1746,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 6.13 Comments
</del><ins>+ * 6.12 Comments
</ins><span class="cx"> * -----------------------------------------------------------------------------
</span><span class="cx"> */
</span><span class="cx">
</span><span class="lines">@@ -3243,6 +3235,10 @@
</span><span class="cx"> padding-left: 182px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ .main-content {
+ float: left;
+ }
+
</ins><span class="cx"> .site-content {
</span><span class="cx"> margin: 0 29.04761904% 0 182px;
</span><span class="cx"> }
</span><span class="lines">@@ -3377,10 +3373,6 @@
</span><span class="cx"> width: 25%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .front-page-content-wrapper {
- float: left;
- }
-
</del><span class="cx"> .featured-content {
</span><span class="cx"> padding-left: 182px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteentagphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/tag.php (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/tag.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/tag.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><ins>+<div id="main-content" class="main-content">
</ins><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">@@ -45,8 +46,9 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </section><!-- #primary -->
</span><ins>+ <?php get_sidebar( 'content' ); ?>
+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><del>-get_sidebar( 'content' );
</del><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 (25984 => 25985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php 2013-10-29 18:15:14 UTC (rev 25984)
+++ trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php 2013-10-29 19:05:02 UTC (rev 25985)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx">
</span><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><ins>+<div id="main-content" class="main-content">
</ins><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">@@ -64,8 +65,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </section><!-- #primary -->
</span><ins>+</div><!-- #main-content -->
</ins><span class="cx">
</span><span class="cx"> <?php
</span><del>-get_sidebar( 'content' );
</del><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span></span></pre>
</div>
</div>
</body>
</html>