From 5638ddb0ae2d013c485f9865ee7ea99ae4c24ec2 Mon Sep 17 00:00:00 2001
From: Tammie Lister <tammie@automattic.com>
Date: Mon, 29 Apr 2024 12:17:10 +0000
Subject: [PATCH] Twenty Fourteen: Adds base font size to pullquote block.

The pullquote block needed the base font size adding back in. This also adds in support for appearance settings for weight and style in addition to the original ticket. This fixes a previous commit which changed the default font size of pullquote blocks, quote blocks and blockquotes.

Props sabernhardt.
Fixes #61034.

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


git-svn-id: http://core.svn.wordpress.org/trunk@57518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfourteen/css/blocks.css     | 12 ++++++++++++
 .../themes/twentyfourteen/css/editor-blocks.css     | 13 +++++++++++++
 .../themes/twentyfourteen/css/editor-style.css      |  2 +-
 wp-content/themes/twentyfourteen/style.css          |  2 +-
 wp-includes/version.php                             |  2 +-
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/wp-content/themes/twentyfourteen/css/blocks.css b/wp-content/themes/twentyfourteen/css/blocks.css
index 67d205aa28..d13b29b7ce 100644
--- a/wp-content/themes/twentyfourteen/css/blocks.css
+++ b/wp-content/themes/twentyfourteen/css/blocks.css
@@ -184,6 +184,18 @@ p.has-drop-cap:not(:focus)::first-letter {
 	margin: 0;
 }
 
+:where(.wp-block-pullquote[class*="-font-size"], .wp-block-pullquote[style*="font-size"]) blockquote {
+	font-size: inherit;
+}
+
+:where(.wp-block-pullquote[style*="font-style"]) blockquote {
+	font-style: inherit;
+}
+
+:where(.wp-block-pullquote[style*="font-weight"]) blockquote {
+	font-weight: inherit;
+}
+
 .wp-block-pullquote cite {
 	color: #2b2b2b;
 	font-size: 16px;
diff --git a/wp-content/themes/twentyfourteen/css/editor-blocks.css b/wp-content/themes/twentyfourteen/css/editor-blocks.css
index 39f55255b1..c5a1999cd3 100644
--- a/wp-content/themes/twentyfourteen/css/editor-blocks.css
+++ b/wp-content/themes/twentyfourteen/css/editor-blocks.css
@@ -371,6 +371,19 @@ p.has-drop-cap:not(:focus)::first-letter {
 	border: 0;
 }
 
+.wp-block-pullquote[class*="-font-size"] blockquote,
+.wp-block-pullquote[style*="font-size"] blockquote {
+	font-size: inherit;
+}
+
+.wp-block-pullquote[style*="font-style"] blockquote {
+	font-style: inherit;
+}
+
+.wp-block-pullquote[style*="font-weight"] blockquote {
+	font-weight: inherit;
+}
+
 .wp-block-pullquote .wp-block-pullquote__citation {
 	color: #2b2b2b;
 	font-size: 16px;
diff --git a/wp-content/themes/twentyfourteen/css/editor-style.css b/wp-content/themes/twentyfourteen/css/editor-style.css
index 0694248612..4f91b4200b 100644
--- a/wp-content/themes/twentyfourteen/css/editor-style.css
+++ b/wp-content/themes/twentyfourteen/css/editor-style.css
@@ -175,7 +175,7 @@ q:after {
 
 blockquote {
 	color: #767676;
-	font-size: inherit;
+	font-size: 19px;
 	font-style: italic;
 	font-weight: 300;
 	line-height: 1.2631578947;
diff --git a/wp-content/themes/twentyfourteen/style.css b/wp-content/themes/twentyfourteen/style.css
index b4ec5b95a0..8c6f821552 100644
--- a/wp-content/themes/twentyfourteen/style.css
+++ b/wp-content/themes/twentyfourteen/style.css
@@ -256,7 +256,7 @@ q:after {
 
 blockquote {
 	color: #767676;
-	font-size: inherit;
+	font-size: 19px;
 	font-style: italic;
 	font-weight: 300;
 	line-height: 1.2631578947;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4defef3454..002a14f0ec 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.6-alpha-58052';
+$wp_version = '6.6-alpha-58053';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.