From 1c2343e4eac656dcc868bdfa381f7cc9d89419a1 Mon Sep 17 00:00:00 2001
From: Tammie Lister <tammie@automattic.com>
Date: Mon, 14 Nov 2016 16:49:32 +0000
Subject: [PATCH] Twenty Seventeen: Fixes custom header text color issues

Removes default header text color and updates and updates selectors.

Props laurelfulford, davidakennedy, Idealien
Fixes #38391


Built from https://develop.svn.wordpress.org/trunk@39224


git-svn-id: http://core.svn.wordpress.org/trunk@39164 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyseventeen/inc/custom-header.php     | 6 ++----
 .../twentyseventeen/template-parts/header/header-image.php  | 1 -
 wp-includes/version.php                                     | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/wp-content/themes/twentyseventeen/inc/custom-header.php b/wp-content/themes/twentyseventeen/inc/custom-header.php
index a535f5f459..c137ccc41a 100644
--- a/wp-content/themes/twentyseventeen/inc/custom-header.php
+++ b/wp-content/themes/twentyseventeen/inc/custom-header.php
@@ -35,7 +35,6 @@ function twentyseventeen_custom_header_setup() {
 	 */
 	add_theme_support( 'custom-header', apply_filters( 'twentyseventeen_custom_header_args', array(
 		'default-image'      => get_parent_theme_file_uri( '/assets/images/header.jpg' ),
-		'default-text-color' => 'ffffff',
 		'width'              => 2000,
 		'height'             => 1200,
 		'flex-height'        => true,
@@ -85,10 +84,9 @@ function twentyseventeen_header_style() {
 		else :
 	?>
 		.site-title a,
-		.twentyseventeen-front-page:not(.no-header-image) .site-title,
-		.twentyseventeen-front-page:not(.no-header-image) .site-title a,
+		 body.has-header-image .site-title a,
 		.site-description,
-		.twentyseventeen-front-page:not(.no-header-image) .site-description {
+		body.has-header-image .site-description {
 			color: #<?php echo esc_attr( $header_text_color ); ?>;
 		}
 	<?php endif; ?>
diff --git a/wp-content/themes/twentyseventeen/template-parts/header/header-image.php b/wp-content/themes/twentyseventeen/template-parts/header/header-image.php
index de03a609c3..17ea8af16b 100644
--- a/wp-content/themes/twentyseventeen/template-parts/header/header-image.php
+++ b/wp-content/themes/twentyseventeen/template-parts/header/header-image.php
@@ -11,7 +11,6 @@
 ?>
 <div class="custom-header">
 	<?php
-	$header_image = get_header_image();
 
 	// Check if Custom Header image has been added.
 	if ( has_custom_header() ) :
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 854e2fbaa2..18188f7585 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-beta3-39223';
+$wp_version = '4.7-beta3-39224';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.