From 80b631315fb38ede4f0786b128d0b13f67963b1c Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@git.wordpress.org>
Date: Sat, 15 Dec 2018 11:10:42 +0000
Subject: [PATCH] Twenty Fourteen: 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 #45429.


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


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

diff --git a/wp-content/themes/twentyfourteen/css/blocks.css b/wp-content/themes/twentyfourteen/css/blocks.css
index a1b6cb5f91..e3c5360f59 100644
--- a/wp-content/themes/twentyfourteen/css/blocks.css
+++ b/wp-content/themes/twentyfourteen/css/blocks.css
@@ -221,10 +221,8 @@ p.has-drop-cap:not(:focus)::first-letter {
 /* Buttons */
 
 .wp-block-button .wp-block-button__link {
-	background-color: #24890d;
 	border: 0;
 	border-radius: 2px;
-	color: #fff;
 	font-size: 12px;
 	font-weight: 700;
 	line-height: 15px;
@@ -233,12 +231,18 @@ p.has-drop-cap:not(:focus)::first-letter {
 	vertical-align: bottom;
 }
 
-.wp-block-button .wp-block-button__link:hover,
-.wp-block-button .wp-block-button__link:focus {
-	background-color: #41a62a;
+.wp-block-button__link {
+	background-color: #24890d;
+	color: #fff;
 }
 
-.wp-block-button .wp-block-button__link:active {
+.wp-block-button__link:hover,
+.wp-block-button__link:focus {
+	background-color: #41a62a;
+	color: #fff;
+}
+
+.wp-block-button__link:active {
 	background-color: #55d737;
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 05309bc7e9..a48a2cf149 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-44196';
+$wp_version = '5.0.2-alpha-44197';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.