From 9735c87bac0a743df8fa39dd7050f68c3d5ff0c7 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Thu, 31 Oct 2024 12:34:45 -0400
Subject: [PATCH 1/2] fix(scss): properly prefix string imports

---
 core/src/components/item/item.common.scss          |  1 -
 core/src/components/radio/radio.common.scss        |  1 -
 .../segment-button/segment-button.common.scss      |  1 -
 core/src/components/spinner/spinner.common.scss    |  2 --
 core/src/components/toast/toast.common.scss        |  3 ---
 core/src/themes/mixins.scss                        | 14 +++++++-------
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/core/src/components/item/item.common.scss b/core/src/components/item/item.common.scss
index 10cb8a048d9..47b91872cb4 100644
--- a/core/src/components/item/item.common.scss
+++ b/core/src/components/item/item.common.scss
@@ -1,4 +1,3 @@
-@import "../../themes/functions.string";
 @import "../../themes/mixins";
 
 // Item
diff --git a/core/src/components/radio/radio.common.scss b/core/src/components/radio/radio.common.scss
index beb5c1abece..7e9376bdc08 100644
--- a/core/src/components/radio/radio.common.scss
+++ b/core/src/components/radio/radio.common.scss
@@ -1,4 +1,3 @@
-@import "../../themes/functions.string";
 @import "../../themes/mixins";
 @import "./radio.vars.scss";
 
diff --git a/core/src/components/segment-button/segment-button.common.scss b/core/src/components/segment-button/segment-button.common.scss
index fc56465b00e..82564322842 100644
--- a/core/src/components/segment-button/segment-button.common.scss
+++ b/core/src/components/segment-button/segment-button.common.scss
@@ -1,4 +1,3 @@
-@import "../../themes/functions.string";
 @import "../../themes/mixins";
 
 // Segment Button: Common
diff --git a/core/src/components/spinner/spinner.common.scss b/core/src/components/spinner/spinner.common.scss
index 9a8dd1dc8bd..e2d222c04dd 100644
--- a/core/src/components/spinner/spinner.common.scss
+++ b/core/src/components/spinner/spinner.common.scss
@@ -1,5 +1,3 @@
-@import "../../themes/functions.string";
-@import "../../themes/functions.color";
 @import "../../themes/mixins";
 
 // Spinners
diff --git a/core/src/components/toast/toast.common.scss b/core/src/components/toast/toast.common.scss
index 22a2b30e4a4..bcf076530c7 100644
--- a/core/src/components/toast/toast.common.scss
+++ b/core/src/components/toast/toast.common.scss
@@ -1,7 +1,4 @@
 @import "../../themes/mixins";
-// Necessary for the mixins to work.
-@import "../../themes/functions.string";
-@import "../../themes/functions.color";
 
 // Toast
 // --------------------------------------------------
diff --git a/core/src/themes/mixins.scss b/core/src/themes/mixins.scss
index 0fd032dacb0..d21c89d2e9f 100644
--- a/core/src/themes/mixins.scss
+++ b/core/src/themes/mixins.scss
@@ -309,7 +309,7 @@
 // ----------------------------------------------------------
 @mixin svg-background-image($svg, $flip-rtl: false) {
   $url: url-encode($svg);
-  $viewBox: str-split(str-extract($svg, "viewBox='", "'"), " ");
+  $viewBox: string.str-split(string.str-extract($svg, "viewBox='", "'"), " ");
 
   @if $flip-rtl != true or $viewBox == null {
     @include multi-dir() {
@@ -318,9 +318,9 @@
   } @else {
     $transform: "transform='translate(#{nth($viewBox, 3)}, 0) scale(-1, 1)'";
     $flipped-url: $svg;
-    $flipped-url: str-replace($flipped-url, "<path", "<path #{$transform}");
-    $flipped-url: str-replace($flipped-url, "<line", "<line #{$transform}");
-    $flipped-url: str-replace($flipped-url, "<polygon", "<polygon #{$transform}");
+    $flipped-url: string.str-replace($flipped-url, "<path", "<path #{$transform}");
+    $flipped-url: string.str-replace($flipped-url, "<line", "<line #{$transform}");
+    $flipped-url: string.str-replace($flipped-url, "<polygon", "<polygon #{$transform}");
     $flipped-url: url-encode($flipped-url);
 
     @include ltr() {
@@ -575,10 +575,10 @@
 
   @each $transform in $transforms {
     @if (str-index($transform, translate3d)) {
-      $transform: str-replace($transform, "translate3d(");
-      $transform: str-replace($transform, ")");
+      $transform: string.str-replace($transform, "translate3d(");
+      $transform: string.str-replace($transform, ")");
 
-      $coordinates: str-split($transform, ",");
+      $coordinates: string.str-split($transform, ",");
 
       $x: nth($coordinates, 1);
       $y: nth($coordinates, 2);

From c64e0236befdedf4e9379c0a5ce5969cef3ec480 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Thu, 31 Oct 2024 13:23:42 -0400
Subject: [PATCH 2/2] fix(scss): add back color functions

---
 core/src/components/spinner/spinner.common.scss | 2 ++
 core/src/components/toast/toast.common.scss     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/core/src/components/spinner/spinner.common.scss b/core/src/components/spinner/spinner.common.scss
index e2d222c04dd..03173a0b232 100644
--- a/core/src/components/spinner/spinner.common.scss
+++ b/core/src/components/spinner/spinner.common.scss
@@ -1,4 +1,6 @@
 @import "../../themes/mixins";
+// Required to use the current-color function
+@import "../../themes/functions.color";
 
 // Spinners
 // --------------------------------------------------
diff --git a/core/src/components/toast/toast.common.scss b/core/src/components/toast/toast.common.scss
index bcf076530c7..db61c5293f7 100644
--- a/core/src/components/toast/toast.common.scss
+++ b/core/src/components/toast/toast.common.scss
@@ -1,4 +1,6 @@
 @import "../../themes/mixins";
+// Required to use the current-color function
+@import "../../themes/functions.color";
 
 // Toast
 // --------------------------------------------------