From 0361c75b09e6588c4e6d509ac2bf3444c216d59e Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Thu, 5 Dec 2013 17:29:10 +0000
Subject: [PATCH] Twenty Fourteen: better logic for hide/show title and
 description, and Customizer handling of the same. Add ID attributes to
 `style` blocks. Fixes #26338.

git-svn-id: https://develop.svn.wordpress.org/trunk@26668 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../twentyfourteen/inc/custom-header.php      | 29 ++++++++++---------
 .../themes/twentyfourteen/js/customizer.js    |  6 ++--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/wp-content/themes/twentyfourteen/inc/custom-header.php b/src/wp-content/themes/twentyfourteen/inc/custom-header.php
index d3fe05f80d..96a26dbbc5 100644
--- a/src/wp-content/themes/twentyfourteen/inc/custom-header.php
+++ b/src/wp-content/themes/twentyfourteen/inc/custom-header.php
@@ -55,30 +55,31 @@ if ( ! function_exists( 'twentyfourteen_header_style' ) ) :
  *
  */
 function twentyfourteen_header_style() {
-	$header_text_color = get_header_textcolor();
+	$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 )
+	// 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' ) )
 		return;
-	// If we get this far, we have custom styles. Let's do this.
+
+	// If we get this far, we have custom styles.
 	?>
-	<style type="text/css">
+	<style type="text/css" id="twentyfourteen-header-css">
 	<?php
 		// Has the text been hidden?
-		if ( 'blank' == $header_text_color ) :
+		if ( ! display_header_text() ) :
 	?>
-		.site-title {
-			position: absolute !important;
-			clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
+		.site-title,
+		.site-description {
+			position: absolute;
+			clip: rect(1px 1px 1px 1px); /* IE7 */
 			clip: rect(1px, 1px, 1px, 1px);
 		}
 	<?php
-		// If the user has set a custom color for the text use that
-		else :
+		// If the user has set a custom color for the text, use that.
+		elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
 	?>
 		.site-title a {
-			color: #<?php echo $header_text_color; ?>;
+			color: #<?php echo esc_attr( $text_color ); ?>;
 		}
 	<?php endif; ?>
 	</style>
@@ -97,7 +98,7 @@ if ( ! function_exists( 'twentyfourteen_admin_header_style' ) ) :
  */
 function twentyfourteen_admin_header_style() {
 ?>
-	<style type="text/css">
+	<style type="text/css" id="twentyfourteen-admin-header-css">
 	.appearance_page_custom-header #headimg {
 		background-color: #000;
 		border: none;
diff --git a/src/wp-content/themes/twentyfourteen/js/customizer.js b/src/wp-content/themes/twentyfourteen/js/customizer.js
index 5a386dfb52..9f323d1da6 100644
--- a/src/wp-content/themes/twentyfourteen/js/customizer.js
+++ b/src/wp-content/themes/twentyfourteen/js/customizer.js
@@ -19,14 +19,14 @@
 	wp.customize( 'header_textcolor', function( value ) {
 		value.bind( function( to ) {
 			if ( 'blank' === to ) {
-				$( '.site-title a, .site-description' ).css( {
+				$( '.site-title, .site-description' ).css( {
 					'clip': 'rect(1px, 1px, 1px, 1px)',
 					'position': 'absolute'
 				} );
 			} else {
-				$( '.site-title a,  .site-description' ).css( {
+				$( '.site-title,  .site-description' ).css( {
 					'clip': 'auto',
-					'position': 'relative'
+					'position': 'static'
 				} );
 
 				$( '.site-title a' ).css( {