Skip to content
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

Jump to bottom

refactor(material-experimental/theming): move error colors into color… #28666

Merged
merged 1 commit into from
Mar 5, 2024
Merged

refactor(material-experimental/theming): move error colors into color… #28666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/material-experimental/theming/_definition.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ $theme-version: 1;
tertiary: map.remove($tertiary, neutral, neutral-variant, secondary),
neutral: map.get($primary, neutral),
neutral-variant: map.get($primary, neutral-variant),
error: m3-palettes.$private-error-palette,
error: map.get($primary, error),
),
color-tokens: m3-tokens.generate-color-tokens(
$type, $primary, $tertiary, m3-palettes.$private-error-palette)
$type, $primary, $tertiary, map.get($primary, error))
)
);
}
Expand Down
75 changes: 43 additions & 32 deletions src/material-experimental/theming/_m3-palettes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,39 @@
@return $palette;
}

/// Adds the error colors to the given palette.
@function _patch-error-palette($palette) {
@return map.merge(
$palette,
(
error: (
0: #000000,
10: #410002,
20: #690005,
25: #7e0007,
30: #93000a,
35: #a80710,
40: #ba1a1a,
50: #de3730,
60: #ff5449,
70: #ff897d,
80: #ffb4ab,
90: #ffdad6,
95: #ffedea,
98: #fff8f7,
99: #fffbff,
100: #ffffff,
),
)
);
}

@function _apply-patches($palette) {
@return _patch-missing-hues(_patch-error-palette($palette));
}

/// Red color palette to be used as primary or tertiary palette.
$red-palette: _patch-missing-hues((
$red-palette: _apply-patches((
0: #000000,
10: #410000,
20: #690100,
Expand Down Expand Up @@ -102,7 +133,7 @@ $red-palette: _patch-missing-hues((
));

/// Green color palette to be used as primary or tertiary palette.
$green-palette: _patch-missing-hues((
$green-palette: _apply-patches((
0: #000000,
10: #002200,
20: #013a00,
Expand Down Expand Up @@ -176,7 +207,7 @@ $green-palette: _patch-missing-hues((
));

/// Blue color palette to be used as primary or tertiary palette.
$blue-palette: _patch-missing-hues((
$blue-palette: _apply-patches((
0: #000000,
10: #00006e,
20: #0001ac,
Expand Down Expand Up @@ -250,7 +281,7 @@ $blue-palette: _patch-missing-hues((
));

/// Yellow color palette to be used as primary or tertiary palette.
$yellow-palette: _patch-missing-hues((
$yellow-palette: _apply-patches((
0: #000000,
10: #1d1d00,
20: #323200,
Expand Down Expand Up @@ -324,7 +355,7 @@ $yellow-palette: _patch-missing-hues((
));

/// Cyan color palette to be used as primary or tertiary palette.
$cyan-palette: _patch-missing-hues((
$cyan-palette: _apply-patches((
0: #000000,
10: #002020,
20: #003737,
Expand Down Expand Up @@ -398,7 +429,7 @@ $cyan-palette: _patch-missing-hues((
));

/// Magenta color palette to be used as primary or tertiary palette.
$magenta-palette: _patch-missing-hues((
$magenta-palette: _apply-patches((
0: #000000,
10: #380038,
20: #5b005b,
Expand Down Expand Up @@ -472,7 +503,7 @@ $magenta-palette: _patch-missing-hues((
));

/// Orange color palette to be used as primary or tertiary palette.
$orange-palette: _patch-missing-hues((
$orange-palette: _apply-patches((
0: #000000,
10: #311300,
20: #502400,
Expand Down Expand Up @@ -546,7 +577,7 @@ $orange-palette: _patch-missing-hues((
));

/// Chartreuse color palette to be used as primary or tertiary palette.
$chartreuse-palette: _patch-missing-hues((
$chartreuse-palette: _apply-patches((
0: #000000,
10: #0b2000,
20: #173800,
Expand Down Expand Up @@ -620,7 +651,7 @@ $chartreuse-palette: _patch-missing-hues((
));

/// Spring Green color palette to be used as primary or tertiary palette.
$spring-green-palette: _patch-missing-hues((
$spring-green-palette: _apply-patches((
0: #000000,
10: #00210b,
20: #003917,
Expand Down Expand Up @@ -694,7 +725,7 @@ $spring-green-palette: _patch-missing-hues((
));

/// Azure color palette to be used as primary or tertiary palette.
$azure-palette: _patch-missing-hues((
$azure-palette: _apply-patches((
0: #000000,
10: #001b3f,
20: #002f65,
Expand Down Expand Up @@ -768,7 +799,7 @@ $azure-palette: _patch-missing-hues((
));

/// Violet color palette to be used as primary or tertiary palette.
$violet-palette: _patch-missing-hues((
$violet-palette: _apply-patches((
0: #000000,
10: #270057,
20: #42008a,
Expand Down Expand Up @@ -842,7 +873,7 @@ $violet-palette: _patch-missing-hues((
));

/// Rose color palette to be used as primary or tertiary palette.
$rose-palette: _patch-missing-hues((
$rose-palette: _apply-patches((
0: #000000,
10: #3f001b,
20: #65002f,
Expand Down Expand Up @@ -914,23 +945,3 @@ $rose-palette: _patch-missing-hues((
100: #ffffff,
),
));

/// Color palette to be used for error colors.
$private-error-palette: (
0: #000000,
10: #410002,
20: #690005,
25: #7e0007,
30: #93000a,
35: #a80710,
40: #ba1a1a,
50: #de3730,
60: #ff5449,
70: #ff897d,
80: #ffb4ab,
90: #ffdad6,
95: #ffedea,
98: #fff8f7,
99: #fffbff,
100: #ffffff,
);
Loading