From 7a497b9c2fd24e5403a89b7e3fd71544a32e0753 Mon Sep 17 00:00:00 2001 From: whyisjake Date: Thu, 24 Aug 2023 16:16:12 +0000 Subject: [PATCH] Bundled Themes: Ensure that pull quotes are able to use the correct font size. Pull quote bodies weren't inheriting the correct styling from the block editor. This ensure that will happen. Props nidhidhandhukiya, poena, varjodesigns, jivygraphics, whyisjake. Fixes #57854. Built from https://develop.svn.wordpress.org/trunk@56451 git-svn-id: http://core.svn.wordpress.org/trunk@55963 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../twentytwentyone/assets/css/ie-editor.css | 23 +++++++++---------- .../themes/twentytwentyone/assets/css/ie.css | 23 +++++++++---------- .../assets/css/style-editor.css | 17 +++++++++----- .../sass/05-blocks/pullquote/_editor.scss | 17 +++++++++----- .../sass/05-blocks/pullquote/_style.scss | 17 +++++++++----- .../themes/twentytwentyone/style-rtl.css | 17 +++++++++----- wp-content/themes/twentytwentyone/style.css | 17 +++++++++----- wp-includes/version.php | 2 +- 8 files changed, 78 insertions(+), 55 deletions(-) diff --git a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css index b956827cad..6aecd8de6f 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css @@ -1507,6 +1507,11 @@ pre.wp-block-preformatted { color: currentColor; border-color: currentColor; position: relative; + font-weight: 700; + font-style: normal; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; + letter-spacing: normal; + line-height: 1.3; } .wp-block-pullquote blockquote::before { @@ -1521,20 +1526,14 @@ pre.wp-block-preformatted { } .wp-block-pullquote p { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 2rem; - font-style: normal; - font-weight: 700; - letter-spacing: normal; - line-height: 1.3; + font-family: inherit; + font-size: inherit; + font-style: inherit; + font-weight: inherit; + letter-spacing: inherit; + line-height: inherit; margin: 0; } -@media only screen and (min-width: 652px) { - - .wp-block-pullquote p { - font-size: 2rem; - } -} .wp-block-pullquote a { color: currentColor; diff --git a/wp-content/themes/twentytwentyone/assets/css/ie.css b/wp-content/themes/twentytwentyone/assets/css/ie.css index 39fa0b9095..3d8d605610 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie.css @@ -3655,6 +3655,11 @@ pre.wp-block-preformatted { color: currentColor; border-color: currentColor; position: relative; + font-weight: 700; + font-style: normal; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; + letter-spacing: normal; + line-height: 1.3; /** * Block Options @@ -3673,20 +3678,14 @@ pre.wp-block-preformatted { } .wp-block-pullquote p { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 2rem; - font-style: normal; - font-weight: 700; - letter-spacing: normal; - line-height: 1.3; + font-family: inherit; + font-size: inherit; + font-style: inherit; + font-weight: inherit; + letter-spacing: inherit; + line-height: inherit; margin: 0; } -@media only screen and (min-width: 652px) { - - .wp-block-pullquote p { - font-size: 2rem; - } -} .wp-block-pullquote a { color: currentColor; diff --git a/wp-content/themes/twentytwentyone/assets/css/style-editor.css b/wp-content/themes/twentytwentyone/assets/css/style-editor.css index 8f940eaa75..676e1981e8 100644 --- a/wp-content/themes/twentytwentyone/assets/css/style-editor.css +++ b/wp-content/themes/twentytwentyone/assets/css/style-editor.css @@ -1419,6 +1419,11 @@ pre.wp-block-preformatted { color: currentColor; border-color: currentColor; position: relative; + font-weight: 700; + font-style: var(--pullquote--font-style); + font-family: var(--pullquote--font-family); + letter-spacing: var(--pullquote--letter-spacing); + line-height: var(--pullquote--line-height); } .wp-block-pullquote blockquote::before { @@ -1433,12 +1438,12 @@ pre.wp-block-preformatted { } .wp-block-pullquote p { - font-family: var(--pullquote--font-family); - font-size: var(--pullquote--font-size); - font-style: var(--pullquote--font-style); - font-weight: 700; - letter-spacing: var(--pullquote--letter-spacing); - line-height: var(--pullquote--line-height); + font-family: inherit; + font-size: inherit; + font-style: inherit; + font-weight: inherit; + letter-spacing: inherit; + line-height: inherit; margin: 0; } diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_editor.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_editor.scss index 5b223b19e2..3eb13cbccd 100644 --- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_editor.scss +++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_editor.scss @@ -7,6 +7,11 @@ color: currentColor; border-color: currentColor; position: relative; + font-weight: 700; + font-style: var(--pullquote--font-style); + font-family: var(--pullquote--font-family); + letter-spacing: var(--pullquote--letter-spacing); + line-height: var(--pullquote--line-height); blockquote::before { color: currentColor; @@ -20,12 +25,12 @@ } p { - font-family: var(--pullquote--font-family); - font-size: var(--pullquote--font-size); - font-style: var(--pullquote--font-style); - font-weight: 700; - letter-spacing: var(--pullquote--letter-spacing); - line-height: var(--pullquote--line-height); + font-family: inherit; + font-size: inherit; + font-style: inherit; + font-weight: inherit; + letter-spacing: inherit; + line-height: inherit; margin: 0; } diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_style.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_style.scss index ad0bc2cb9d..686691199f 100644 --- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_style.scss +++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_style.scss @@ -7,6 +7,11 @@ color: currentColor; border-color: currentColor; position: relative; + font-weight: 700; + font-style: var(--pullquote--font-style); + font-family: var(--pullquote--font-family); + letter-spacing: var(--pullquote--letter-spacing); + line-height: var(--pullquote--line-height); blockquote::before { color: currentColor; @@ -20,12 +25,12 @@ } p { - font-family: var(--pullquote--font-family); - font-size: var(--pullquote--font-size); - font-style: var(--pullquote--font-style); - font-weight: 700; - letter-spacing: var(--pullquote--letter-spacing); - line-height: var(--pullquote--line-height); + font-family: inherit; + font-size: inherit; + font-style: inherit; + font-weight: inherit; + letter-spacing: inherit; + line-height: inherit; margin: 0; } diff --git a/wp-content/themes/twentytwentyone/style-rtl.css b/wp-content/themes/twentytwentyone/style-rtl.css index b134d9ca28..2b863b1588 100644 --- a/wp-content/themes/twentytwentyone/style-rtl.css +++ b/wp-content/themes/twentytwentyone/style-rtl.css @@ -2814,6 +2814,11 @@ pre.wp-block-preformatted { color: currentColor; border-color: currentColor; position: relative; + font-weight: 700; + font-style: var(--pullquote--font-style); + font-family: var(--pullquote--font-family); + letter-spacing: var(--pullquote--letter-spacing); + line-height: var(--pullquote--line-height); /** * Block Options @@ -2832,12 +2837,12 @@ pre.wp-block-preformatted { } .wp-block-pullquote p { - font-family: var(--pullquote--font-family); - font-size: var(--pullquote--font-size); - font-style: var(--pullquote--font-style); - font-weight: 700; - letter-spacing: var(--pullquote--letter-spacing); - line-height: var(--pullquote--line-height); + font-family: inherit; + font-size: inherit; + font-style: inherit; + font-weight: inherit; + letter-spacing: inherit; + line-height: inherit; margin: 0; } diff --git a/wp-content/themes/twentytwentyone/style.css b/wp-content/themes/twentytwentyone/style.css index 894a69074e..88302eb38c 100644 --- a/wp-content/themes/twentytwentyone/style.css +++ b/wp-content/themes/twentytwentyone/style.css @@ -2824,6 +2824,11 @@ pre.wp-block-preformatted { color: currentColor; border-color: currentColor; position: relative; + font-weight: 700; + font-style: var(--pullquote--font-style); + font-family: var(--pullquote--font-family); + letter-spacing: var(--pullquote--letter-spacing); + line-height: var(--pullquote--line-height); /** * Block Options @@ -2842,12 +2847,12 @@ pre.wp-block-preformatted { } .wp-block-pullquote p { - font-family: var(--pullquote--font-family); - font-size: var(--pullquote--font-size); - font-style: var(--pullquote--font-style); - font-weight: 700; - letter-spacing: var(--pullquote--letter-spacing); - line-height: var(--pullquote--line-height); + font-family: inherit; + font-size: inherit; + font-style: inherit; + font-weight: inherit; + letter-spacing: inherit; + line-height: inherit; margin: 0; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 38a12b40bd..0853fa1576 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.4-alpha-56450'; +$wp_version = '6.4-alpha-56451'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.