<!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>[26668] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: better logic for hide/show title and description, and Customizer handling of the same.</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/26668">26668</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-12-05 17:29:10 +0000 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: better logic for hide/show title and description, and Customizer handling of the same. Add ID attributes to `style` blocks. Fixes <a href="http://core.trac.wordpress.org/ticket/26338">#26338</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomheaderphp">trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjscustomizerjs">trunk/src/wp-content/themes/twentyfourteen/js/customizer.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php (26667 => 26668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2013-12-05 16:04:59 UTC (rev 26667)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2013-12-05 17:29:10 UTC (rev 26668)
</span><span class="lines">@@ -55,30 +55,31 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_header_style() {
</span><del>- $header_text_color = get_header_textcolor();
</del><ins>+ $text_color = get_header_textcolor();
</ins><span class="cx">
</span><del>- // If no custom options for text are set, let's bail
- // $header_text_color options: HEADER_TEXTCOLOR is default, hide text (returns 'blank') or any hex value
- if ( HEADER_TEXTCOLOR == $header_text_color )
</del><ins>+ // If no custom color for text is set, let's bail.
+ if ( display_header_text() && $text_color === get_theme_support( 'custom-header', 'default-text-color' ) )
</ins><span class="cx"> return;
</span><del>- // If we get this far, we have custom styles. Let's do this.
</del><ins>+
+ // If we get this far, we have custom styles.
</ins><span class="cx"> ?>
</span><del>- <style type="text/css">
</del><ins>+ <style type="text/css" id="twentyfourteen-header-css">
</ins><span class="cx"> <?php
</span><span class="cx"> // Has the text been hidden?
</span><del>- if ( 'blank' == $header_text_color ) :
</del><ins>+ if ( ! display_header_text() ) :
</ins><span class="cx"> ?>
</span><del>- .site-title {
- position: absolute !important;
- clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
</del><ins>+ .site-title,
+ .site-description {
+ position: absolute;
+ clip: rect(1px 1px 1px 1px); /* IE7 */
</ins><span class="cx"> clip: rect(1px, 1px, 1px, 1px);
</span><span class="cx"> }
</span><span class="cx"> <?php
</span><del>- // If the user has set a custom color for the text use that
- else :
</del><ins>+ // If the user has set a custom color for the text, use that.
+ elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
</ins><span class="cx"> ?>
</span><span class="cx"> .site-title a {
</span><del>- color: #<?php echo $header_text_color; ?>;
</del><ins>+ color: #<?php echo esc_attr( $text_color ); ?>;
</ins><span class="cx"> }
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </style>
</span><span class="lines">@@ -97,7 +98,7 @@
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_admin_header_style() {
</span><span class="cx"> ?>
</span><del>- <style type="text/css">
</del><ins>+ <style type="text/css" id="twentyfourteen-admin-header-css">
</ins><span class="cx"> .appearance_page_custom-header #headimg {
</span><span class="cx"> background-color: #000;
</span><span class="cx"> border: none;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenjscustomizerjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/js/customizer.js (26667 => 26668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/js/customizer.js 2013-12-05 16:04:59 UTC (rev 26667)
+++ trunk/src/wp-content/themes/twentyfourteen/js/customizer.js 2013-12-05 17:29:10 UTC (rev 26668)
</span><span class="lines">@@ -19,14 +19,14 @@
</span><span class="cx"> wp.customize( 'header_textcolor', function( value ) {
</span><span class="cx"> value.bind( function( to ) {
</span><span class="cx"> if ( 'blank' === to ) {
</span><del>- $( '.site-title a, .site-description' ).css( {
</del><ins>+ $( '.site-title, .site-description' ).css( {
</ins><span class="cx"> 'clip': 'rect(1px, 1px, 1px, 1px)',
</span><span class="cx"> 'position': 'absolute'
</span><span class="cx"> } );
</span><span class="cx"> } else {
</span><del>- $( '.site-title a, .site-description' ).css( {
</del><ins>+ $( '.site-title, .site-description' ).css( {
</ins><span class="cx"> 'clip': 'auto',
</span><del>- 'position': 'relative'
</del><ins>+ 'position': 'static'
</ins><span class="cx"> } );
</span><span class="cx">
</span><span class="cx"> $( '.site-title a' ).css( {
</span></span></pre>
</div>
</div>
</body>
</html>