From 7308b2518f10e263fd55da77eff16bc53cd086d6 Mon Sep 17 00:00:00 2001 From: Tammie Lister Date: Tue, 23 Jul 2024 09:59:15 +0000 Subject: [PATCH] Twenty Twenty: Fixes incorrect colour in editor for seperator block. This resolves the seperator block color settings ordering. They were displaying incorrectly due to ruleset problems. This edits the order for the front end also. Props bhaveshdesai13, aniketpatel, miguelaxcar, nidhidhandhukiya, poena, pavanpatil1, sabernhardr. Fixes #57544. Built from https://develop.svn.wordpress.org/trunk@58784 git-svn-id: http://core.svn.wordpress.org/trunk@58186 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../assets/css/editor-style-block-rtl.css | 40 +++++++++---------- .../assets/css/editor-style-block.css | 40 +++++++++---------- wp-content/themes/twentytwenty/style-rtl.css | 40 +++++++++---------- wp-content/themes/twentytwenty/style.css | 40 +++++++++---------- wp-includes/version.php | 2 +- 5 files changed, 81 insertions(+), 81 deletions(-) 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 c9bffdafd0..f228e5d0cc 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 @@ -140,51 +140,51 @@ /* CUSTOM COLORS */ -:root .has-accent-color { - color: #cd2653; -} - :root .has-accent-background-color { background-color: #cd2653; color: #fff; } -:root .has-primary-color { - color: #000; -} - :root .has-primary-background-color { background-color: #000; color: #f5efe0; } -:root .has-secondary-color { - color: #6d6d6d; -} - :root .has-secondary-background-color { background-color: #6d6d6d; color: #fff; } -:root .has-subtle-background-color { - color: #dcd7ca; -} - :root .has-subtle-background-background-color { background-color: #dcd7ca; color: #000; } -:root .has-background-color { - color: #f5efe0; -} - :root .has-background-background-color { background-color: #f5efe0; color: #000; } +:root .has-accent-color { + color: #cd2653; +} + +:root .has-primary-color { + color: #000; +} + +:root .has-secondary-color { + color: #6d6d6d; +} + +:root .has-subtle-background-color { + color: #dcd7ca; +} + +:root .has-background-color { + color: #f5efe0; +} + /* GENERAL COLORS */ .has-black-background-color { 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 37782c7a8b..5287a99d11 100644 --- a/wp-content/themes/twentytwenty/assets/css/editor-style-block.css +++ b/wp-content/themes/twentytwenty/assets/css/editor-style-block.css @@ -140,51 +140,51 @@ /* CUSTOM COLORS */ -:root .has-accent-color { - color: #cd2653; -} - :root .has-accent-background-color { background-color: #cd2653; color: #fff; } -:root .has-primary-color { - color: #000; -} - :root .has-primary-background-color { background-color: #000; color: #f5efe0; } -:root .has-secondary-color { - color: #6d6d6d; -} - :root .has-secondary-background-color { background-color: #6d6d6d; color: #fff; } -:root .has-subtle-background-color { - color: #dcd7ca; -} - :root .has-subtle-background-background-color { background-color: #dcd7ca; color: #000; } -:root .has-background-color { - color: #f5efe0; -} - :root .has-background-background-color { background-color: #f5efe0; color: #000; } +:root .has-accent-color { + color: #cd2653; +} + +:root .has-primary-color { + color: #000; +} + +:root .has-secondary-color { + color: #6d6d6d; +} + +:root .has-subtle-background-color { + color: #dcd7ca; +} + +:root .has-background-color { + color: #f5efe0; +} + /* GENERAL COLORS */ .has-black-background-color { diff --git a/wp-content/themes/twentytwenty/style-rtl.css b/wp-content/themes/twentytwenty/style-rtl.css index 2b80e059ff..4f4c86e76d 100644 --- a/wp-content/themes/twentytwenty/style-rtl.css +++ b/wp-content/themes/twentytwenty/style-rtl.css @@ -2734,51 +2734,51 @@ h2.entry-title { /* CUSTOM COLORS */ -:root .has-accent-color { - color: #cd2653; -} - :root .has-accent-background-color { background-color: #cd2653; color: #fff; } -:root .has-primary-color { - color: #000; -} - :root .has-primary-background-color { background-color: #000; color: #f5efe0; } -:root .has-secondary-color { - color: #6d6d6d; -} - :root .has-secondary-background-color { background-color: #6d6d6d; color: #fff; } -:root .has-subtle-background-color { - color: #dcd7ca; -} - :root .has-subtle-background-background-color { background-color: #dcd7ca; color: #000; } -:root .has-background-color { - color: #f5efe0; -} - :root .has-background-background-color { background-color: #f5efe0; color: #000; } +:root .has-accent-color { + color: #cd2653; +} + +:root .has-primary-color { + color: #000; +} + +:root .has-secondary-color { + color: #6d6d6d; +} + +:root .has-subtle-background-color { + color: #dcd7ca; +} + +:root .has-background-color { + color: #f5efe0; +} + /* Block Typography Classes ------------------ */ diff --git a/wp-content/themes/twentytwenty/style.css b/wp-content/themes/twentytwenty/style.css index 75625d39ec..babe5a090a 100644 --- a/wp-content/themes/twentytwenty/style.css +++ b/wp-content/themes/twentytwenty/style.css @@ -2750,51 +2750,51 @@ h2.entry-title { /* CUSTOM COLORS */ -:root .has-accent-color { - color: #cd2653; -} - :root .has-accent-background-color { background-color: #cd2653; color: #fff; } -:root .has-primary-color { - color: #000; -} - :root .has-primary-background-color { background-color: #000; color: #f5efe0; } -:root .has-secondary-color { - color: #6d6d6d; -} - :root .has-secondary-background-color { background-color: #6d6d6d; color: #fff; } -:root .has-subtle-background-color { - color: #dcd7ca; -} - :root .has-subtle-background-background-color { background-color: #dcd7ca; color: #000; } -:root .has-background-color { - color: #f5efe0; -} - :root .has-background-background-color { background-color: #f5efe0; color: #000; } +:root .has-accent-color { + color: #cd2653; +} + +:root .has-primary-color { + color: #000; +} + +:root .has-secondary-color { + color: #6d6d6d; +} + +:root .has-subtle-background-color { + color: #dcd7ca; +} + +:root .has-background-color { + color: #f5efe0; +} + /* Block Typography Classes ------------------ */ diff --git a/wp-includes/version.php b/wp-includes/version.php index d890144262..768d88bed2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.7-alpha-58783'; +$wp_version = '6.7-alpha-58784'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.