<!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>[26573] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: re-add the Header Text Customization Option.</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/26573">26573</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-12-03 18:26:26 +0000 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: re-add the Header Text Customization Option. Props iamtakashi, fixes <a href="http://core.trac.wordpress.org/ticket/26338">#26338</a>; see <a href="http://core.trac.wordpress.org/ticket/25540">#25540</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="#trunksrcwpcontentthemestwentyfourteeninccustomizerphp">trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjscustomizerjs">trunk/src/wp-content/themes/twentyfourteen/js/customizer.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenstylecss">trunk/src/wp-content/themes/twentyfourteen/style.css</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 (26572 => 26573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2013-12-03 18:23:58 UTC (rev 26572)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2013-12-03 18:26:26 UTC (rev 26573)
</span><span class="lines">@@ -36,16 +36,57 @@
</span><span class="cx"> * }
</span><span class="cx"> */
</span><span class="cx"> add_theme_support( 'custom-header', apply_filters( 'twentyfourteen_custom_header_args', array(
</span><del>- 'header-text' => false,
</del><ins>+ 'default-text-color' => 'fff',
</ins><span class="cx"> 'width' => 1260,
</span><span class="cx"> 'height' => 240,
</span><span class="cx"> 'flex-height' => true,
</span><ins>+ 'wp-head-callback' => 'twentyfourteen_header_style',
</ins><span class="cx"> 'admin-head-callback' => 'twentyfourteen_admin_header_style',
</span><span class="cx"> 'admin-preview-callback' => 'twentyfourteen_admin_header_image',
</span><span class="cx"> ) ) );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'after_setup_theme', 'twentyfourteen_custom_header_setup' );
</span><span class="cx">
</span><ins>+if ( ! function_exists( 'twentyfourteen_header_style' ) ) :
+/**
+ * Styles the header image and text displayed on the blog
+ *
+ * @see twentyfourteen_custom_header_setup().
+ *
+ */
+function twentyfourteen_header_style() {
+ $header_text_color = get_header_textcolor();
+
+ // 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 )
+ return;
+ // If we get this far, we have custom styles. Let's do this.
+ ?>
+ <style type="text/css">
+ <?php
+ // Has the text been hidden?
+ if ( 'blank' == $header_text_color ) :
+ ?>
+ .site-title {
+ position: absolute !important;
+ clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
+ clip: rect(1px, 1px, 1px, 1px);
+ }
+ <?php
+ // If the user has set a custom color for the text use that
+ else :
+ ?>
+ .site-title a {
+ color: #<?php echo $header_text_color; ?> !important;
+ }
+ <?php endif; ?>
+ </style>
+ <?php
+}
+endif; // twentyfourteen_header_style
+
+
</ins><span class="cx"> if ( ! function_exists( 'twentyfourteen_admin_header_style' ) ) :
</span><span class="cx"> /**
</span><span class="cx"> * Style the header image displayed on the Appearance > Header screen.
</span><span class="lines">@@ -60,14 +101,14 @@
</span><span class="cx"> .appearance_page_custom-header #headimg {
</span><span class="cx"> background-color: #000;
</span><span class="cx"> border: none;
</span><del>- max-width: 1230px;
</del><ins>+ max-width: 1260px;
</ins><span class="cx"> min-height: 48px;
</span><span class="cx"> }
</span><span class="cx"> #headimg h1 {
</span><del>- font-family: lato, sans-serif;
</del><ins>+ font-family: Lato, sans-serif;
</ins><span class="cx"> font-size: 18px;
</span><del>- line-height: 1.3333333333;
- margin: 12px 0 12px 27px;
</del><ins>+ line-height: 48px;
+ margin: 0 0 0 30px;
</ins><span class="cx"> }
</span><span class="cx"> #headimg h1 a {
</span><span class="cx"> color: #fff;
</span><span class="lines">@@ -95,7 +136,7 @@
</span><span class="cx"> <?php if ( get_header_image() ) : ?>
</span><span class="cx"> <img src="<?php header_image(); ?>" alt="">
</span><span class="cx"> <?php endif; ?>
</span><del>- <h1><a id="name" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
</del><ins>+ <h1 class="displaying-header-text"><a id="name"<?php echo sprintf( ' style="color:#%s;"', get_header_textcolor() ); ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php
</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 (26572 => 26573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2013-12-03 18:23:58 UTC (rev 26572)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2013-12-03 18:26:26 UTC (rev 26573)
</span><span class="lines">@@ -16,9 +16,24 @@
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_customize_register( $wp_customize ) {
</span><span class="cx"> // Add postMessage support for site title and description.
</span><del>- $wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
- $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
</del><ins>+ $wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
+ $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
+ $wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
</ins><span class="cx">
</span><ins>+ // Rename the label to "Display Site Title & Tagline" in order to make this option extra clear.
+ $wp_customize->add_control( 'display_header_text', array(
+ 'settings' => 'header_textcolor',
+ 'label' => __( 'Display Site Title & Tagline', 'twentyfourteen' ),
+ 'section' => 'title_tagline',
+ 'type' => 'checkbox',
+ ) );
+
+ // Rename the label to "Site Title Color" because this only effects the site title in this theme.
+ $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'header_textcolor', array(
+ 'label' => __( 'Site Title Color', 'twentyfourteen' ),
+ 'section' => 'colors',
+ ) ) );
+
</ins><span class="cx"> // Add custom description to Colors and Background sections.
</span><span class="cx"> $wp_customize->get_section( 'colors' )->description = __( 'Background may only be visible on wide screens.', 'twentyfourteen' );
</span><span class="cx"> $wp_customize->get_section( 'background_image' )->description = __( 'Background may only be visible on wide screens.', 'twentyfourteen' );
</span><span class="lines">@@ -53,7 +68,7 @@
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_customize_preview_js() {
</span><del>- wp_enqueue_script( 'twentyfourteen_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20120827', true );
</del><ins>+ wp_enqueue_script( 'twentyfourteen_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20131130', true );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'customize_preview_init', 'twentyfourteen_customize_preview_js' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenjscustomizerjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/js/customizer.js (26572 => 26573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/js/customizer.js 2013-12-03 18:23:58 UTC (rev 26572)
+++ trunk/src/wp-content/themes/twentyfourteen/js/customizer.js 2013-12-03 18:26:26 UTC (rev 26573)
</span><span class="lines">@@ -15,4 +15,24 @@
</span><span class="cx"> $( '.site-description' ).text( to );
</span><span class="cx"> } );
</span><span class="cx"> } );
</span><ins>+ // Header text color.
+ wp.customize( 'header_textcolor', function( value ) {
+ value.bind( function( to ) {
+ if ( 'blank' == to ) {
+ $( '.site-title a, .site-description' ).css( {
+ 'clip': 'rect(1px, 1px, 1px, 1px)',
+ 'position': 'absolute'
+ } );
+ } else {
+ $( '.site-title a, .site-description' ).css( {
+ 'clip': 'auto',
+ 'position': 'relative'
+ } );
+
+ $( '.site-title a' ).css( {
+ 'color': to,
+ } );
+ }
+ } );
+ } );
</ins><span class="cx"> } )( jQuery );
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/style.css (26572 => 26573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/style.css 2013-12-03 18:23:58 UTC (rev 26572)
+++ trunk/src/wp-content/themes/twentyfourteen/style.css 2013-12-03 18:26:26 UTC (rev 26573)
</span><span class="lines">@@ -3557,6 +3557,10 @@
</span><span class="cx"> margin: -3px 0 21px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ .site-description:empty {
+ margin: 0;
+ }
+
</ins><span class="cx"> .secondary-navigation {
</span><span class="cx"> margin: 0 -30px 48px;
</span><span class="cx"> width: 182px;
</span></span></pre>
</div>
</div>
</body>
</html>