From 455bc37c685cc2ac52e55c12e503e1d43cdfd48c Mon Sep 17 00:00:00 2001 From: ryelle Date: Tue, 16 Feb 2021 20:12:02 +0000 Subject: [PATCH] Twenty Twenty-One: Remove background color from Social Links the dark gray style. This block variation doesn't support custom colors, so allowing a background color leads to a mismatch between frontend and editor styles. Props poena, paaljoachim, audrasjb. Fixes #52499. Built from https://develop.svn.wordpress.org/trunk@50364 git-svn-id: http://core.svn.wordpress.org/trunk@49975 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentytwentyone/assets/css/ie.css | 3 ++- .../assets/sass/05-blocks/social-icons/_style.scss | 3 ++- wp-content/themes/twentytwentyone/style-rtl.css | 3 ++- wp-content/themes/twentytwentyone/style.css | 3 ++- wp-includes/version.php | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/wp-content/themes/twentytwentyone/assets/css/ie.css b/wp-content/themes/twentytwentyone/assets/css/ie.css index c47e6b0810..32571c6d5c 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie.css @@ -4774,7 +4774,8 @@ hr.wp-block-separator.is-style-dots:before { color: #28303d; } -.wp-block-social-links.is-style-twentytwentyone-social-icons-color .wp-social-link { +.wp-block-social-links.is-style-twentytwentyone-social-icons-color .wp-social-link, +.wp-block-social-links.is-style-twentytwentyone-social-icons-color.has-icon-background-color.has-icon-background-color .wp-social-link { background: none; } diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/social-icons/_style.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/social-icons/_style.scss index 82f6d8f829..f63b263717 100644 --- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/social-icons/_style.scss +++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/social-icons/_style.scss @@ -10,7 +10,8 @@ color: var(--global--color-primary); } - .wp-social-link { + .wp-social-link, + &.has-icon-background-color.has-icon-background-color .wp-social-link { background: none; } diff --git a/wp-content/themes/twentytwentyone/style-rtl.css b/wp-content/themes/twentytwentyone/style-rtl.css index d907ce6d17..d217e88f07 100644 --- a/wp-content/themes/twentytwentyone/style-rtl.css +++ b/wp-content/themes/twentytwentyone/style-rtl.css @@ -3406,7 +3406,8 @@ hr.wp-block-separator.is-style-dots:before { color: var(--global--color-primary); } -.wp-block-social-links.is-style-twentytwentyone-social-icons-color .wp-social-link { +.wp-block-social-links.is-style-twentytwentyone-social-icons-color .wp-social-link, +.wp-block-social-links.is-style-twentytwentyone-social-icons-color.has-icon-background-color.has-icon-background-color .wp-social-link { background: none; } diff --git a/wp-content/themes/twentytwentyone/style.css b/wp-content/themes/twentytwentyone/style.css index 858f2a7fc3..39bd1a9682 100644 --- a/wp-content/themes/twentytwentyone/style.css +++ b/wp-content/themes/twentytwentyone/style.css @@ -3416,7 +3416,8 @@ hr.wp-block-separator.is-style-dots:before { color: var(--global--color-primary); } -.wp-block-social-links.is-style-twentytwentyone-social-icons-color .wp-social-link { +.wp-block-social-links.is-style-twentytwentyone-social-icons-color .wp-social-link, +.wp-block-social-links.is-style-twentytwentyone-social-icons-color.has-icon-background-color.has-icon-background-color .wp-social-link { background: none; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 5ab9c8a0a0..1ee8cd70a9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-beta2-50363'; +$wp_version = '5.7-beta2-50364'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.