From 6cbfcdd7e4d2b2fd060a4f064d6f9fc0a1cf1518 Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@git.wordpress.org>
Date: Sat, 15 Dec 2018 11:11:28 +0000
Subject: [PATCH] Twenty Fifteen: Fix button block custom colors on front end.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Simplify some of the button block’s CSS selectors in the theme, to make sure the default colors don’t override the custom colors on the front end.

Fixes #45428.


Built from https://develop.svn.wordpress.org/branches/5.0@44198


git-svn-id: http://core.svn.wordpress.org/branches/5.0@44028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfifteen/css/blocks.css | 13 ++++++++-----
 wp-includes/version.php                        |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/css/blocks.css b/wp-content/themes/twentyfifteen/css/blocks.css
index d3ede1a14d..9c822769ca 100644
--- a/wp-content/themes/twentyfifteen/css/blocks.css
+++ b/wp-content/themes/twentyfifteen/css/blocks.css
@@ -384,10 +384,8 @@ p.has-drop-cap:not(:focus)::first-letter {
 /* Button */
 
 .wp-block-button .wp-block-button__link {
-	background-color: #333;
 	border: 0;
 	border-radius: 0;
-	color: #fff;
 	cursor: pointer;
 	font-family: "Noto Sans", sans-serif;
 	font-size: 12px;
@@ -399,11 +397,16 @@ p.has-drop-cap:not(:focus)::first-letter {
 	vertical-align: baseline;
 }
 
-.wp-block-button .wp-block-button__link:hover,
-.wp-block-button .wp-block-button__link:focus {
+.wp-block-button__link {
+	background-color: #333;
+	color: #fff;
+}
+
+.wp-block-button__link:hover,
+.wp-block-button__link:focus {
 	background-color: #707070;
 	background-color: rgba(51, 51, 51, 0.7);
-	outline: 0;
+	color: #fff;
 }
 
 @media screen and (min-width: 46.25em) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a48a2cf149..3dbe377d75 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0.2-alpha-44197';
+$wp_version = '5.0.2-alpha-44198';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.