<!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>[21398] trunk/wp-content/themes/twentytwelve: Twenty Twelve: Homepage page template logic cleanup and style updates, props obenland.</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/21398">21398</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2012-08-01 18:52:20 +0000 (Wed, 01 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: Homepage page template logic cleanup and style updates, props obenland. Fixes <a href="http://core.trac.wordpress.org/ticket/21245">#21245</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvehomepagephp">trunk/wp-content/themes/twentytwelve/homepage.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="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (21397 => 21398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2012-08-01 17:38:00 UTC (rev 21397)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2012-08-01 18:52:20 UTC (rev 21398)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> $protocol = is_ssl() ? 'https' : 'http';
</span><span class="cx"> wp_enqueue_style( 'twentytwelve-fonts', "$protocol://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700" );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Load our main CSS file.
</span><span class="cx"> */
</span><span class="lines">@@ -338,7 +338,8 @@
</span><span class="cx"> * Extends the default WordPress body class to denote:
</span><span class="cx"> * 1. Using a full-width layout, when no active widgets in the sidebar
</span><span class="cx"> * or full-width template.
</span><del>- * 2. White or empty background color to change the layout and spacing.
</del><ins>+ * 2. A thumbnail in the Homepage page template.
+ * 3. White or empty background color to change the layout and spacing.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="cx"> */
</span><span class="lines">@@ -348,6 +349,9 @@
</span><span class="cx"> if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'full-width-page.php' ) )
</span><span class="cx"> $classes[] = 'full-width';
</span><span class="cx">
</span><ins>+ if ( is_page_template( 'homepage.php' ) && has_post_thumbnail() )
+ $classes[] = 'has-post-thumbnail';
+
</ins><span class="cx"> if ( empty( $background_color ) )
</span><span class="cx"> $classes[] = 'custom-background-empty';
</span><span class="cx"> elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) )
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvehomepagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/homepage.php (21397 => 21398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/homepage.php 2012-08-01 17:38:00 UTC (rev 21397)
+++ trunk/wp-content/themes/twentytwelve/homepage.php 2012-08-01 18:52:20 UTC (rev 21398)
</span><span class="lines">@@ -12,24 +12,17 @@
</span><span class="cx"> <div id="primary">
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><del>- <div class="home-top">
- <?php while ( have_posts() ) : the_post(); ?>
- <?php if ( has_post_thumbnail() ) { ?>
- <div class="entry-page-image">
- <?php the_post_thumbnail(); ?>
- </div>
- <?php } ?>
- <section class="home-content<?php echo ( has_post_thumbnail() ) ? ' thumbnail' : ''; ?>">
- <div class="entry-content">
- <header class="entry-header">
- <h1 class="entry-title"><?php the_title(); ?></h1>
- </header><!-- .entry-header -->
- <?php the_content(); ?>
- </div><!-- .entry-content -->
- </section>
- <?php endwhile; // end of the loop. ?>
- </div><!-- .home-top -->
</del><ins>+ <?php while ( have_posts() ) : the_post(); ?>
+ <?php if ( has_post_thumbnail() ) { ?>
+ <div class="entry-page-image">
+ <?php the_post_thumbnail(); ?>
+ </div>
+ <?php } ?>
</ins><span class="cx">
</span><ins>+ <?php get_template_part( 'content', 'page' ); ?>
+
+ <?php endwhile; // end of the loop. ?>
+
</ins><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #primary -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvestylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/style.css (21397 => 21398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/style.css 2012-08-01 17:38:00 UTC (rev 21397)
+++ trunk/wp-content/themes/twentytwelve/style.css 2012-08-01 18:52:20 UTC (rev 21398)
</span><span class="lines">@@ -1318,42 +1318,24 @@
</span><span class="cx"> /* =Home page template styling
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-@media screen and (min-width: 600px) {
- div.home-top,
- div.home-middle {
- overflow: hidden;
- }
</del><ins>+.page-template-homepage-php #content article {
+ border: 0;
+ margin-bottom: 0;
</ins><span class="cx"> }
</span><del>-div.home-top {
- margin-bottom: 24px;
- margin-bottom: 1.714285714rem;
-}
</del><span class="cx"> @media screen and (min-width: 600px) {
</span><del>- section.home-content {
</del><ins>+ .page-template-homepage-php #content,
+ .page-template-homepage-php article {
</ins><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><del>- section.home-content h1.entry-title {
- margin: 0 0 24px;
- margin: 0 0 1.714285714rem;
- }
- section.home-content.thumbnail {
</del><ins>+ .page-template-homepage-php.has-post-thumbnail article {
</ins><span class="cx"> float: left;
</span><span class="cx"> width: 47.916666667%;
</span><span class="cx"> }
</span><del>-}
-@media screen and (min-width: 600px) {
</del><span class="cx"> .entry-page-image {
</span><span class="cx"> float: right;
</span><span class="cx"> width: 47.916666667%;
</span><del>- margin-bottom: 24px;
- margin-bottom: 1.714285714rem;
</del><span class="cx"> }
</span><span class="cx"> }
</span><del>-@media screen and (min-width: 600px) {
- .page-template-homepage-php #content {
- overflow: hidden;
- }
-}
</del><span class="cx"> .page-template-homepage-php #secondary {
</span><span class="cx"> clear: both;
</span><span class="cx"> float: none;
</span></span></pre>
</div>
</div>
</body>
</html>