From ccbfdd14858b4e1abcd96e5deb45aeddb1072d1c Mon Sep 17 00:00:00 2001 From: Kelly Choyce-Dwan Date: Thu, 18 Feb 2021 20:44:24 +0000 Subject: [PATCH] Twenty Twenty-One: Add the px unit to the admin bar height custom property. The admin bar height custom property is used in `calc` functions, which require consistent unit use, even when the value is zero. A unitless value returns an invalid value for the "height" property, where this variable is used. This also changes the stylelint rule in the theme to allow zero values with a unit, just in custom properties. Props nico23. Fixes #52564. git-svn-id: https://develop.svn.wordpress.org/trunk@50388 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-content/themes/twentytwentyone/.stylelintrc-css.json | 3 ++- .../themes/twentytwentyone/assets/css/style-editor.css | 2 +- .../themes/twentytwentyone/assets/sass/01-settings/global.scss | 2 +- src/wp-content/themes/twentytwentyone/style-rtl.css | 2 +- src/wp-content/themes/twentytwentyone/style.css | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/wp-content/themes/twentytwentyone/.stylelintrc-css.json b/src/wp-content/themes/twentytwentyone/.stylelintrc-css.json index c48e0bee62..810b6b5889 100644 --- a/src/wp-content/themes/twentytwentyone/.stylelintrc-css.json +++ b/src/wp-content/themes/twentytwentyone/.stylelintrc-css.json @@ -17,6 +17,7 @@ "at-rule-empty-line-before": null, "selector-pseudo-element-colon-notation": null, "number-leading-zero": null, - "no-descending-specificity": null + "no-descending-specificity": null, + "length-zero-no-unit": [true, {"ignore": ["custom-properties"]}] } } diff --git a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css index dda0334ba3..67791c1eb0 100644 --- a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css +++ b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css @@ -224,7 +224,7 @@ --widget--spacing-menu: calc(0.66 * var(--global--spacing-unit)); /* Admin-bar height */ - --global--admin-bar--height: 0; + --global--admin-bar--height: 0px; } .admin-bar { diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/global.scss b/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/global.scss index 45d6086ccc..91d845259a 100644 --- a/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/global.scss +++ b/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/global.scss @@ -227,7 +227,7 @@ $baseline-unit: 10px; --widget--spacing-menu: calc(0.66 * var(--global--spacing-unit)); /* Admin-bar height */ - --global--admin-bar--height: 0; + --global--admin-bar--height: 0px; } .admin-bar { diff --git a/src/wp-content/themes/twentytwentyone/style-rtl.css b/src/wp-content/themes/twentytwentyone/style-rtl.css index d217e88f07..0ccb8eee57 100644 --- a/src/wp-content/themes/twentytwentyone/style-rtl.css +++ b/src/wp-content/themes/twentytwentyone/style-rtl.css @@ -317,7 +317,7 @@ Twenty Twenty-One is distributed under the terms of the GNU GPL. --widget--spacing-menu: calc(0.66 * var(--global--spacing-unit)); /* Admin-bar height */ - --global--admin-bar--height: 0; + --global--admin-bar--height: 0px; } .admin-bar { diff --git a/src/wp-content/themes/twentytwentyone/style.css b/src/wp-content/themes/twentytwentyone/style.css index 39bd1a9682..4511b4461e 100644 --- a/src/wp-content/themes/twentytwentyone/style.css +++ b/src/wp-content/themes/twentytwentyone/style.css @@ -317,7 +317,7 @@ Twenty Twenty-One is distributed under the terms of the GNU GPL. --widget--spacing-menu: calc(0.66 * var(--global--spacing-unit)); /* Admin-bar height */ - --global--admin-bar--height: 0; + --global--admin-bar--height: 0px; } .admin-bar {