From c5409cd17b77c4ea1820a5ecd68df4068c5822db Mon Sep 17 00:00:00 2001 From: audrasjb Date: Wed, 11 Jan 2023 09:17:21 +0000 Subject: [PATCH] General: revert [55045]. This changeset reverts [55045] to maintain backward compatibility for developers using the function in their SCSS. Follow-up to [55045]. Unprops audrasjb. Props peterwilsoncc, kebbet. See #56811. Built from https://develop.svn.wordpress.org/trunk@55048 git-svn-id: http://core.svn.wordpress.org/trunk@54581 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/colors/_admin.scss | 8 ++++++-- wp-admin/css/colors/blue/colors-rtl.css | 4 ++++ wp-admin/css/colors/blue/colors.css | 4 ++++ wp-admin/css/colors/coffee/colors-rtl.css | 4 ++++ wp-admin/css/colors/coffee/colors.css | 4 ++++ wp-admin/css/colors/ectoplasm/colors-rtl.css | 4 ++++ wp-admin/css/colors/ectoplasm/colors.css | 4 ++++ wp-admin/css/colors/light/colors-rtl.css | 4 ++++ wp-admin/css/colors/light/colors.css | 4 ++++ wp-admin/css/colors/midnight/colors-rtl.css | 4 ++++ wp-admin/css/colors/midnight/colors.css | 4 ++++ wp-admin/css/colors/modern/colors-rtl.css | 4 ++++ wp-admin/css/colors/modern/colors.css | 4 ++++ wp-admin/css/colors/ocean/colors-rtl.css | 4 ++++ wp-admin/css/colors/ocean/colors.css | 4 ++++ wp-admin/css/colors/sunrise/colors-rtl.css | 4 ++++ wp-admin/css/colors/sunrise/colors.css | 4 ++++ wp-includes/version.php | 2 +- 18 files changed, 71 insertions(+), 3 deletions(-) diff --git a/wp-admin/css/colors/_admin.scss b/wp-admin/css/colors/_admin.scss index 427e2ad37a..1d06aa93fb 100644 --- a/wp-admin/css/colors/_admin.scss +++ b/wp-admin/css/colors/_admin.scss @@ -2,7 +2,11 @@ @import 'variables'; @import 'mixins'; -@function url-friendly-color( $color ) { +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ +@function url-friendly-colour( $color ) { @return '%23' + str-slice( '#{ $color }', 2, -1 ); } @@ -62,7 +66,7 @@ span.wp-media-buttons-icon:before { /* Forms */ input[type=checkbox]:checked::before { - content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27#{url-friendly-color($form-checked)}%27%2F%3E%3C%2Fsvg%3E"); + content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27#{url-friendly-colour($form-checked)}%27%2F%3E%3C%2Fsvg%3E"); } input[type=radio]:checked::before { diff --git a/wp-admin/css/colors/blue/colors-rtl.css b/wp-admin/css/colors/blue/colors-rtl.css index 858a205b03..3dcb0f3430 100644 --- a/wp-admin/css/colors/blue/colors-rtl.css +++ b/wp-admin/css/colors/blue/colors-rtl.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/blue/colors.css b/wp-admin/css/colors/blue/colors.css index 99b491ec3b..2223850aad 100644 --- a/wp-admin/css/colors/blue/colors.css +++ b/wp-admin/css/colors/blue/colors.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/coffee/colors-rtl.css b/wp-admin/css/colors/coffee/colors-rtl.css index b7ad7695ff..415d0c3454 100644 --- a/wp-admin/css/colors/coffee/colors-rtl.css +++ b/wp-admin/css/colors/coffee/colors-rtl.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/coffee/colors.css b/wp-admin/css/colors/coffee/colors.css index bbf6dd2d34..332a2d0a97 100644 --- a/wp-admin/css/colors/coffee/colors.css +++ b/wp-admin/css/colors/coffee/colors.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/ectoplasm/colors-rtl.css b/wp-admin/css/colors/ectoplasm/colors-rtl.css index 87356d1cf0..f694b1b205 100644 --- a/wp-admin/css/colors/ectoplasm/colors-rtl.css +++ b/wp-admin/css/colors/ectoplasm/colors-rtl.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/ectoplasm/colors.css b/wp-admin/css/colors/ectoplasm/colors.css index 09f4c6ae19..8781f1f9db 100644 --- a/wp-admin/css/colors/ectoplasm/colors.css +++ b/wp-admin/css/colors/ectoplasm/colors.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/light/colors-rtl.css b/wp-admin/css/colors/light/colors-rtl.css index d5d24088df..4c4a38ca27 100644 --- a/wp-admin/css/colors/light/colors-rtl.css +++ b/wp-admin/css/colors/light/colors-rtl.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f5f5f5; } diff --git a/wp-admin/css/colors/light/colors.css b/wp-admin/css/colors/light/colors.css index 38a4fb02e4..84a88649cc 100644 --- a/wp-admin/css/colors/light/colors.css +++ b/wp-admin/css/colors/light/colors.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f5f5f5; } diff --git a/wp-admin/css/colors/midnight/colors-rtl.css b/wp-admin/css/colors/midnight/colors-rtl.css index f123afaedb..3a7366fcd3 100644 --- a/wp-admin/css/colors/midnight/colors-rtl.css +++ b/wp-admin/css/colors/midnight/colors-rtl.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/midnight/colors.css b/wp-admin/css/colors/midnight/colors.css index 77a4d0ee6c..5a67ff9127 100644 --- a/wp-admin/css/colors/midnight/colors.css +++ b/wp-admin/css/colors/midnight/colors.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/modern/colors-rtl.css b/wp-admin/css/colors/modern/colors-rtl.css index ef3be373e6..087a3a8f1b 100644 --- a/wp-admin/css/colors/modern/colors-rtl.css +++ b/wp-admin/css/colors/modern/colors-rtl.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/modern/colors.css b/wp-admin/css/colors/modern/colors.css index f7d850cd75..df1fc49e76 100644 --- a/wp-admin/css/colors/modern/colors.css +++ b/wp-admin/css/colors/modern/colors.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/ocean/colors-rtl.css b/wp-admin/css/colors/ocean/colors-rtl.css index db211f9c94..0cff43a412 100644 --- a/wp-admin/css/colors/ocean/colors-rtl.css +++ b/wp-admin/css/colors/ocean/colors-rtl.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/ocean/colors.css b/wp-admin/css/colors/ocean/colors.css index 1fba4996ae..352b1b7fef 100644 --- a/wp-admin/css/colors/ocean/colors.css +++ b/wp-admin/css/colors/ocean/colors.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/sunrise/colors-rtl.css b/wp-admin/css/colors/sunrise/colors-rtl.css index 5208ccf1c5..1a111977f0 100644 --- a/wp-admin/css/colors/sunrise/colors-rtl.css +++ b/wp-admin/css/colors/sunrise/colors-rtl.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-admin/css/colors/sunrise/colors.css b/wp-admin/css/colors/sunrise/colors.css index 779b681a40..ec60d9d500 100644 --- a/wp-admin/css/colors/sunrise/colors.css +++ b/wp-admin/css/colors/sunrise/colors.css @@ -3,6 +3,10 @@ * Button mixin- creates a button effect with correct * highlights/shadows, based on a base color. */ +/** + * This function name uses British English to maintain backward compatibility, as developers + * may use the function in their own admin CSS files. See #56811. + */ body { background: #f1f1f1; } diff --git a/wp-includes/version.php b/wp-includes/version.php index bc296d727d..308c0c674a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-55047'; +$wp_version = '6.2-alpha-55048'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.