From 76a44b13d4fc13982a2ca5479ac74767a2518efa Mon Sep 17 00:00:00 2001
From: Tammie Lister <tammie@automattic.com>
Date: Mon, 5 Aug 2024 08:57:15 +0000
Subject: [PATCH] Twenty Nineteen: Fixes Button block not changing appearance
 settings.

The Button block isn't reflecting appearance settings. This fix keeps the default as font-weight bold but also adds support for other weights.

Props pranitdugad, pitamdey, sabernhardt.
Fixes #61437.

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


git-svn-id: http://core.svn.wordpress.org/trunk@58247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../themes/twentynineteen/sass/blocks/_blocks.scss   |  8 ++++++++
 wp-content/themes/twentynineteen/style-editor.css    | 10 ++++++++++
 wp-content/themes/twentynineteen/style-editor.scss   | 12 ++++++++++++
 wp-content/themes/twentynineteen/style-rtl.css       | 10 ++++++++++
 wp-content/themes/twentynineteen/style.css           | 10 ++++++++++
 wp-includes/version.php                              |  2 +-
 6 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss b/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss
index 33788b7bf4..7a13bb8ef8 100644
--- a/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss
+++ b/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss
@@ -245,6 +245,14 @@
 		&.has-custom-font-size .wp-block-button__link {
 			font-size: 1em;
 		}
+
+		&[style*="font-weight"] .wp-block-button__link {
+			font-weight: inherit;
+		}
+
+		&[style*="text-decoration"] .wp-block-button__link {
+			text-decoration: inherit;
+		}
 	}
 
 	//! Latest posts, categories, archives
diff --git a/wp-content/themes/twentynineteen/style-editor.css b/wp-content/themes/twentynineteen/style-editor.css
index c736c6d4a3..c8714f08ac 100644
--- a/wp-content/themes/twentynineteen/style-editor.css
+++ b/wp-content/themes/twentynineteen/style-editor.css
@@ -1027,6 +1027,16 @@ figcaption,
   color: #0073aa;
 }
 
+.wp-block-buttons[style*="font-weight"] .wp-block-button__link,
+.wp-block-button[style*="font-weight"] .wp-block-button__link {
+  font-weight: inherit;
+}
+
+.wp-block-buttons[style*="text-decoration"] .wp-block-button__link,
+.wp-block-button[style*="text-decoration"] .wp-block-button__link {
+  text-decoration: inherit;
+}
+
 .wp-block-search .wp-block-search__button {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
   font-size: 0.88889em;
diff --git a/wp-content/themes/twentynineteen/style-editor.scss b/wp-content/themes/twentynineteen/style-editor.scss
index 3695af6a36..985892cf46 100644
--- a/wp-content/themes/twentynineteen/style-editor.scss
+++ b/wp-content/themes/twentynineteen/style-editor.scss
@@ -425,6 +425,18 @@ figcaption,
 	}
 }
 
+.wp-block-buttons,
+.wp-block-button {
+
+	&[style*="font-weight"] .wp-block-button__link {
+		font-weight: inherit;
+	}
+
+	&[style*="text-decoration"] .wp-block-button__link {
+		text-decoration: inherit;
+	}
+}
+
 .wp-block-search {
 	.wp-block-search__button {
 		@include font-family( $font__heading );
diff --git a/wp-content/themes/twentynineteen/style-rtl.css b/wp-content/themes/twentynineteen/style-rtl.css
index 75eddee585..d4595fc588 100644
--- a/wp-content/themes/twentynineteen/style-rtl.css
+++ b/wp-content/themes/twentynineteen/style-rtl.css
@@ -5569,6 +5569,16 @@ body.page .main-navigation {
   font-size: 1em;
 }
 
+.entry .entry-content .wp-block-buttons[style*="font-weight"] .wp-block-button__link,
+.entry .entry-content .wp-block-button[style*="font-weight"] .wp-block-button__link {
+  font-weight: inherit;
+}
+
+.entry .entry-content .wp-block-buttons[style*="text-decoration"] .wp-block-button__link,
+.entry .entry-content .wp-block-button[style*="text-decoration"] .wp-block-button__link {
+  text-decoration: inherit;
+}
+
 .entry .entry-content .wp-block-archives,
 .entry .entry-content .wp-block-categories,
 .entry .entry-content .wp-block-latest-posts {
diff --git a/wp-content/themes/twentynineteen/style.css b/wp-content/themes/twentynineteen/style.css
index 399577b0d7..793bdae2e8 100644
--- a/wp-content/themes/twentynineteen/style.css
+++ b/wp-content/themes/twentynineteen/style.css
@@ -5581,6 +5581,16 @@ body.page .main-navigation {
   font-size: 1em;
 }
 
+.entry .entry-content .wp-block-buttons[style*="font-weight"] .wp-block-button__link,
+.entry .entry-content .wp-block-button[style*="font-weight"] .wp-block-button__link {
+  font-weight: inherit;
+}
+
+.entry .entry-content .wp-block-buttons[style*="text-decoration"] .wp-block-button__link,
+.entry .entry-content .wp-block-button[style*="text-decoration"] .wp-block-button__link {
+  text-decoration: inherit;
+}
+
 .entry .entry-content .wp-block-archives,
 .entry .entry-content .wp-block-categories,
 .entry .entry-content .wp-block-latest-posts {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 846d0d441e..f49889979e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-58850';
+$wp_version = '6.7-alpha-58851';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.