Skip to content

fix: sass mixed-decls deprecation #4098

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.

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 3 commits into from
Apr 29, 2025
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
"build-components": "npm-run-all build:mitosis build-components:post build-components:docs",
"build-components:docs": "npm run build:cem -w @db-ux/wc-core-components",
"build-components:post": "tsx scripts/post-build/index.ts",
"build-style:01_sass": "sass src:build --no-source-map --load-path=node_modules/ --load-path=../../node_modules/",
"build-style:01_sass": "sass src:build --no-source-map --load-path=node_modules/ --load-path=../../node_modules/ --fatal-deprecation=mixed-decls",
"build-style:02_postcss": "postcss build/**/*.css --replace",
"build:mitosis": "mitosis build -c configs/mitosis.config.cjs",
"compile:angular": "mitosis build -c configs/angular/mitosis.config.cjs && tsx scripts/exec/angular.ts && cpr ../../output/tmp/angular/src ../../output/angular/src -o",
8 changes: 4 additions & 4 deletions packages/components/src/components/switch/switch.scss
Original file line number Diff line number Diff line change
@@ -36,10 +36,10 @@ $checked-active-transition-size: calc(
}

.db-switch {
@include form-components.set-default-check-element(switch);

user-select: none;

@include form-components.set-default-check-element(switch);

// This is needed when clicking on the label instead of the input
@include helpers.active {
> input {
@@ -53,8 +53,6 @@ $checked-active-transition-size: calc(

@extend %db-overwrite-font-size-sm;

@include icons.set-icon("cross", "after");

appearance: none;
inline-size: calc(
#{form-components.$font-size-height} * 2 + #{$switch-fixed-padding}
@@ -68,6 +66,8 @@ $checked-active-transition-size: calc(
background-color: colors.$db-adaptive-bg-basic-transparent-full-default;
border-radius: variables.$db-border-radius-full;

@include icons.set-icon("cross", "after");

&::after {
visibility: hidden;
align-self: center;
Original file line number Diff line number Diff line change
@@ -282,11 +282,11 @@ $input-valid-types:
&:is(label),
> label {
&::after {
@include icons.icon-content("*");

// We're using 1px instead of a token here on purpose, as this is an edge case
/* stylelint-disable-next-line db-ux/use-spacings */
padding-inline-start: 1px;

@include icons.icon-content("*");
}
}
}
2 changes: 1 addition & 1 deletion packages/foundations/package.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"build": "npm-run-all build:*",
"build:01_normalize": "npm-run-all copy-prepare:*",
"build:02_copy": "npm run copy:scss",
"build:03_css": "sass --no-source-map --load-path=node_modules/ --load-path=../../node_modules/ build/styles",
"build:03_css": "sass --no-source-map --load-path=node_modules/ --load-path=../../node_modules/ build/styles --fatal-deprecation=mixed-decls",
"build:04_tailwind": "cpr tailwind build/tailwind -o",
"build:05_postcss": "postcss build/styles/**/*.css --replace",
"build:06_ide": "cpr ide build/ide -o",
4 changes: 2 additions & 2 deletions packages/foundations/scss/defaults/default-icons.scss
Original file line number Diff line number Diff line change
@@ -31,9 +31,9 @@
&::after {
@extend %icon !optional;

@include icons.icon-content(icons.$default-icon-content-after);

margin-inline-start: icons.$default-icon-margin-start;

@include icons.icon-content(icons.$default-icon-content-after);
}
}

7 changes: 4 additions & 3 deletions packages/foundations/scss/icons/_icon-helpers.scss
Original file line number Diff line number Diff line change
@@ -71,9 +71,9 @@ $default-icon-font-size: var(--db-icon-font-size, #{$default-icon-size-rem});
@if $position == "after" {
--db-icon-after: "#{$icon}";

@include icon-content($default-icon-content-after);

margin-inline-start: $default-icon-margin-start;

@include icon-content($default-icon-content-after);
}
}
}
@@ -122,7 +122,6 @@ $default-icon-font-size: var(--db-icon-font-size, #{$default-icon-size-rem});
}

%icon {
@include icon-content($default-icon-content); // TODO: ONLY FOR data-icon
color: var(--db-icon-color, inherit);
display: inline-block;

@@ -150,6 +149,8 @@ $default-icon-font-size: var(--db-icon-font-size, #{$default-icon-size-rem});
block-size: $default-icon-font-size;
inline-size: $default-icon-font-size;

@include icon-content($default-icon-content); // TODO: ONLY FOR data-icon

// Hiding icon from screenreaders
@media aural {
content: none;
Loading
Oops, something went wrong.