From ae2cafe1e14db6fbf482f8ead55aafedbeffe681 Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@automattic.com>
Date: Mon, 6 Jul 2015 17:27:26 +0000
Subject: [PATCH] Twenty Fifteen: Display sidebar background color with Header
 Image.

If the header image has a transparent background, the sidebar background color
should be visible. With the `background` shorthand it could never be over set
on the front-end however.

Props valendesigns.
Fixes #31460.


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


git-svn-id: http://core.svn.wordpress.org/trunk@33063 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../themes/twentyfifteen/inc/custom-header.php | 18 ++++++++++++++++--
 wp-includes/version.php                        |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/inc/custom-header.php b/wp-content/themes/twentyfifteen/inc/custom-header.php
index 34994a9f1c..10d0ef1a09 100644
--- a/wp-content/themes/twentyfifteen/inc/custom-header.php
+++ b/wp-content/themes/twentyfifteen/inc/custom-header.php
@@ -133,7 +133,14 @@ function twentyfifteen_header_style() {
 		if ( ! empty( $header_image ) ) :
 	?>
 		.site-header {
-			background: url(<?php header_image(); ?>) no-repeat 50% 50%;
+
+			/*
+			 * No shorthand so the Customizer can override individual properties.
+			 * @see https://core.trac.wordpress.org/ticket/31460
+			 */
+			background-image: url(<?php header_image(); ?>);
+			background-repeat: no-repeat;
+			background-position: 50% 50%;
 			-webkit-background-size: cover;
 			-moz-background-size:    cover;
 			-o-background-size:      cover;
@@ -142,7 +149,14 @@ function twentyfifteen_header_style() {
 
 		@media screen and (min-width: 59.6875em) {
 			body:before {
-				background: url(<?php header_image(); ?>) no-repeat 100% 50%;
+
+				/*
+				 * No shorthand so the Customizer can override individual properties.
+				 * @see https://core.trac.wordpress.org/ticket/31460
+				 */
+				background-image: url(<?php header_image(); ?>);
+				background-repeat: no-repeat;
+				background-position: 100% 50%;
 				-webkit-background-size: cover;
 				-moz-background-size:    cover;
 				-o-background-size:      cover;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3d8c6570c0..b439a1e85d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta1-33091';
+$wp_version = '4.3-beta1-33092';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.