Skip to content

Commit 00e70fd

Browse files
authored
fix(material/slide-toggle): delete custom typography tokens (#28365)
Removes the custom typography tokens from the slide toggle since the typography is controlled through the internal MDC form field. This should be a no-op since the token values are the same.
1 parent 30f0705 commit 00e70fd

File tree

4 files changed

+0
-72
lines changed

4 files changed

+0
-72
lines changed

src/material/core/tokens/m2/_index.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
@use './mat/ripple' as tokens-mat-ripple;
2222
@use './mat/select' as tokens-mat-select;
2323
@use './mat/sidenav' as tokens-mat-sidenav;
24-
@use './mat/slide-toggle' as tokens-mat-slide-toggle;
2524
@use './mat/slider' as tokens-mat-slider;
2625
@use './mat/snack-bar' as tokens-mat-snack-bar;
2726
@use './mat/sort' as tokens-mat-sort;
@@ -117,7 +116,6 @@
117116
_get-tokens-for-module($theme, tokens-mat-ripple),
118117
_get-tokens-for-module($theme, tokens-mat-select),
119118
_get-tokens-for-module($theme, tokens-mat-sidenav),
120-
_get-tokens-for-module($theme, tokens-mat-slide-toggle),
121119
_get-tokens-for-module($theme, tokens-mat-slider),
122120
_get-tokens-for-module($theme, tokens-mat-snack-bar),
123121
_get-tokens-for-module($theme, tokens-mat-sort),

src/material/core/tokens/m2/mat/_slide-toggle.scss

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/material/slide-toggle/_slide-toggle-theme.scss

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
@use '../core/typography/typography';
77
@use '../core/tokens/m2/mdc/form-field' as tokens-mdc-form-field;
88
@use '../core/tokens/m2/mdc/switch' as tokens-mdc-switch;
9-
@use '../core/tokens/m2/mat/slide-toggle' as tokens-mat-slide-toggle;
10-
@use '../core/tokens/token-utils';
119

1210
@mixin base($theme) {
1311
@if inspection.get-theme-version($theme) == 1 {
@@ -58,16 +56,11 @@
5856
}
5957
@else {
6058
$mdc-switch-typography-tokens: tokens-mdc-switch.get-typography-tokens($theme);
61-
$mat-slide-toggle-typography-tokens: tokens-mat-slide-toggle.get-typography-tokens($theme);
6259

6360
// Add values for MDC slide toggle tokens
6461
.mat-mdc-slide-toggle {
6562
@include mdc-switch-theme.theme($mdc-switch-typography-tokens);
6663
@include mdc-form-field-theme.theme(tokens-mdc-form-field.get-typography-tokens($theme));
67-
@include token-utils.create-token-values(
68-
tokens-mat-slide-toggle.$prefix,
69-
$mat-slide-toggle-typography-tokens
70-
);
7164
}
7265
}
7366
}
@@ -108,7 +101,5 @@
108101
@mixin _theme-from-tokens($tokens) {
109102
@if ($tokens != ()) {
110103
@include mdc-switch-theme.theme(map.get($tokens, tokens-mdc-switch.$prefix));
111-
@include token-utils.create-token-values(
112-
tokens-mat-slide-toggle.$prefix, map.get($tokens, tokens-mat-slide-toggle.$prefix));
113104
}
114105
}

src/material/slide-toggle/slide-toggle.scss

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
@use '../core/style/layout-common';
77
@use '@material/theme/custom-properties' as mdc-custom-properties;
88
@use '../core/tokens/m2/mdc/switch' as m2-mdc-switch;
9-
@use '../core/tokens/m2/mat/slide-toggle' as mat-slide-toggle-tokens;
10-
@use '../core/tokens/token-utils';
119

1210
@include mdc-custom-properties.configure($emit-fallback-values: false, $emit-fallback-vars: false) {
1311
$mdc-switch-token-slots: m2-mdc-switch.get-token-slots();
@@ -36,21 +34,6 @@
3634
box-shadow: var(--mdc-switch-disabled-handle-elevation-shadow);
3735
}
3836
}
39-
40-
41-
// Add slots for custom Angular Material slide-toggle tokens.
42-
@include token-utils.use-tokens(
43-
mat-slide-toggle-tokens.$prefix,
44-
mat-slide-toggle-tokens.get-token-slots()
45-
) {
46-
.mat-mdc-slide-toggle .mdc-label {
47-
@include token-utils.create-token-slot(font-family, label-text-font);
48-
@include token-utils.create-token-slot(font-size, label-text-size);
49-
@include token-utils.create-token-slot(letter-spacing, label-text-tracking);
50-
@include token-utils.create-token-slot(line-height, label-text-line-height);
51-
@include token-utils.create-token-slot(font-weight, label-text-weight);
52-
}
53-
}
5437
}
5538

5639
.mat-mdc-slide-toggle {

0 commit comments

Comments
 (0)