Skip to content

Commit 3a4e0c7

Browse files
committed
fixup! refactor(material-experimental/theming): Add M3 density support
Fix lint issues
1 parent 7d03b20 commit 3a4e0c7

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

src/material-experimental/theming/_config-validation.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@use 'sass:list';
22
@use 'sass:map';
3-
@use 'sass:meta';
43
@use '@angular/material' as mat;
54

65
/// Validates a theme config.

src/material-experimental/theming/_definition.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $theme-version: 1;
1919
@if $err {
2020
@error $err;
2121
}
22-
22+
2323
@return mat.private-deep-merge-all(
2424
define-colors(map.get($config, color) or ()),
2525
define-typography(map.get($config, typography) or ()),
@@ -47,7 +47,7 @@ $theme-version: 1;
4747
theme-version: $theme-version,
4848
theme-type: $type,
4949
color-tokens: m3-tokens.generate-color-tokens($type, $primary, $secondary, $tertiary,
50-
m3-palettes.$neutral-palette, m3-palettes.$red-palette)
50+
m3-palettes.$neutral-palette, m3-palettes.$red-palette)
5151
)
5252
);
5353
}
@@ -71,7 +71,7 @@ $theme-version: 1;
7171
$internals: (
7272
theme-version: $theme-version,
7373
typography-tokens:
74-
m3-tokens.generate-typography-tokens($brand, $plain, $bold, $medium, $regular)
74+
m3-tokens.generate-typography-tokens($brand, $plain, $bold, $medium, $regular)
7575
)
7676
);
7777
}

src/material-experimental/theming/_m3-density.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
// TODO(mmalerba): Add density tokens for remaining components.
1717
$_density-tokens: (
1818
(mdc, checkbox): (
19-
state-layer-size: (40px, 36px, 32px, 28px),
20-
),
19+
state-layer-size: (40px, 36px, 32px, 28px),
20+
),
2121
(mdc, elevated-card): (),
2222
(mdc, outlined-card): (),
2323
(mat, card): (),
@@ -27,7 +27,7 @@ $_density-tokens: (
2727
/// @param {List} $density-values The list of values for each density scale.
2828
/// @param {Number} $scale The density scale to get the value for.
2929
/// @return {*} The value for the given scale.
30-
@function _get-value-for-scale($density-values, $scale){
30+
@function _get-value-for-scale($density-values, $scale) {
3131
$scale: mat.private-clamp-density($scale, -1 * list.length($density-values) + 1);
3232
$index: -$scale + 1;
3333
@return list.nth($density-values, $index);

src/material-experimental/theming/_m3-tokens.scss

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
@use '@angular/material' as mat;
33
@use '@material/tokens/v0_161' as mdc-tokens;
44
@use './m3-density';
5-
@use './m3-palettes';
65
@use './custom-tokens';
76

87
// TODO(mmalerba): Split up this file into smaller pieces.
@@ -168,31 +167,31 @@
168167

169168
// TODO(mmalerba): Fill in remaining tokens.
170169
$result: mat.private-merge-all(
171-
// Add the system color & typography tokens (so we can give users access via an API).
170+
// Add the system color & typography tokens (so we can give users access via an API).
172171
(
173172
(mdc, theme): map.get($systems, md-sys-color),
174173
(mdc, typography): map.get($systems, md-sys-typescale),
175174
),
176175
// Get the official MDC component tokens
177176
_namespace-tokens(
178-
(mdc, checkbox),
177+
(mdc, checkbox),
179178
_fix-checkbox-tokens(mdc-tokens.md-comp-checkbox-values($systems, $exclude-hardcoded)),
180179
$token-slots
181180
),
182181
_namespace-tokens(
183-
(mdc, elevated-card),
182+
(mdc, elevated-card),
184183
mdc-tokens.md-comp-elevated-card-values($systems, $exclude-hardcoded),
185184
$token-slots
186185
),
187186
_namespace-tokens(
188-
(mdc, outlined-card),
187+
(mdc, outlined-card),
189188
mdc-tokens.md-comp-outlined-card-values($systems, $exclude-hardcoded),
190189
$token-slots
191190
),
192191
// Choose values for our made up tokens based on MDC system tokens or sensible hardcoded
193192
// values.
194193
_namespace-tokens(
195-
(mat, card),
194+
(mat, card),
196195
custom-tokens.card($systems, $exclude-hardcoded),
197196
$token-slots
198197
),
@@ -223,8 +222,8 @@
223222
md-ref-palette: _generate-ref-palette-tokens($primary, $secondary, $tertiary, $neutral, $error)
224223
);
225224
$sys-color: if($type == dark,
226-
mdc-tokens.md-sys-color-values-dark($ref),
227-
mdc-tokens.md-sys-color-values-light($ref));
225+
mdc-tokens.md-sys-color-values-dark($ref),
226+
mdc-tokens.md-sys-color-values-light($ref));
228227
@return _generate-tokens((
229228
md-sys-color: $sys-color,
230229
md-sys-elevation: mdc-tokens.md-sys-elevation-values(),
@@ -263,5 +262,5 @@
263262
md-sys-motion: mdc-tokens.md-sys-motion-values(),
264263
md-sys-shape: mdc-tokens.md-sys-shape-values(),
265264
md-sys-state: mdc-tokens.md-sys-state-values(),
266-
), $include-non-systemized: true)
265+
), $include-non-systemized: true);
267266
}

0 commit comments

Comments
 (0)