<!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>[26227] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: general cleanup for spacing, inline comments.</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/26227">26227</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-11-15 21:19:33 +0000 (Fri, 15 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Twenty Fourteen: general cleanup for spacing, inline comments. Props obenland, see <a href="http://core.trac.wordpress.org/ticket/25946">#25946</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenheaderphp">trunk/src/wp-content/themes/twentyfourteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenimagephp">trunk/src/wp-content/themes/twentyfourteen/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomizerphp">trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjsfunctionsjs">trunk/src/wp-content/themes/twentyfourteen/js/functions.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensearchphp">trunk/src/wp-content/themes/twentyfourteen/search.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensidebarcontentphp">trunk/src/wp-content/themes/twentyfourteen/sidebar-content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensidebarphp">trunk/src/wp-content/themes/twentyfourteen/sidebar.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php (26226 => 26227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-11-15 21:18:00 UTC (rev 26226)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php    2013-11-15 21:19:33 UTC (rev 26227)
</span><span class="lines">@@ -97,24 +97,18 @@
</span><span class="cx">          'aside', 'image', 'video', 'audio', 'quote', 'link', 'gallery',
</span><span class="cx">  ) );
</span><span class="cx"> 
</span><del>-       /*
-        * This theme allows users to set a custom background.
-        */
</del><ins>+        // This theme allows users to set a custom background.
</ins><span class="cx">   add_theme_support( 'custom-background', apply_filters( 'twentyfourteen_custom_background_args', array(
</span><span class="cx">          'default-color' => 'f5f5f5',
</span><span class="cx">  ) ) );
</span><span class="cx"> 
</span><del>-       /*
-        * Add support for featured content.
-        */
</del><ins>+        // Add support for featured content.
</ins><span class="cx">   add_theme_support( 'featured-content', array(
</span><span class="cx">          'featured_content_filter' => 'twentyfourteen_get_featured_posts',
</span><span class="cx">          'max_posts' => 6,
</span><span class="cx">  ) );
</span><span class="cx"> 
</span><del>-       /*
-        * This theme uses its own gallery styles.
-        */
</del><ins>+        // This theme uses its own gallery styles.
</ins><span class="cx">   add_filter( 'use_default_gallery_style', '__return_false' );
</span><span class="cx"> }
</span><span class="cx"> endif; // twentyfourteen_setup
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/header.php (26226 => 26227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/header.php    2013-11-15 21:18:00 UTC (rev 26226)
+++ trunk/src/wp-content/themes/twentyfourteen/header.php       2013-11-15 21:19:33 UTC (rev 26227)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> 
</span><span class="cx"> <body <?php body_class(); ?>>
</span><span class="cx"> <div id="page" class="hfeed site">
</span><del>-       <?php do_action( 'before' ); ?>
-
</del><span class="cx">   <?php if ( get_header_image() ) : ?>
</span><span class="cx">  <div id="site-header">
</span><span class="cx">          <a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/image.php (26226 => 26227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/image.php     2013-11-15 21:18:00 UTC (rev 26226)
+++ trunk/src/wp-content/themes/twentyfourteen/image.php        2013-11-15 21:19:33 UTC (rev 26227)
</span><span class="lines">@@ -73,8 +73,8 @@
</span><span class="cx"> 
</span><span class="cx">                  <nav id="image-navigation" class="navigation image-navigation">
</span><span class="cx">                          <div class="nav-links">
</span><del>-                               <?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' ) ); ?>
</del><ins>+                                <div class="previous-image"><?php previous_image_link( false, __( 'Previous Image', 'twentyfourteen' ) ); ?></div>
+                               <div class="next-image"><?php next_image_link( false, __( 'Next Image', 'twentyfourteen' ) ); ?></div>
</ins><span class="cx">                           </div><!-- .nav-links -->
</span><span class="cx">                  </nav><!-- #image-navigation -->
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomizerphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php (26226 => 26227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php    2013-11-15 21:18:00 UTC (rev 26226)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php       2013-11-15 21:19:33 UTC (rev 26227)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">          'section'  => 'colors',
</span><span class="cx">  ) ) );
</span><span class="cx"> 
</span><del>-       add_filter( 'theme_mod_accent_mid',  'twentyfourteen_accent_mid'  );
</del><ins>+        add_filter( 'theme_mod_accent_mid',   'twentyfourteen_accent_mid'   );
</ins><span class="cx">   add_filter( 'theme_mod_accent_light', 'twentyfourteen_accent_light' );
</span><span class="cx"> 
</span><span class="cx">  // Add the featured content section in case it's not already there.
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">  * @return void
</span><span class="cx">  */
</span><span class="cx"> function twentyfourteen_rebuild_accent_colors() {
</span><del>-       set_theme_mod( 'accent_mid',  twentyfourteen_accent_mid()  );
</del><ins>+        set_theme_mod( 'accent_mid',   twentyfourteen_accent_mid()   );
</ins><span class="cx">   set_theme_mod( 'accent_light', twentyfourteen_accent_light() );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'update_option_theme_mods_twentyfourteen', 'twentyfourteen_rebuild_accent_colors' );
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx">  if ( '#24890d' === $accent_color )
</span><span class="cx">          return;
</span><span class="cx"> 
</span><del>-       $accent_mid = get_theme_mod( 'accent_mid' );
</del><ins>+        $accent_mid   = get_theme_mod( 'accent_mid'   );
</ins><span class="cx">   $accent_light = get_theme_mod( 'accent_light' );
</span><span class="cx"> 
</span><span class="cx">  $css = '/* Custom accent color. */
</span><span class="lines">@@ -317,7 +317,6 @@
</span><span class="cx">                  color: ' . $accent_light . ';
</span><span class="cx">          }';
</span><span class="cx"> 
</span><del>-
</del><span class="cx">   wp_add_inline_style( 'twentyfourteen-style', $css );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_enqueue_scripts', 'twentyfourteen_customizer_styles' );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php (26226 => 26227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2013-11-15 21:18:00 UTC (rev 26226)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php    2013-11-15 21:19:33 UTC (rev 26227)
</span><span class="lines">@@ -162,6 +162,8 @@
</span><span class="cx">  * Displays an optional post thumbnail, with an anchor element
</span><span class="cx">  * when on index views, and a div element when on a single view.
</span><span class="cx">  *
</span><ins>+ * @since Twenty Fourteen 1.0
+ *
</ins><span class="cx">  * @return void
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_post_thumbnail() {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenjsfunctionsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/js/functions.js (26226 => 26227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/js/functions.js       2013-11-15 21:18:00 UTC (rev 26226)
+++ trunk/src/wp-content/themes/twentyfourteen/js/functions.js  2013-11-15 21:19:33 UTC (rev 26227)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">  _window.load( function() {
</span><span class="cx">          if ( body.is( '.slider' ) ) {
</span><span class="cx">                  $( '.featured-content' ).featuredslider( {
</span><del>-                               selector:  '.featured-content-inner > article',
</del><ins>+                                selector: '.featured-content-inner > article',
</ins><span class="cx">                           controlsContainer: '.featured-content'
</span><span class="cx">                  } );
</span><span class="cx">          }
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/search.php (26226 => 26227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/search.php    2013-11-15 21:18:00 UTC (rev 26226)
+++ trunk/src/wp-content/themes/twentyfourteen/search.php       2013-11-15 21:19:33 UTC (rev 26227)
</span><span class="lines">@@ -39,4 +39,3 @@
</span><span class="cx"> get_sidebar( 'content' );
</span><span class="cx"> get_sidebar();
</span><span class="cx"> get_footer();
</span><del>-
</del></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensidebarcontentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/sidebar-content.php (26226 => 26227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/sidebar-content.php   2013-11-15 21:18:00 UTC (rev 26226)
+++ trunk/src/wp-content/themes/twentyfourteen/sidebar-content.php      2013-11-15 21:19:33 UTC (rev 26227)
</span><span class="lines">@@ -11,7 +11,5 @@
</span><span class="cx">  return;
</span><span class="cx"> ?>
</span><span class="cx"> <div id="content-sidebar" class="content-sidebar widget-area" role="complementary">
</span><del>-       <?php do_action( 'before_sidebar' ); ?>
-
</del><span class="cx">   <?php dynamic_sidebar( 'sidebar-2' ); ?>
</span><span class="cx"> </div><!-- #content-sidebar -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/sidebar.php (26226 => 26227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/sidebar.php   2013-11-15 21:18:00 UTC (rev 26226)
+++ trunk/src/wp-content/themes/twentyfourteen/sidebar.php      2013-11-15 21:19:33 UTC (rev 26227)
</span><span class="lines">@@ -23,10 +23,7 @@
</span><span class="cx"> 
</span><span class="cx">  <?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
</span><span class="cx">  <div id="primary-sidebar" class="primary-sidebar widget-area" role="complementary">
</span><del>-               <?php
-                       do_action( 'before_sidebar' );
-                       dynamic_sidebar( 'sidebar-1' );
-               ?>
-       </div><!-- #primary-sidebar .primary-sidebar -->
</del><ins>+                <?php dynamic_sidebar( 'sidebar-1' ); ?>
+       </div><!-- #primary-sidebar -->
</ins><span class="cx">   <?php endif; ?>
</span><span class="cx"> </div><!-- #secondary -->
</span></span></pre>
</div>
</div>

</body>
</html>