From 2ee9a3ff2502117a8df7bc5c7bb46771fd2fbf35 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Fri, 21 Jan 2022 19:50:56 +0000 Subject: [PATCH] Bundled Themes: Reverts [52549]. [52549] updated some default presets in use by default themes to the new format. However, this change would cause elements to lose their styling when active on an older version of WordPress. See #54782. git-svn-id: https://develop.svn.wordpress.org/trunk@52615 602fd350-edb4-49c9-b593-d223f7449a82 --- .../assets/css/editor-style-block-rtl.css | 8 ++++---- .../assets/css/editor-style-block.css | 16 ++++++++-------- src/wp-content/themes/twentytwenty/style-rtl.css | 8 ++++---- src/wp-content/themes/twentytwenty/style.css | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css index aa1cdc0feb..98c02c4819 100644 --- a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css +++ b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css @@ -351,20 +351,20 @@ Inter variable font. Usage: } .editor-styles-wrapper p.has-small-font-size { - --wp--preset--font-size--small: 0.842em; + font-size: 0.842em; } .editor-styles-wrapper p.has-normal-font-size, .editor-styles-wrapper p.has-regular-font-size { - --wp--preset--font-size--normal: 1em; + font-size: 1em; } .editor-styles-wrapper p.has-medium-font-size { - --wp--preset--font-size--medium: 1.1em; + font-size: 1.1em; } .editor-styles-wrapper p.has-large-font-size { - --wp--preset--font-size--large: 1.25em; + font-size: 1.25em; } .editor-styles-wrapper p.has-larger-font-size { diff --git a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css index 841df00462..ed613946c4 100644 --- a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css +++ b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css @@ -206,21 +206,21 @@ Inter variable font. Usage: /* GENERAL COLORS */ .has-black-background-color { - --wp--preset--color--black: #000; + background-color: #000; color: #fff; } .has-white-background-color { - --wp--preset--color--white: #fff; + background-color: #fff; color: #000; } .has-black-color { - --wp--preset--color--black: #000; + color: #000; } .has-white-color { - --wp--preset--color--white: #fff; + color: #fff; } @@ -351,20 +351,20 @@ Inter variable font. Usage: } .editor-styles-wrapper p.has-small-font-size { - --wp--preset--font-size--small: 0.842em; + font-size: 0.842em; } .editor-styles-wrapper p.has-normal-font-size, .editor-styles-wrapper p.has-regular-font-size { - --wp--preset--font-size--normal: 1em; + font-size: 1em; } .editor-styles-wrapper p.has-medium-font-size { - --wp--preset--font-size--medium: 1.1em; + font-size: 1.1em; } .editor-styles-wrapper p.has-large-font-size { - --wp--preset--font-size--large: 1.25em; + font-size: 1.25em; } .editor-styles-wrapper p.has-larger-font-size { diff --git a/src/wp-content/themes/twentytwenty/style-rtl.css b/src/wp-content/themes/twentytwenty/style-rtl.css index b0aa58a28d..d823d31433 100644 --- a/src/wp-content/themes/twentytwenty/style-rtl.css +++ b/src/wp-content/themes/twentytwenty/style-rtl.css @@ -2836,21 +2836,21 @@ h2.entry-title { /* Block Font Sizes -------------------------- */ .entry-content .has-small-font-size { - --wp--preset--font-size--small: 0.842em; + font-size: 0.842em; } .entry-content .has-normal-font-size, .entry-content .has-regular-font-size { - --wp--preset--font-size--normal: 1em; + font-size: 1em; } .entry-content .has-medium-font-size { - --wp--preset--font-size--medium: 1.1em; + font-size: 1.1em; line-height: 1.45; } .entry-content .has-large-font-size { - --wp--preset--font-size--large: 1.25em; + font-size: 1.25em; line-height: 1.4; } diff --git a/src/wp-content/themes/twentytwenty/style.css b/src/wp-content/themes/twentytwenty/style.css index 06693752d2..a18ccc1018 100644 --- a/src/wp-content/themes/twentytwenty/style.css +++ b/src/wp-content/themes/twentytwenty/style.css @@ -2854,21 +2854,21 @@ h2.entry-title { /* Block Font Sizes -------------------------- */ .entry-content .has-small-font-size { - --wp--preset--font-size--small: 0.842em; + font-size: 0.842em; } .entry-content .has-normal-font-size, .entry-content .has-regular-font-size { - --wp--preset--font-size--normal: 1em; + font-size: 1em; } .entry-content .has-medium-font-size { - --wp--preset--font-size--medium: 1.1em; + font-size: 1.1em; line-height: 1.45; } .entry-content .has-large-font-size { - --wp--preset--font-size--large: 1.25em; + font-size: 1.25em; line-height: 1.4; }