From 112eb192f19c2a2e8822adbad33b99cde510bf44 Mon Sep 17 00:00:00 2001 From: Tammie Lister Date: Tue, 16 Jul 2024 10:04:13 +0000 Subject: [PATCH] Multiple themes: Verse block font family different on front. The font family was not showing correctly for the verse block. The approach taken was to match the front end and this involved also removing the styles in [50358]. Props pranitdugad, sabernhardt, poena, pitamdey. Fixes #61140. Built from https://develop.svn.wordpress.org/trunk@58731 git-svn-id: http://core.svn.wordpress.org/trunk@58133 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyeleven/editor-blocks.css | 6 ------ wp-content/themes/twentyfifteen/css/editor-blocks.css | 6 ------ wp-content/themes/twentyfourteen/css/editor-blocks.css | 6 ------ .../themes/twentyseventeen/assets/css/editor-blocks.css | 6 ------ wp-content/themes/twentysixteen/css/editor-blocks.css | 6 ------ wp-content/themes/twentythirteen/css/editor-blocks.css | 6 ------ .../twentytwenty/assets/css/editor-style-block-rtl.css | 1 - .../themes/twentytwenty/assets/css/editor-style-block.css | 1 - wp-includes/version.php | 2 +- 9 files changed, 1 insertion(+), 39 deletions(-) diff --git a/wp-content/themes/twentyeleven/editor-blocks.css b/wp-content/themes/twentyeleven/editor-blocks.css index afde2c6d13..0307155572 100644 --- a/wp-content/themes/twentyeleven/editor-blocks.css +++ b/wp-content/themes/twentyeleven/editor-blocks.css @@ -409,12 +409,6 @@ p.has-drop-cap:not(:focus)::first-letter { text-align: right; } -/* Verse */ - -.editor-styles-wrapper .wp-block-verse { - font-family: inherit; -} - /*-------------------------------------------------------------- 5.0 Blocks - Layout Elements diff --git a/wp-content/themes/twentyfifteen/css/editor-blocks.css b/wp-content/themes/twentyfifteen/css/editor-blocks.css index 9ff366708d..8b5012860d 100644 --- a/wp-content/themes/twentyfifteen/css/editor-blocks.css +++ b/wp-content/themes/twentyfifteen/css/editor-blocks.css @@ -741,12 +741,6 @@ p.has-drop-cap:not(:focus)::first-letter { text-align: right; } -/* Verse */ - -.editor-styles-wrapper .wp-block-verse { - font-family: inherit; -} - /*-------------------------------------------------------------- 5.0 Blocks - Layout Elements --------------------------------------------------------------*/ diff --git a/wp-content/themes/twentyfourteen/css/editor-blocks.css b/wp-content/themes/twentyfourteen/css/editor-blocks.css index 222bf085a5..97ca4fae6f 100644 --- a/wp-content/themes/twentyfourteen/css/editor-blocks.css +++ b/wp-content/themes/twentyfourteen/css/editor-blocks.css @@ -417,12 +417,6 @@ p.has-drop-cap:not(:focus)::first-letter { } } -/* Verse */ - -.editor-styles-wrapper .wp-block-verse { - font-family: inherit; -} - /*-------------------------------------------------------------- 5.0 Blocks - Layout Elements --------------------------------------------------------------*/ diff --git a/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css b/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css index 6c17ad2960..34a4749db7 100644 --- a/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css +++ b/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css @@ -720,12 +720,6 @@ table.wp-block-table td:last-child { font-weight: inherit; } -/* Verse */ - -.editor-styles-wrapper .wp-block-verse { - font-family: inherit; -} - /*-------------------------------------------------------------- 5.0 Blocks - Layout Elements --------------------------------------------------------------*/ diff --git a/wp-content/themes/twentysixteen/css/editor-blocks.css b/wp-content/themes/twentysixteen/css/editor-blocks.css index d5841218d0..fb79e47200 100644 --- a/wp-content/themes/twentysixteen/css/editor-blocks.css +++ b/wp-content/themes/twentysixteen/css/editor-blocks.css @@ -552,12 +552,6 @@ figure[class*="wp-block-"] > figcaption { text-align: right; } -/* Verse */ - -.editor-styles-wrapper .wp-block-verse { - font-family: inherit; -} - /*-------------------------------------------------------------- 5.0 Blocks - Layout Elements --------------------------------------------------------------*/ diff --git a/wp-content/themes/twentythirteen/css/editor-blocks.css b/wp-content/themes/twentythirteen/css/editor-blocks.css index 6139063036..d92efb9754 100644 --- a/wp-content/themes/twentythirteen/css/editor-blocks.css +++ b/wp-content/themes/twentythirteen/css/editor-blocks.css @@ -272,12 +272,6 @@ p.has-drop-cap:not(:focus)::first-letter { text-decoration: none; } -/* Verse */ - -.editor-styles-wrapper .wp-block-verse { - font-family: inherit; -} - /*-------------------------------------------------------------- 5.0 Blocks - Formatting --------------------------------------------------------------*/ diff --git a/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css b/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css index d4f3f02c8b..c9bffdafd0 100644 --- a/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css +++ b/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css @@ -913,7 +913,6 @@ hr.wp-block-separator.is-style-dots::before { .editor-styles-wrapper .wp-block-verse pre, .editor-styles-wrapper pre.wp-block-verse { - font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif; font-size: 0.9em; } diff --git a/wp-content/themes/twentytwenty/assets/css/editor-style-block.css b/wp-content/themes/twentytwenty/assets/css/editor-style-block.css index 8699e3403f..37782c7a8b 100644 --- a/wp-content/themes/twentytwenty/assets/css/editor-style-block.css +++ b/wp-content/themes/twentytwenty/assets/css/editor-style-block.css @@ -917,7 +917,6 @@ hr.wp-block-separator.is-style-dots::before { .editor-styles-wrapper .wp-block-verse pre, .editor-styles-wrapper pre.wp-block-verse { - font-family: NonBreakingSpaceOverride, "Hoefler Text", Garamond, "Times New Roman", serif; font-size: 0.9em; } diff --git a/wp-includes/version.php b/wp-includes/version.php index f5ecd4c228..ffea278585 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.7-alpha-58730'; +$wp_version = '6.7-alpha-58731'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.