Skip to content

refactor(scss): properly prefix string imports #29987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2024
Merged

refactor(scss): properly prefix string imports #29987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9735c87
fix(scss): properly prefix string imports
brandyscarney Oct 31, 2024
c64e023
fix(scss): add back color functions
brandyscarney Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/src/components/item/item.common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../../themes/functions.string";
@import "../../themes/mixins";

// Item
Expand Down
1 change: 0 additions & 1 deletion core/src/components/radio/radio.common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../../themes/functions.string";
@import "../../themes/mixins";
@import "./radio.vars.scss";

Expand Down
1 change: 0 additions & 1 deletion core/src/components/segment-button/segment-button.common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../../themes/functions.string";
@import "../../themes/mixins";

// Segment Button: Common
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/spinner/spinner.common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
// --------------------------------------------------
Expand Down
3 changes: 1 addition & 2 deletions core/src/components/toast/toast.common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 7 additions & 7 deletions core/src/themes/mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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() {
Expand Down Expand Up @@ -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);
Expand Down
Loading