Skip to content

Commit 0e18cc1

Browse files
committed
refactor: rename shadow tokens and delete button token file
1 parent a780406 commit 0e18cc1

File tree

3 files changed

+18
-41
lines changed

3 files changed

+18
-41
lines changed

src/material/button/_m3-button.scss

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ $prefix: (mat, button);
5353
outlined-ripple-color: sass-utils.safe-color-change(map.get($systems, md-sys-color, primary), $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)),
5454
outlined-state-layer-color: map.get($systems, md-sys-color, primary),
5555
protected-container-color: map.get($systems, md-sys-color, surface),
56-
protected-container-elevation: map.get($systems, md-sys-elevation, level1),
56+
protected-container-elevation-shadow: map.get($systems, md-sys-elevation, level1),
5757
protected-container-height: if($exclude-hardcoded, null, 40px),
5858
protected-container-shape: map.get($systems, md-sys-shape, corner-full),
5959
protected-disabled-container-color: sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.12),
60-
protected-disabled-container-elevation: map.get($systems, md-sys-elevation, level0),
60+
protected-disabled-container-elevation-shadow: map.get($systems, md-sys-elevation, level0),
6161
protected-disabled-label-text-color: sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
6262
protected-disabled-state-layer-color: map.get($systems, md-sys-color, on-surface-variant),
63-
protected-focus-container-elevation: map.get($systems, md-sys-elevation, level1),
63+
protected-focus-container-elevation-shadow: map.get($systems, md-sys-elevation, level1),
6464
protected-focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
6565
protected-horizontal-padding: m3-utils.hardcode(24px, $exclude-hardcoded),
66-
protected-hover-container-elevation: map.get($systems, md-sys-elevation, level2),
66+
protected-hover-container-elevation-shadow: map.get($systems, md-sys-elevation, level2),
6767
protected-hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
6868
protected-icon-offset: m3-utils.hardcode(-8px, $exclude-hardcoded),
6969
protected-icon-spacing: m3-utils.hardcode(8px, $exclude-hardcoded),
@@ -72,7 +72,7 @@ $prefix: (mat, button);
7272
protected-label-text-size: map.get($systems, md-sys-typescale, label-large-size),
7373
protected-label-text-tracking: map.get($systems, md-sys-typescale, label-large-tracking),
7474
protected-label-text-weight: map.get($systems, md-sys-typescale, label-large-weight),
75-
protected-pressed-container-elevation: map.get($systems, md-sys-elevation, level1),
75+
protected-pressed-container-elevation-shadow: map.get($systems, md-sys-elevation, level1),
7676
protected-pressed-state-layer-opacity: map.get($systems, md-sys-state, pressed-state-layer-opacity),
7777
protected-ripple-color: sass-utils.safe-color-change(map.get($systems, md-sys-color, primary), $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)),
7878
protected-state-layer-color: map.get($systems, md-sys-color, primary),
@@ -173,18 +173,18 @@ $prefix: (mat, button);
173173
);
174174

175175
$elevation-tokens: (
176-
protected-container-elevation,
177-
protected-disabled-container-elevation,
178-
protected-focus-container-elevation,
179-
protected-hover-container-elevation,
180-
protected-pressed-container-elevation,
176+
protected-container-elevation-shadow,
177+
protected-disabled-container-elevation-shadow,
178+
protected-focus-container-elevation-shadow,
179+
protected-hover-container-elevation-shadow,
180+
protected-pressed-container-elevation-shadow,
181181
);
182182

183183
@each $token in $elevation-tokens {
184184
$elevation: map.get($tokens, $token);
185185

186186
@if ($elevation != null) {
187-
$tokens: map.set($tokens, $token + -shadow, elevation.get-box-shadow($elevation));
187+
$tokens: map.set($tokens, $token, elevation.get-box-shadow($elevation));
188188
}
189189
}
190190

src/material/button/_m3-text-button.scss

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

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,19 @@ $prefix: (mat, slide-toggle);
104104
visible-track-opacity: m3-utils.hardcode(1, $exclude-hardcoded),
105105
visible-track-transition: m3-utils.hardcode(opacity 75ms, $exclude-hardcoded),
106106
with-icon-handle-size: m3-utils.hardcode(24px, $exclude-hardcoded),
107+
handle-elevation-shadow: map.get($systems, md-sys-elevation, level0),
108+
disabled-handle-elevation-shadow: map.get($systems, md-sys-elevation, level0),
109+
);
110+
$elevation-tokens: (
111+
handle-elevation-shadow,
112+
disabled-handle-elevation-shadow
107113
);
108-
$elevation-tokens: (handle-elevation, disabled-handle-elevation);
109114

110115
@each $token in $elevation-tokens {
111116
$elevation: map.get($tokens, $token);
112117

113118
@if ($elevation != null) {
114-
$tokens: map.set($tokens, $token + -shadow, elevation.get-box-shadow($elevation));
119+
$tokens: map.set($tokens, $token, elevation.get-box-shadow($elevation));
115120
}
116121
}
117122

0 commit comments

Comments
 (0)