From 42340de798feace8cb2b80a9526a440e09972132 Mon Sep 17 00:00:00 2001
From: mattyrob <mattyrobuk@gmail.com>
Date: Tue, 29 Oct 2024 10:18:11 +0000
Subject: [PATCH] Prepare for SASS 2.0.0 and 3.0.0

---
 src/wp-admin/css/colors/_admin.scss           | 4 +++-
 src/wp-admin/css/colors/_variables.scss       | 8 +++++---
 src/wp-admin/css/colors/blue/colors.scss      | 1 -
 src/wp-admin/css/colors/coffee/colors.scss    | 1 -
 src/wp-admin/css/colors/ectoplasm/colors.scss | 1 -
 src/wp-admin/css/colors/light/colors.scss     | 1 -
 src/wp-admin/css/colors/midnight/colors.scss  | 1 -
 src/wp-admin/css/colors/ocean/colors.scss     | 1 -
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/wp-admin/css/colors/_admin.scss b/src/wp-admin/css/colors/_admin.scss
index 17a5e6c0e8..40c497ba52 100644
--- a/src/wp-admin/css/colors/_admin.scss
+++ b/src/wp-admin/css/colors/_admin.scss
@@ -1,4 +1,6 @@
 
+@use 'sass:color';
+@use 'sass:string';
 @import 'variables';
 @import 'mixins';
 
@@ -7,7 +9,7 @@
  * may use the function in their own admin CSS files. See #56811.
  */
 @function url-friendly-colour( $color ) {
-	@return '%23' + str-slice( '#{ $color }', 2, -1 );
+	@return '%23' + string.slice( '#{ $color }', 2, -1 );
 }
 
 body {
diff --git a/src/wp-admin/css/colors/_variables.scss b/src/wp-admin/css/colors/_variables.scss
index f532732c43..18b5781827 100644
--- a/src/wp-admin/css/colors/_variables.scss
+++ b/src/wp-admin/css/colors/_variables.scss
@@ -1,3 +1,5 @@
+@use 'sass:color';
+
 // assign default value to all undefined variables
 
 $scheme-name: "default" !default;
@@ -37,7 +39,7 @@ $menu-current-text: $menu-highlight-text !default;
 $menu-current-icon: $menu-highlight-icon !default;
 $menu-current-background: $menu-highlight-background !default;
 
-$menu-submenu-text: mix( $base-color, $text-color, 30% ) !default;
+$menu-submenu-text: color.mix( $base-color, $text-color, 30% ) !default;
 $menu-submenu-background: color.adjust( $base-color, $lightness: -7% ) !default;
 $menu-submenu-background-alt: color.adjust( color.adjust( $menu-background, $lightness: 7% ), $saturation: -7% ) !default;
 
@@ -59,9 +61,9 @@ $adminbar-input-background: color.adjust( $menu-background, $lightness: 7% ) !de
 
 $adminbar-recovery-exit-text: $menu-bubble-text !default;
 $adminbar-recovery-exit-background: $menu-bubble-background !default;
-$adminbar-recovery-exit-background-alt: mix(black, $adminbar-recovery-exit-background, 10%) !default;
+$adminbar-recovery-exit-background-alt: color.mix(black, $adminbar-recovery-exit-background, 10%) !default;
 
-$menu-customizer-text: mix( $base-color, $text-color, 40% ) !default;
+$menu-customizer-text: color.mix( $base-color, $text-color, 40% ) !default;
 
 // Dashboard Colors
 
diff --git a/src/wp-admin/css/colors/blue/colors.scss b/src/wp-admin/css/colors/blue/colors.scss
index 230ae16a54..664b5e21a5 100644
--- a/src/wp-admin/css/colors/blue/colors.scss
+++ b/src/wp-admin/css/colors/blue/colors.scss
@@ -1,4 +1,3 @@
-@use 'sass:color';
 
 $scheme-name: "blue";
 $base-color: #52accc;
diff --git a/src/wp-admin/css/colors/coffee/colors.scss b/src/wp-admin/css/colors/coffee/colors.scss
index 5ac9a98ce6..4c398cc072 100644
--- a/src/wp-admin/css/colors/coffee/colors.scss
+++ b/src/wp-admin/css/colors/coffee/colors.scss
@@ -1,4 +1,3 @@
-@use 'sass:color';
 
 $scheme-name: "coffee";
 $base-color: #59524c;
diff --git a/src/wp-admin/css/colors/ectoplasm/colors.scss b/src/wp-admin/css/colors/ectoplasm/colors.scss
index bf693483f7..769b06594d 100644
--- a/src/wp-admin/css/colors/ectoplasm/colors.scss
+++ b/src/wp-admin/css/colors/ectoplasm/colors.scss
@@ -1,4 +1,3 @@
-@use 'sass:color';
 
 $scheme-name: "ectoplasm";
 $base-color: #523f6d;
diff --git a/src/wp-admin/css/colors/light/colors.scss b/src/wp-admin/css/colors/light/colors.scss
index 9596bc1fc5..72783635a4 100644
--- a/src/wp-admin/css/colors/light/colors.scss
+++ b/src/wp-admin/css/colors/light/colors.scss
@@ -1,4 +1,3 @@
-@use 'sass:color';
 
 $scheme-name: "light";
 $base-color: #e5e5e5;
diff --git a/src/wp-admin/css/colors/midnight/colors.scss b/src/wp-admin/css/colors/midnight/colors.scss
index 3f4f6f278e..305aa27c8e 100644
--- a/src/wp-admin/css/colors/midnight/colors.scss
+++ b/src/wp-admin/css/colors/midnight/colors.scss
@@ -1,4 +1,3 @@
-@use 'sass:color';
 
 $scheme-name: "midnight";
 $base-color: #363b3f;
diff --git a/src/wp-admin/css/colors/ocean/colors.scss b/src/wp-admin/css/colors/ocean/colors.scss
index 1d5921981d..cf17112b85 100644
--- a/src/wp-admin/css/colors/ocean/colors.scss
+++ b/src/wp-admin/css/colors/ocean/colors.scss
@@ -1,4 +1,3 @@
-@use 'sass:color';
 
 $scheme-name: "ocean";
 $base-color: #738e96;
-- 
2.47.0