Skip to content

Commit 680dd6f

Browse files
andrewseguinAndrew Seguin
and
Andrew Seguin
authored
fix(material/stepper): align state colors (angular#31227)
# Conflicts: # src/material/stepper/_m2-stepper.scss Co-authored-by: Andrew Seguin <[email protected]>
1 parent f3f277a commit 680dd6f

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/material/stepper/_m2-stepper.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@use '../core/theming/theming';
33
@use '../core/theming/inspection';
44
@use '../core/tokens/m2-utils';
5+
@use '../core/tokens/m3-utils';
56

67
// Tokens that can't be configured through Angular Material's current theming API,
78
// but may be in a future version of the theming API.
@@ -18,8 +19,10 @@
1819
@return map.merge(private-get-color-palette-color-tokens($theme, primary), (
1920
stepper-container-color: map.get($system, surface),
2021
stepper-line-color: map.get($system, outline),
21-
stepper-header-hover-state-layer-color: inspection.get-theme-color($theme, background, hover),
22-
stepper-header-focus-state-layer-color: inspection.get-theme-color($theme, background, hover),
22+
stepper-header-hover-state-layer-color: m3-utils.color-with-opacity(
23+
map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
24+
stepper-header-focus-state-layer-color: m3-utils.color-with-opacity(
25+
map.get($system, on-surface), map.get($system, focus-state-layer-opacity)),
2326
stepper-header-label-text-color: map.get($system, on-surface-variant),
2427
stepper-header-optional-label-text-color: map.get($system, on-surface-variant),
2528
stepper-header-selected-state-label-text-color: map.get($system, on-surface),

src/material/stepper/_m3-stepper.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ $prefix: (mat, stepper);
3131
stepper-header-error-state-icon-foreground-color: map.get($system, error),
3232
stepper-header-error-state-label-text-color: map.get($system, error),
3333
stepper-header-focus-state-layer-color: m3-utils.color-with-opacity(
34-
map.get($system, inverse-surface), map.get($system, focus-state-layer-opacity)),
34+
map.get($system, on-surface), map.get($system, focus-state-layer-opacity)),
3535
stepper-header-hover-state-layer-color: m3-utils.color-with-opacity(
36-
map.get($system, inverse-surface), map.get($system, hover-state-layer-opacity)),
36+
map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
3737
stepper-header-icon-background-color: map.get($system, on-surface-variant),
3838
stepper-header-icon-foreground-color: map.get($system, surface),
3939
stepper-header-label-text-color: map.get($system, on-surface-variant),

0 commit comments

Comments
 (0)