Skip to content

Commit 83d9b02

Browse files
andrewseguinAndrew Seguin
andauthored
fix(material/core): differentiate container colors in m2 (#32076)
Co-authored-by: Andrew Seguin <andrewseguin@google.com>
1 parent 11ae0e7 commit 83d9b02

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

src/material/core/tokens/m2/_md-sys-color.scss

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@use 'sass:map';
21
@use '../../m2/palette';
32
@use './md-sys-color-internal';
3+
@use 'sass:map';
44

55
@function md-sys-color-values-dark($palettes) {
66
$values: (
@@ -23,24 +23,24 @@
2323
inverse-on-surface: rgba(black, 0.87),
2424
outline: rgba(white, 0.12),
2525
outline-variant: rgba(white, 0.38),
26-
error-container: map.get($palettes, warn, default),
26+
error-container: map.get($palettes, warn, 900),
2727
on-background: white,
28-
on-error-container: map.get($palettes, warn, default-contrast),
29-
on-primary-container: map.get($palettes, primary, default-contrast),
28+
on-error-container: map.get($palettes, warn, 50),
29+
on-primary-container: map.get($palettes, primary, 50),
3030
on-primary-fixed: map.get($palettes, primary, default-contrast),
3131
on-primary-fixed-variant: map.get($palettes, primary, default-contrast),
32-
on-secondary-container: map.get($palettes, accent, default-contrast),
32+
on-secondary-container: map.get($palettes, accent, 50),
3333
on-secondary-fixed: map.get($palettes, accent, default-contrast),
3434
on-secondary-fixed-variant: map.get($palettes, accent, default-contrast),
3535
on-tertiary: map.get($palettes, accent, default-contrast),
36-
on-tertiary-container: map.get($palettes, accent, default-contrast),
36+
on-tertiary-container: map.get($palettes, accent, 50),
3737
on-tertiary-fixed: map.get($palettes, accent, default-contrast),
3838
on-tertiary-fixed-variant: map.get($palettes, accent, default-contrast),
39-
primary-container: map.get($palettes, primary, default),
39+
primary-container: map.get($palettes, primary, 900),
4040
primary-fixed: map.get($palettes, primary, default),
4141
primary-fixed-dim: map.get($palettes, primary, default),
4242
scrim: black,
43-
secondary-container: map.get($palettes, accent, default),
43+
secondary-container: map.get($palettes, accent, 900),
4444
secondary-fixed: map.get($palettes, accent, default),
4545
secondary-fixed-dim: map.get($palettes, accent, default),
4646
surface-bright: map.get(palette.$grey-palette, 800),
@@ -52,7 +52,7 @@
5252
surface-dim: map.get(palette.$grey-palette, 800),
5353
surface-tint: map.get(palette.$grey-palette, 800),
5454
tertiary: map.get($palettes, accent, default),
55-
tertiary-container: map.get($palettes, accent, default),
55+
tertiary-container: map.get($palettes, accent, 900),
5656
tertiary-fixed: map.get($palettes, accent, default),
5757
tertiary-fixed-dim: map.get($palettes, accent, default),
5858
);
@@ -83,24 +83,24 @@
8383
inverse-on-surface: white,
8484
outline: rgba(black, 0.12),
8585
outline-variant: rgba(black, 0.38),
86-
error-container: map.get($palettes, warn, default),
86+
error-container: map.get($palettes, warn, 50),
8787
on-background: rgba(black, 0.87),
88-
on-error-container: map.get($palettes, warn, default-contrast),
89-
on-primary-container: map.get($palettes, primary, default-contrast),
88+
on-error-container: map.get($palettes, warn, 700),
89+
on-primary-container: map.get($palettes, primary, 700),
9090
on-primary-fixed: map.get($palettes, primary, default-contrast),
9191
on-primary-fixed-variant: map.get($palettes, primary, default-contrast),
92-
on-secondary-container: map.get($palettes, accent, default-contrast),
92+
on-secondary-container: map.get($palettes, accent, 700),
9393
on-secondary-fixed: map.get($palettes, accent, default-contrast),
9494
on-secondary-fixed-variant: map.get($palettes, accent, default-contrast),
9595
on-tertiary: map.get($palettes, accent, default-contrast),
96-
on-tertiary-container: map.get($palettes, accent, default-contrast),
96+
on-tertiary-container: map.get($palettes, accent, 700),
9797
on-tertiary-fixed: map.get($palettes, accent, default-contrast),
9898
on-tertiary-fixed-variant: map.get($palettes, accent, default-contrast),
99-
primary-container: map.get($palettes, primary, default),
99+
primary-container: map.get($palettes, primary, 50),
100100
primary-fixed: map.get($palettes, primary, default),
101101
primary-fixed-dim: map.get($palettes, primary, default),
102102
scrim: black,
103-
secondary-container: map.get($palettes, accent, default),
103+
secondary-container: map.get($palettes, accent, 50),
104104
secondary-fixed: map.get($palettes, accent, default),
105105
secondary-fixed-dim: map.get($palettes, accent, default),
106106
surface-bright: white,
@@ -112,7 +112,7 @@
112112
surface-dim: white,
113113
surface-tint: white,
114114
tertiary: map.get($palettes, accent, default),
115-
tertiary-container: map.get($palettes, accent, default),
115+
tertiary-container: map.get($palettes, accent, 50),
116116
tertiary-fixed: map.get($palettes, accent, default),
117117
tertiary-fixed-dim: map.get($palettes, accent, default),
118118
);

0 commit comments

Comments
 (0)