From 0c05a129dc6fd9b292eaf3c2c3d77924bd411564 Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@git.wordpress.org>
Date: Sat, 15 Dec 2018 11:12:57 +0000
Subject: [PATCH] Twenty Sixteen: 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 #45427.


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


git-svn-id: http://core.svn.wordpress.org/branches/5.0@44030 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../themes/twentysixteen/css/blocks.css       | 60 ++++++++++---------
 wp-includes/version.php                       |  2 +-
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/wp-content/themes/twentysixteen/css/blocks.css b/wp-content/themes/twentysixteen/css/blocks.css
index 093109a4de..2013cc8019 100644
--- a/wp-content/themes/twentysixteen/css/blocks.css
+++ b/wp-content/themes/twentysixteen/css/blocks.css
@@ -232,10 +232,8 @@ p.has-drop-cap:not(:focus)::first-letter {
 /* Buttons */
 
 .wp-block-button .wp-block-button__link {
-	background: #1a1a1a;
 	border: 0;
 	border-radius: 2px;
-	color: #fff;
 	font-family: Montserrat, "Helvetica Neue", sans-serif;
 	font-weight: 700;
 	letter-spacing: 0.046875em;
@@ -244,9 +242,15 @@ p.has-drop-cap:not(:focus)::first-letter {
 	text-transform: uppercase;
 }
 
-.wp-block-button .wp-block-button__link:hover,
-.wp-block-button .wp-block-button__link:focus {
+.entry-content .wp-block-button__link {
+	background: #1a1a1a;
+	color: #fff;
+}
+
+.entry-content .wp-block-button__link:hover,
+.entry-content .wp-block-button__link:focus {
 	background: #007acc;
+	color: #fff;
 }
 
 .wp-block-button .wp-block-button__link:focus {
@@ -322,98 +326,98 @@ hr.wp-block-separator {
 6.0 Blocks - Colors
 --------------------------------------------------------------*/
 
-.has-dark-gray-color {
+.entry-content .has-dark-gray-color {
 	color: #1a1a1a;
 }
 
-.has-dark-gray-background-color {
+.entry-content .has-dark-gray-background-color {
 	background-color: #1a1a1a;
 }
 
-.has-medium-gray-color {
+.entry-content .has-medium-gray-color {
 	color: #686868;
 }
 
-.has-medium-gray-background-color {
+.entry-content .has-medium-gray-background-color {
 	background-color: #686868;
 }
 
-.has-light-gray-color {
+.entry-content .has-light-gray-color {
 	color: #e5e5e5;
 }
 
-.has-light-gray-background-color {
+.entry-content .has-light-gray-background-color {
 	background-color: #e5e5e5;
 }
 
-.has-white-color {
+.entry-content .has-white-color {
 	color: #fff;
 }
 
-.has-white-background-color {
+.entry-content .has-white-background-color {
 	background-color: #fff;
 }
 
-.has-blue-gray-color {
+.entry-content .has-blue-gray-color {
 	color: #4d545c;
 }
 
-.has-blue-gray-background-color {
+.entry-content .has-blue-gray-background-color {
 	background-color: #4d545c;
 }
 
-.has-bright-blue-color {
+.entry-content .has-bright-blue-color {
 	color: #007acc;
 }
 
-.has-bright-blue-background-color {
+.entry-content .has-bright-blue-background-color {
 	background-color: #007acc;
 }
 
-.has-light-blue-color {
+.entry-content .has-light-blue-color {
 	color: #9adffd;
 }
 
-.has-light-blue-background-color {
+.entry-content .has-light-blue-background-color {
 	background-color: #9adffd;
 }
 
-.has-dark-brown-color {
+.entry-content .has-dark-brown-color {
 	color: #402b30;
 }
 
-.has-dark-brown-background-color {
+.entry-content .has-dark-brown-background-color {
 	background-color: #402b30;
 }
 
-.has-medium-brown-color {
+.entry-content .has-medium-brown-color {
 	color: #774e24;
 }
 
-.has-medium-brown-background-color {
+.entry-content .has-medium-brown-background-color {
 	background-color: #774e24;
 }
 
-.has-dark-red-color {
+.entry-content .has-dark-red-color {
 	color: #640c1f;
 }
 
-.has-dark-red-background-color {
+.entry-content .has-dark-red-background-color {
 	background-color: #640c1f;
 }
 
-.has-bright-red-color {
+.entry-content .has-bright-red-color {
 	color: #ff675f;
 }
 
-.has-bright-red-background-color {
+.entry-content .has-bright-red-background-color {
 	background-color: #ff675f;
 }
 
-.has-yellow-color {
+.entry-content .has-yellow-color {
 	color: #ffef8e;
 }
 
-.has-yellow-background-color {
+.entry-content .has-yellow-background-color {
 	background-color: #ffef8e;
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8636822a39..bf700ed68b 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-44199';
+$wp_version = '5.0.2-alpha-44200';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.