Skip to content

refactor: consistent elevation shadow naming and type #32165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: consistent elevation shadow naming and type #32165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/material/autocomplete/_m2-autocomplete.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
@return (
base: (
autocomplete-container-shape: 4px,
autocomplete-container-elevation-shadow: elevation.get-box-shadow(8),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renaming tokens is a breaking change and we went out of the breaking change window yesterday.

),
color: (
autocomplete-background-color: map.get($system, surface)
autocomplete-background-color: map.get($system, surface),
autocomplete-container-elevation-shadow: elevation.get-box-shadow(8),
),
typography: (),
density: (),
Expand Down
2 changes: 1 addition & 1 deletion src/material/autocomplete/_m3-autocomplete.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
$tokens: (
base: (
autocomplete-container-shape: map.get($system, corner-extra-small),
autocomplete-container-elevation-shadow: elevation.get-box-shadow(2),
),
color: (
autocomplete-background-color: map.get($system, surface-container),
autocomplete-container-elevation-shadow: elevation.get-box-shadow(2),
),
typography: (),
density: (),
Expand Down
10 changes: 5 additions & 5 deletions src/material/button/_m2-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,10 @@
button-outlined-keep-touch-target: false,
button-outlined-outline-width: 1px,
button-outlined-touch-target-size: $touch-target-size,
button-protected-container-elevation-shadow: elevation.get-box-shadow(2),
button-protected-container-shape: 4px,
button-protected-disabled-container-elevation-shadow: elevation.get-box-shadow(0),
button-protected-focus-container-elevation-shadow: elevation.get-box-shadow(4),
button-protected-horizontal-padding: 16px,
button-protected-hover-container-elevation-shadow: elevation.get-box-shadow(4),
button-protected-icon-offset: -4px,
button-protected-icon-spacing: 8px,
button-protected-pressed-container-elevation-shadow: elevation.get-box-shadow(8),
button-protected-touch-target-size: $touch-target-size,
button-text-container-shape: 4px,
button-text-horizontal-padding: 8px,
Expand Down Expand Up @@ -79,12 +74,17 @@
map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
button-outlined-state-layer-color: map.get($system, on-surface),
button-protected-container-color: map.get($system, surface),
button-protected-container-elevation-shadow: elevation.get-box-shadow(2),
button-protected-disabled-container-color: $disabled-container,
button-protected-disabled-container-elevation-shadow: elevation.get-box-shadow(0),
button-protected-disabled-label-text-color: $disabled,
button-protected-disabled-state-layer-color: map.get($system, on-surface-variant),
button-protected-focus-container-elevation-shadow: elevation.get-box-shadow(4),
button-protected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
button-protected-hover-container-elevation-shadow: elevation.get-box-shadow(4),
button-protected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
button-protected-label-text-color: map.get($system, on-surface),
button-protected-pressed-container-elevation-shadow: elevation.get-box-shadow(8),
button-protected-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
button-protected-ripple-color: m3-utils.color-with-opacity(
map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
Expand Down
6 changes: 3 additions & 3 deletions src/material/card/_m2-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
),
color: (
card-elevated-container-color: map.get($system, surface),
card-elevated-container-elevation: elevation.get-box-shadow(1),
card-elevated-container-elevation-shadow: elevation.get-box-shadow(1),
card-outlined-container-color: map.get($system, surface),
card-outlined-container-elevation: elevation.get-box-shadow(0),
card-outlined-container-elevation-shadow: elevation.get-box-shadow(0),
card-outlined-outline-color: map.get($system, outline),
card-subtitle-text-color: map.get($system, on-surface-variant),
card-filled-container-color: map.get($system, surface),
card-filled-container-elevation: elevation.get-box-shadow(0)
card-filled-container-elevation-shadow: elevation.get-box-shadow(0)
),
typography: (
card-title-text-font: map.get($system, title-small-font),
Expand Down
6 changes: 3 additions & 3 deletions src/material/card/_m3-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ $prefix: (mat, card);
),
color: (
card-elevated-container-color: map.get($system, surface-container-low),
card-elevated-container-elevation: elevation.get-box-shadow(map.get($system, level1)),
card-elevated-container-elevation-shadow: elevation.get-box-shadow(map.get($system, level1)),
card-filled-container-color: map.get($system, surface-container-highest),
card-filled-container-elevation: elevation.get-box-shadow(map.get($system, level0)),
card-filled-container-elevation-shadow: elevation.get-box-shadow(map.get($system, level0)),
card-outlined-container-color: map.get($system, surface),
card-outlined-container-elevation: elevation.get-box-shadow(map.get($system, level0)),
card-outlined-container-elevation-shadow: elevation.get-box-shadow(map.get($system, level0)),
card-outlined-outline-color: map.get($system, outline-variant),
card-subtitle-text-color: map.get($system, on-surface),
),
Expand Down
6 changes: 3 additions & 3 deletions src/material/card/card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $fallbacks: m3-card.get-tokens();
background-color: token-utils.slot(card-elevated-container-color, $fallbacks);
border-color: token-utils.slot(card-elevated-container-color, $fallbacks);
border-radius: token-utils.slot(card-elevated-container-shape, $fallbacks);
box-shadow: token-utils.slot(card-elevated-container-elevation, $fallbacks);
box-shadow: token-utils.slot(card-elevated-container-elevation-shadow, $fallbacks);

// Transparent card border for high-contrast mode.
&::after {
Expand All @@ -42,7 +42,7 @@ $fallbacks: m3-card.get-tokens();
border-radius: token-utils.slot(card-outlined-container-shape, $fallbacks);
border-width: token-utils.slot(card-outlined-outline-width, $fallbacks);
border-color: token-utils.slot(card-outlined-outline-color, $fallbacks);
box-shadow: token-utils.slot(card-outlined-container-elevation, $fallbacks);
box-shadow: token-utils.slot(card-outlined-container-elevation-shadow, $fallbacks);

// Outlined card already displays border in high-contrast mode.
// Overwriting styles set above to remove a duplicate border.
Expand All @@ -54,7 +54,7 @@ $fallbacks: m3-card.get-tokens();
.mat-mdc-card-filled {
background-color: token-utils.slot(card-filled-container-color, $fallbacks);
border-radius: token-utils.slot(card-filled-container-shape, $fallbacks);
box-shadow: token-utils.slot(card-filled-container-elevation, $fallbacks);
box-shadow: token-utils.slot(card-filled-container-elevation-shadow, $fallbacks);
}

.mdc-card__media {
Expand Down
5 changes: 3 additions & 2 deletions src/material/datepicker/_m2-datepicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
base: (
datepicker-calendar-container-shape: 4px,
datepicker-calendar-container-touch-shape: 4px,
),
color: map.merge(private-get-color-palette-color-tokens($theme, primary), (
datepicker-calendar-container-elevation-shadow: elevation.get-box-shadow(4),
datepicker-calendar-container-touch-elevation-shadow: elevation.get-box-shadow(24),
),
color: private-get-color-palette-color-tokens($theme, primary),
)),
typography: (
// TODO(crisbeto): the typography tokens for other components set every typography dimension
// of an element (e.g. size, weight, line height, letter spacing). These tokens only set the
Expand Down
4 changes: 2 additions & 2 deletions src/material/datepicker/_m3-datepicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@

@return (
base: (
datepicker-calendar-container-elevation-shadow:elevation.get-box-shadow(0),
datepicker-calendar-container-shape: map.get($system, corner-large),
datepicker-calendar-container-touch-elevation-shadow:elevation.get-box-shadow(0),
datepicker-calendar-container-touch-shape: map.get($system, corner-extra-large),
),
color: (
datepicker-calendar-body-label-text-color: map.get($system, on-surface),
datepicker-calendar-container-background-color: map.get($system, surface-container-high),
datepicker-calendar-container-elevation-shadow:elevation.get-box-shadow(0),
datepicker-calendar-container-text-color: map.get($system, on-surface),
datepicker-calendar-container-touch-elevation-shadow:elevation.get-box-shadow(0),
datepicker-calendar-date-disabled-state-text-color:
m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
datepicker-calendar-date-focus-state-background-color: m3-utils.color-with-opacity(
Expand Down
2 changes: 1 addition & 1 deletion src/material/dialog/_m2-dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
@return (
base: (
dialog-container-shape: 4px,
dialog-container-elevation-shadow: elevation.get-box-shadow(24),
dialog-container-max-width: 80vw,
dialog-container-small-max-width: 80vw,
dialog-container-min-width: 0,
Expand All @@ -23,6 +22,7 @@
),
color: (
dialog-container-color: map.get($system, surface),
dialog-container-elevation-shadow: elevation.get-box-shadow(24),
dialog-subhead-color: map.get($system, on-surface),
dialog-supporting-text-color: map.get($system, on-surface-variant),
),
Expand Down
2 changes: 1 addition & 1 deletion src/material/expansion/_m2-expansion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
@return (
base: (
expansion-container-shape: 4px,
expansion-container-elevation-shadow: elevation.get-box-shadow(2),
expansion-legacy-header-indicator-display: inline-block,
expansion-header-indicator-display: none,
),
color: (
expansion-container-background-color: map.get($system, surface),
expansion-container-elevation-shadow: elevation.get-box-shadow(2),
expansion-container-text-color: map.get($system, on-surface),
expansion-actions-divider-color: map.get($system, outline),
expansion-header-hover-state-layer-color: m3-utils.color-with-opacity(
Expand Down
2 changes: 1 addition & 1 deletion src/material/expansion/_m3-expansion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ $prefix: (mat, expansion);
expansion-container-shape: 12px,
expansion-header-indicator-display: inline-block,
expansion-legacy-header-indicator-display: none,
expansion-container-elevation-shadow: elevation.get-box-shadow(2),
),
color: (
expansion-actions-divider-color: map.get($system, outline),
expansion-container-background-color: map.get($system, surface),
expansion-container-elevation-shadow: elevation.get-box-shadow(2),
expansion-container-text-color: map.get($system, on-surface),
expansion-header-description-color: map.get($system, on-surface-variant),
expansion-header-disabled-state-text-color:
Expand Down
2 changes: 1 addition & 1 deletion src/material/menu/_m2-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
menu-item-trailing-spacing: 16px,
menu-item-with-icon-leading-spacing: 16px,
menu-item-with-icon-trailing-spacing: 16px,
menu-container-elevation-shadow: elevation.get-box-shadow(8),

// Unused
menu-base-elevation-level: null,
),
color: (
menu-container-elevation-shadow: elevation.get-box-shadow(8),
menu-item-label-text-color: map.get($system, on-surface),
menu-item-icon-color: map.get($system, on-surface),
menu-item-hover-state-layer-color: m3-utils.color-with-opacity(
Expand Down
6 changes: 3 additions & 3 deletions src/material/select/_m2-select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
$density-scale: theming.clamp-density(map.get($system, density-scale), -2);

@return (
base: (
base: (),
color: map.merge(private-get-color-palette-color-tokens($theme, primary), (
select-container-elevation-shadow: elevation.get-box-shadow(8),
),
color: private-get-color-palette-color-tokens($theme, primary),
)),
typography: (
select-trigger-text-font: map.get($system, body-large-font),
select-trigger-text-line-height: map.get($system, body-large-line-height),
Expand Down
5 changes: 2 additions & 3 deletions src/material/select/_m3-select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ $prefix: (mat, select);
}

@return (
base: (
select-container-elevation-shadow: elevation.get-box-shadow(2),
),
base: (),
color: (
select-container-elevation-shadow: elevation.get-box-shadow(2),
select-panel-background-color: map.get($system, surface-container),
select-enabled-trigger-text-color: map.get($system, on-surface),
select-disabled-trigger-text-color:
Expand Down
2 changes: 1 addition & 1 deletion src/material/sidenav/_m2-sidenav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
@return (
base: (
sidenav-container-shape: 0,
sidenav-container-elevation-shadow: elevation.get-box-shadow(16),
sidenav-container-width: auto,
),
color: (
sidenav-container-divider-color: map.get($system, outline),
sidenav-container-elevation-shadow: elevation.get-box-shadow(16),
sidenav-container-background-color: map.get($system, surface),
sidenav-container-text-color: map.get($system, on-surface),
sidenav-content-background-color: map.get($system, background),
Expand Down
2 changes: 1 addition & 1 deletion src/material/slider/_m2-slider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
base: (
slider-active-track-height: 6px,
slider-active-track-shape: 9999px,
slider-handle-elevation: elevation.get-box-shadow(1),
slider-handle-height: 20px,
slider-handle-shape: 50%,
slider-handle-width: 20px,
Expand All @@ -34,6 +33,7 @@
slider-disabled-active-track-color: map.get($system, on-surface),
slider-disabled-handle-color: map.get($system, on-surface),
slider-disabled-inactive-track-color: map.get($system, on-surface),
slider-handle-elevation-shadow: elevation.get-box-shadow(1),
slider-label-container-color: map.get($system, inverse-surface),
slider-label-label-text-color: map.get($system, inverse-on-surface),
slider-value-indicator-opacity: 1,
Expand Down
2 changes: 1 addition & 1 deletion src/material/slider/_m3-slider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
slider-focus-handle-color: map.get($system, primary),
slider-focus-state-layer-color: m3-utils.color-with-opacity(map.get($system, primary), 20%),
slider-handle-color: map.get($system, primary),
slider-handle-elevation: elevation.get-box-shadow(map.get($system, level1)),
slider-handle-elevation-shadow: elevation.get-box-shadow(map.get($system, level1)),
slider-handle-shape: map.get($system, corner-full),
slider-hover-handle-color: map.get($system, primary),
slider-hover-state-layer-color: m3-utils.color-with-opacity(map.get($system, primary), 5%),
Expand Down
2 changes: 1 addition & 1 deletion src/material/slider/slider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ $fallbacks: m3-slider.get-tokens();
height: $height-ref;
border-width: calc(#{$height-ref} / 2) calc(#{$width-ref} / 2);

box-shadow: token-utils.slot(slider-handle-elevation, $fallbacks);
box-shadow: token-utils.slot(slider-handle-elevation-shadow, $fallbacks);
background-color: token-utils.slot(slider-handle-color, $fallbacks);
border-color: token-utils.slot(slider-handle-color, $fallbacks);
border-radius: token-utils.slot(slider-handle-shape, $fallbacks);
Expand Down
4 changes: 2 additions & 2 deletions src/material/timepicker/_m2-timepicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
@return (
base: (
timepicker-container-shape: 4px,
timepicker-container-elevation-shadow: elevation.get-box-shadow(8),
),
color: (
timepicker-container-background-color: map.get($system, surface)
timepicker-container-background-color: map.get($system, surface),
timepicker-container-elevation-shadow: elevation.get-box-shadow(8),
),
typography: (),
density: (),
Expand Down
Loading