Skip to content

Commit ae4386d

Browse files
committed
Update scss color variants
1 parent d8225a8 commit ae4386d

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

scss/base/colors.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use "sass:map";
2-
@use "../mixins/css3/text";
2+
@use "../mixins/css3/decorators";
33
@use "../color_vars" as colors;
44
@use "../variables" as vars;
55

@@ -16,15 +16,15 @@ $compact-colors: map.remove(colors.$context-colors,
1616
);
1717

1818
@each $name, $color in $compact-colors {
19-
@include text.decorate-color($color, $name);
19+
@include decorators.decorate-color($color, $name);
2020
}
2121

2222
// Manually adds duplicate colors
2323
//--------------------------------
24-
@include text.decorate-color(colors.$elegant-color-dark, "dark", "elegant-color-dark");
24+
@include decorators.decorate-color(colors.$elegant-color-dark, "dark", "elegant-color-dark");
2525

2626
// Create grey colors for background, borders and text
2727
//-------------------------------------------------------
2828
@each $name, $color in colors.$grays {
29-
@include text.decorate-color($color, "grey-#{$name}");
29+
@include decorators.decorate-color($color, "grey-#{$name}");
3030
}

scss/custom/_colors.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@use "sass:color";
22
@use "sass:map";
3-
@use "../mixins/css3/text";
3+
@use "../mixins/css3/decorators";
44
@use "../utils/color_helper" as helper;
55
@use "../color_vars" as colors;
66
@use "../variables" as vars;
@@ -17,12 +17,12 @@ $final-colors: map.remove(colors.$merge-theme-colors,
1717
);
1818

1919
@each $name, $color in $final-colors {
20-
@include text.decorate-color($color, $name);
20+
@include decorators.decorate-color($color, $name);
2121
}
2222

2323
// Manually adds duplicate custom colors
2424
//---------------------------------------
25-
@include text.decorate-color(colors.$primary-color-dark, "dark-blue", "primary-color-dark");
25+
@include decorators.decorate-color(colors.$primary-color-dark, "dark-blue", "primary-color-dark");
2626

2727
// Create full color palette for background
2828
//-------------------------------------------
@@ -51,7 +51,7 @@ $final-colors: map.remove(colors.$merge-theme-colors,
5151
}
5252
} @else {
5353
@if colors.$enable_full_palette {
54-
@include text.decorate-color($color_value, "#{$name}.#{$sub_name}", false, true, false, false, false);
54+
@include decorators.decorate-color($color_value, "#{$name}.#{$sub_name}", false, true, false, false, false);
5555
}
5656
}
5757
}

scss/mixins/css3/_text.scss renamed to scss/mixins/css3/_decorators.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@use "../../utils/color_helper" as helper;
33
@use "../../variables" as vars;
44

5-
@mixin ellipsis($no-wrap: true) {
5+
@mixin text-ellipsis($no-wrap: true) {
66
@if $no-wrap {
77
white-space: nowrap;
88
}

src/components/Appbar/appbar.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use "../../../scss/mixins/css3/text";
1+
@use "../../../scss/mixins/css3/decorators";
22
@use "../../../scss/color_vars" as colors;
33
@use "../../../scss/variables" as vars;
44

@@ -22,7 +22,7 @@
2222
padding: var(--#{vars.$prefix}appbar-margin);
2323

2424
> .#{vars.$prefix}appbar-title {
25-
@include text.ellipsis();
25+
@include decorators.text-ellipsis();
2626
font-size: var(--#{vars.$prefix}appbar-title-font-size);
2727
font-weight: var(--#{vars.$prefix}appbar-title-font-weight);
2828
line-height: normal;

src/components/Field/field.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use "sass:math";
22
@use "../../../scss/mixins/css3/borders";
33
@use "../../../scss/mixins/css3/placeholder";
4-
@use "../../../scss/mixins/css3/text";
4+
@use "../../../scss/mixins/css3/decorators";
55
@use "../../../scss/mixins/transitions";
66
@use "../../../scss/color_vars" as colors;
77
@use "../../../scss/variables" as vars;
@@ -282,7 +282,7 @@
282282
--#{vars.$prefix}field-floating-label-transform: translateY(-8px) scale(.85);
283283

284284
.#{vars.$prefix}field-label {
285-
@include text.ellipsis();
285+
@include decorators.text-ellipsis();
286286
opacity: var(--#{vars.$prefix}field-floating-label-opacity);
287287
color: var(--#{vars.$prefix}field-floating-label-color);
288288
transition: .25s vars.$transition-stand-animation;

src/components/ListView/listTile.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@use "sass:map";
22
@use "../../../scss/mixins/css3/borders";
3-
@use "../../../scss/mixins/css3/text";
3+
@use "../../../scss/mixins/css3/decorators";
44
@use "../../../scss/mixins/listview";
55
@use "../../../scss/color_vars" as colors;
66
@use "../../../scss/variables" as vars;
@@ -36,7 +36,7 @@
3636

3737
.#{vars.$prefix}list-tile-title,
3838
.#{vars.$prefix}list-tile-subtitle {
39-
@include text.ellipsis();
39+
@include decorators.text-ellipsis();
4040
transition: .3s vars.$transition-stand-animation;
4141
width: 100%;
4242
}

0 commit comments

Comments
 (0)