Skip to content

Commit 3de927f

Browse files
andrewseguinandrewseguin
committed
fix(material/core): fill in m2 system token values (#31615)
(cherry picked from commit 993a9a3)
1 parent b0f1379 commit 3de927f

File tree

5 files changed

+109
-143
lines changed

5 files changed

+109
-143
lines changed

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

Lines changed: 64 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
//
2-
// Design system display name: Material 3
3-
// Design system version: v0.161
4-
//
5-
61
@use 'sass:map';
72
@use '../../m2/palette';
83

@@ -27,40 +22,38 @@
2722
inverse-on-surface: rgba(black, 0.87),
2823
outline: rgba(white, 0.12),
2924
outline-variant: rgba(white, 0.38),
30-
31-
// TBD
32-
error-container: null,
33-
on-background: null,
34-
on-error-container: null,
35-
on-primary-container: null,
36-
on-primary-fixed: null,
37-
on-primary-fixed-variant: null,
38-
on-secondary-container: null,
39-
on-secondary-fixed: null,
40-
on-secondary-fixed-variant: null,
41-
on-tertiary: null,
42-
on-tertiary-container: null,
43-
on-tertiary-fixed: null,
44-
on-tertiary-fixed-variant: null,
45-
primary-container: null,
46-
primary-fixed: null,
47-
primary-fixed-dim: null,
48-
scrim: null,
49-
secondary-container: null,
50-
secondary-fixed: null,
51-
secondary-fixed-dim: null,
52-
surface-bright: null,
53-
surface-container: null,
54-
surface-container-high: null,
55-
surface-container-highest: null,
56-
surface-container-low: null,
57-
surface-container-lowest: null,
58-
surface-dim: null,
59-
surface-tint: null,
60-
tertiary: null,
61-
tertiary-container: null,
62-
tertiary-fixed: null,
63-
tertiary-fixed-dim: null,
25+
error-container: map.get($palettes, warn, default),
26+
on-background: white,
27+
on-error-container: map.get($palettes, warn, default-contrast),
28+
on-primary-container: map.get($palettes, primary, default-contrast),
29+
on-primary-fixed: map.get($palettes, primary, default-contrast),
30+
on-primary-fixed-variant: map.get($palettes, primary, default-contrast),
31+
on-secondary-container: map.get($palettes, accent, default),
32+
on-secondary-fixed: map.get($palettes, accent, default),
33+
on-secondary-fixed-variant: map.get($palettes, accent, default),
34+
on-tertiary: map.get($palettes, accent, default-contrast),
35+
on-tertiary-container: map.get($palettes, accent, default-contrast),
36+
on-tertiary-fixed: map.get($palettes, accent, default-contrast),
37+
on-tertiary-fixed-variant: map.get($palettes, accent, default-contrast),
38+
primary-container: map.get($palettes, primary, default),
39+
primary-fixed: map.get($palettes, primary, default),
40+
primary-fixed-dim: map.get($palettes, primary, default),
41+
scrim: black,
42+
secondary-container: map.get($palettes, accent, default-contrast),
43+
secondary-fixed: map.get($palettes, accent, default-contrast),
44+
secondary-fixed-dim: map.get($palettes, accent, default-contrast),
45+
surface-bright: map.get(palette.$grey-palette, 800),
46+
surface-container: map.get(palette.$grey-palette, 800),
47+
surface-container-high: map.get(palette.$grey-palette, 800),
48+
surface-container-highest: map.get(palette.$grey-palette, 800),
49+
surface-container-low: map.get(palette.$grey-palette, 800),
50+
surface-container-lowest: map.get(palette.$grey-palette, 800),
51+
surface-dim: map.get(palette.$grey-palette, 800),
52+
surface-tint: map.get(palette.$grey-palette, 800),
53+
tertiary: map.get($palettes, accent, default),
54+
tertiary-container: map.get($palettes, accent, default),
55+
tertiary-fixed: map.get($palettes, accent, default),
56+
tertiary-fixed-dim: map.get($palettes, accent, default),
6457
);
6558
}
6659

