From ca091e277375815b9a24700bc782bd0fd9a20d1c Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Thu, 31 Oct 2024 14:16:52 -0400 Subject: [PATCH] refactor(scss): properly prefix string imports (#29987) --- 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 | 4 ++-- core/src/components/toast/toast.common.scss | 3 +-- core/src/themes/mixins.scss | 14 +++++++------- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/core/src/components/item/item.common.scss b/core/src/components/item/item.common.scss index 10cb8a048d..47b91872cb 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 beb5c1abec..7e9376bdc0 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 fc56465b00..8256432284 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 9a8dd1dc8b..03173a0b23 100644 --- a/core/src/components/spinner/spinner.common.scss +++ b/core/src/components/spinner/spinner.common.scss @@ -1,6 +1,6 @@ -@import "../../themes/functions.string"; -@import "../../themes/functions.color"; @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 22a2b30e4a..db61c5293f 100644 --- a/core/src/components/toast/toast.common.scss +++ b/core/src/components/toast/toast.common.scss @@ -1,6 +1,5 @@ @import "../../themes/mixins"; -// Necessary for the mixins to work. -@import "../../themes/functions.string"; +// Required to use the current-color function @import "../../themes/functions.color"; // Toast diff --git a/core/src/themes/mixins.scss b/core/src/themes/mixins.scss index 0fd032dacb..d21c89d2e9 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, "