From 3d5cf30808b0b0a2fcefb95718b36422ee433ad4 Mon Sep 17 00:00:00 2001 From: hellofromTonya Date: Tue, 17 Oct 2023 13:50:21 +0000 Subject: [PATCH] Bundled Themes: Revert 56451. Reverts [56451] to avoid the following issues: * missing the default `font-size` for anyone who does not use the size control. * unintentional reduction in citation's `line-height` down to the `--pullquote--line-height` value (1.3 instead of 1.6). With 6.4 RC1 happening shortly, this revert is necessary to avoid shipping this issues in the release, while giving the time needed to resolve in the next cycle. Follow-up to [56451]. Props sabernhardt, nicolefurlan. See #57854. Built from https://develop.svn.wordpress.org/trunk@56959 git-svn-id: http://core.svn.wordpress.org/trunk@56470 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, 55 insertions(+), 78 deletions(-) diff --git a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css index bd2b26dc97..a92c6b5947 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css @@ -1507,11 +1507,6 @@ 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 { @@ -1526,14 +1521,20 @@ pre.wp-block-preformatted { } .wp-block-pullquote p { - font-family: inherit; - font-size: inherit; - font-style: inherit; - font-weight: inherit; - letter-spacing: inherit; - line-height: inherit; + 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; 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 3d8d605610..39fa0b9095 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie.css @@ -3655,11 +3655,6 @@ 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 @@ -3678,14 +3673,20 @@ pre.wp-block-preformatted { } .wp-block-pullquote p { - font-family: inherit; - font-size: inherit; - font-style: inherit; - font-weight: inherit; - letter-spacing: inherit; - line-height: inherit; + 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; 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 8d37165af1..382da13dc9 100644 --- a/wp-content/themes/twentytwentyone/assets/css/style-editor.css +++ b/wp-content/themes/twentytwentyone/assets/css/style-editor.css @@ -1419,11 +1419,6 @@ 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 { @@ -1438,12 +1433,12 @@ pre.wp-block-preformatted { } .wp-block-pullquote p { - font-family: inherit; - font-size: inherit; - font-style: inherit; - font-weight: inherit; - letter-spacing: inherit; - line-height: inherit; + 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); 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 3eb13cbccd..5b223b19e2 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,11 +7,6 @@ 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; @@ -25,12 +20,12 @@ } p { - font-family: inherit; - font-size: inherit; - font-style: inherit; - font-weight: inherit; - letter-spacing: inherit; - line-height: inherit; + 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); 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 686691199f..ad0bc2cb9d 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,11 +7,6 @@ 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; @@ -25,12 +20,12 @@ } p { - font-family: inherit; - font-size: inherit; - font-style: inherit; - font-weight: inherit; - letter-spacing: inherit; - line-height: inherit; + 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); margin: 0; } diff --git a/wp-content/themes/twentytwentyone/style-rtl.css b/wp-content/themes/twentytwentyone/style-rtl.css index 2b863b1588..b134d9ca28 100644 --- a/wp-content/themes/twentytwentyone/style-rtl.css +++ b/wp-content/themes/twentytwentyone/style-rtl.css @@ -2814,11 +2814,6 @@ 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 @@ -2837,12 +2832,12 @@ pre.wp-block-preformatted { } .wp-block-pullquote p { - font-family: inherit; - font-size: inherit; - font-style: inherit; - font-weight: inherit; - letter-spacing: inherit; - line-height: inherit; + 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); margin: 0; } diff --git a/wp-content/themes/twentytwentyone/style.css b/wp-content/themes/twentytwentyone/style.css index 88302eb38c..894a69074e 100644 --- a/wp-content/themes/twentytwentyone/style.css +++ b/wp-content/themes/twentytwentyone/style.css @@ -2824,11 +2824,6 @@ 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 @@ -2847,12 +2842,12 @@ pre.wp-block-preformatted { } .wp-block-pullquote p { - font-family: inherit; - font-size: inherit; - font-style: inherit; - font-weight: inherit; - letter-spacing: inherit; - line-height: inherit; + 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); margin: 0; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 23b0fcf904..8da6150478 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.4-beta4-56958'; +$wp_version = '6.4-beta4-56959'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.