@@ -85,39 +78,37 @@
8578
inverse-on-surface: white,
8679
outline: rgba(black, 0.12),
8780
outline-variant: rgba(black, 0.38),
88-
89-
// TBD
90-
error-container: null,
91-
on-background: null,
92-
on-error-container: null,
93-
on-primary-container: null,
94-
on-primary-fixed: null,
95-
on-primary-fixed-variant: null,
96-
on-secondary-container: null,
97-
on-secondary-fixed: null,
98-
on-secondary-fixed-variant: null,
99-
on-tertiary: null,
100-
on-tertiary-container: null,
101-
on-tertiary-fixed: null,
102-
on-tertiary-fixed-variant: null,
103-
primary-container: null,
104-
primary-fixed: null,
105-
primary-fixed-dim: null,
106-
scrim: null,
107-
secondary-container: null,
108-
secondary-fixed: null,
109-
secondary-fixed-dim: null,
110-
surface-bright: null,
111-
surface-container: null,
112-
surface-container-high: null,
113-
surface-container-highest: null,
114-
surface-container-low: null,
115-
surface-container-lowest: null,
116-
surface-dim: null,
117-
surface-tint: null,
118-
tertiary: null,
119-
tertiary-container: null,
120-
tertiary-fixed: null,
121-
tertiary-fixed-dim: null,
81+
error-container: map.get($palettes, warn, default),
82+
on-background: rgba(black, 0.87),
83+
on-error-container: map.get($palettes, warn, default-contrast),
84+
on-primary-container: map.get($palettes, primary, default-contrast),
85+
on-primary-fixed: map.get($palettes, primary, default-contrast),
86+
on-primary-fixed-variant: map.get($palettes, primary, default-contrast),
87+
on-secondary-container: map.get($palettes, accent, default),
88+
on-secondary-fixed: map.get($palettes, accent, default),
89+
on-secondary-fixed-variant: map.get($palettes, accent, default),
90+
on-tertiary: map.get($palettes, accent, default-contrast),
91+
on-tertiary-container: map.get($palettes, accent, default-contrast),
92+
on-tertiary-fixed: map.get($palettes, accent, default-contrast),
93+
on-tertiary-fixed-variant: map.get($palettes, accent, default-contrast),
94+
primary-container: map.get($palettes, primary, default),
95+
primary-fixed: map.get($palettes, primary, default),
96+
primary-fixed-dim: map.get($palettes, primary, default),
97+
scrim: black,
98+
secondary-container: map.get($palettes, accent, default-contrast),
99+
secondary-fixed: map.get($palettes, accent, default-contrast),
100+
secondary-fixed-dim: map.get($palettes, accent, default-contrast),
101+
surface-bright: map.get(palette.$grey-palette, 800),
102+
surface-container: map.get(palette.$grey-palette, 800),
103+
surface-container-high: map.get(palette.$grey-palette, 800),
104+
surface-container-highest: map.get(palette.$grey-palette, 800),
105+
surface-container-low: map.get(palette.$grey-palette, 800),
106+
surface-container-lowest: map.get(palette.$grey-palette, 800),
107+
surface-dim: map.get(palette.$grey-palette, 800),
108+
surface-tint: map.get(palette.$grey-palette, 800),
109+
tertiary: map.get($palettes, accent, default),
110+
tertiary-container: map.get($palettes, accent, default),
111+
tertiary-fixed: map.get($palettes, accent, default),
112+
tertiary-fixed-dim: map.get($palettes, accent, default),
122113
);
123114
}

‎src/material/core/tokens/m2/_md-sys-elevation.scss‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
//
2-
// Design system display name: Material 3
3-
// Design system version: v0.161
4-
//
5-
61
@function md-sys-elevation-values() {
72
@return (
8-
// TBD
9-
level0: null,
10-
level1: null,
11-
level2: null,
12-
level3: null,
13-
level4: null,
14-
level5: null,
3+
level0: 0,
4+
level1: 1,
5+
level2: 3,
6+
level3: 6,
7+
level4: 8,
8+
level5: 12
159
);
1610
}

‎src/material/core/tokens/m2/_md-sys-motion.scss‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,30 @@
1-
//
2-
// Design system display name: Material 3
3-
// Design system version: v0.161
4-
//
5-
61
@function md-sys-motion-values() {
72
@return (
8-
// TBD
9-
duration-extra-long1: null,
10-
duration-extra-long2: null,
11-
duration-extra-long3: null,
12-
duration-extra-long4: null,
13-
duration-long1: null,
14-
duration-long2: null,
15-
duration-long3: null,
16-
duration-long4: null,
17-
duration-medium1: null,
18-
duration-medium2: null,
19-
duration-medium3: null,
20-
duration-medium4: null,
21-
duration-short1: null,
22-
duration-short2: null,
23-
duration-short3: null,
24-
duration-short4: null,
25-
easing-emphasized: null,
26-
easing-emphasized-accelerate: null,
27-
easing-emphasized-decelerate: null,
28-
easing-legacy: null,
29-
easing-legacy-accelerate: null,
30-
easing-legacy-decelerate: null,
31-
easing-linear: null,
32-
easing-standard: null,
33-
easing-standard-accelerate: null,
34-
easing-standard-decelerate: null,
3+
duration-extra-long1: 700ms,
4+
duration-extra-long2: 800ms,
5+
duration-extra-long3: 900ms,
6+
duration-extra-long4: 1000ms,
7+
duration-long1: 450ms,
8+
duration-long2: 500ms,
9+
duration-long3: 550ms,
10+
duration-long4: 600ms,
11+
duration-medium1: 250ms,
12+
duration-medium2: 300ms,
13+
duration-medium3: 350ms,
14+
duration-medium4: 400ms,
15+
duration-short1: 50ms,
16+
duration-short2: 100ms,
17+
duration-short3: 150ms,
18+
duration-short4: 200ms,
19+
easing-emphasized: cubic-bezier(0.2, 0, 0, 1),
20+
easing-emphasized-accelerate: cubic-bezier(0.3, 0, 0.8, 0.15),
21+
easing-emphasized-decelerate: cubic-bezier(0.05, 0.7, 0.1, 1),
22+
easing-legacy: cubic-bezier(0.4, 0, 0.2, 1),
23+
easing-legacy-accelerate: cubic-bezier(0.4, 0, 1, 1),
24+
easing-legacy-decelerate: cubic-bezier(0, 0, 0.2, 1),
25+
easing-linear: cubic-bezier(0, 0, 1, 1),
26+
easing-standard: cubic-bezier(0.2, 0, 0, 1),
27+
easing-standard-accelerate: cubic-bezier(0.3, 0, 1, 1),
28+
easing-standard-decelerate: cubic-bezier(0, 0, 0, 1)
3529
);
3630
}

‎src/material/core/tokens/m2/_md-sys-shape.scss‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
//
2-
// Design system display name: Material 3
3-
// Design system version: v0.161
4-
//
5-
61
@function md-sys-shape-values() {
72
@return (
8-
// TBD
9-
corner-extra-large: null,
10-
corner-extra-large-top: null,
11-
corner-extra-small: null,
12-
corner-extra-small-top: null,
13-
corner-full: null,
14-
corner-large: null,
15-
corner-large-end: null,
16-
corner-large-start: null,
17-
corner-large-top: null,
18-
corner-medium: null,
19-
corner-none: null,
20-
corner-small: null,
3+
corner-extra-large: 28px,
4+
corner-extra-large-top: (28px 28px 0 0),
5+
corner-extra-small: 4px,
6+
corner-extra-small-top: (4px 4px 0 0),
7+
corner-full: 9999px,
8+
corner-large: 16px,
9+
corner-large-end: (0 16px 16px 0),
10+
corner-large-start: (16px 0 0 16px),
11+
corner-large-top: (16px 16px 0 0),
12+
corner-medium: 12px,
13+
corner-none: 0,
14+
corner-small: 8px
2115
);
2216
}

‎src/material/core/tokens/m2/_md-sys-state.scss‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1-
//
2-
// Design system display name: Material 3
3-
// Design system version: v0.161
4-
//
5-
61
@function md-sys-state-values($exclude-hardcoded-values: false) {
72
@return (
3+
dragged-state-layer-opacity: 0.16,
84
focus-state-layer-opacity: 0.12,
95
hover-state-layer-opacity: 0.04,
106
pressed-state-layer-opacity: 0.12,
11-
12-
// TBD
13-
dragged-state-layer-opacity: 0.16,
147
);
158
}

0 commit comments

Comments
 (0)