DEV/material-components_material-web
1
0
Fork 0
mirror of https://github.com/material-components/material-web.git synced 2026-03-09 00:09:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(button): misc elevation Sass fixes

Browse Source 
PiperOrigin-RevId: 399731949
This commit is contained in:
Allan Chen 2021-09-29 11:22:26 -07:00 committed by Copybara-Service
parent b1d21d02e1
commit df2d0f57a2
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/button/lib/_elevated-button-theme.scss
View File

@ -6,6 +6,7 @@
@use 'sass:map';
@use '@material/theme/keys';
@use '@material/theme/theme';
@use '@material/tokens/resolvers';
@use './button-theme';
@use './elevation-theme';
@ -46,7 +47,7 @@ $light-theme: map.merge(
@include theme.validate-theme($light-theme, $theme);
$theme: elevation-theme.resolve-theme-elevation-keys(
$theme,
$resolvers: $resolvers
$resolver: map.get($resolvers, elevation)
);
@include keys.declare-custom-properties($theme, $_custom-property-prefix);
}

5
components/button/lib/_elevation-theme.scss
View File

@ -74,11 +74,10 @@ $_selectors: button-theme.$selectors;
}
@function resolve-theme-elevation-keys($theme, $resolver) {
$elevation-resolver: map.get($resolver, elevation);
$shadow-color: map.get($theme, container-shadow-color);
@if $elevation-resolver == null {
@if $resolver == null {
@return $theme;
}
$shadow-color: map.get($theme, container-shadow-color);
$elevation-keys: (
container-elevation,

3
components/button/lib/_filled-button-theme.scss
View File

@ -6,6 +6,7 @@
@use 'sass:map';
@use '@material/theme/keys';
@use '@material/theme/theme';
@use '@material/tokens/resolvers';
@use './button-theme';
@use './elevation-theme';
@ -46,7 +47,7 @@ $light-theme: map.merge(
@include theme.validate-theme($light-theme, $theme);
$theme: elevation-theme.resolve-theme-elevation-keys(
$theme,
$resolvers: $resolvers
$resolver: map.get($resolvers, elevation)
);
@include keys.declare-custom-properties($theme, $_custom-property-prefix);
}

9
components/button/lib/_tonal-button-theme.scss
View File

@ -4,14 +4,9 @@
* SPDX-License-Identifier: Apache-2.0
*/
/**
* @license
* Copyright 2021 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
@use 'sass:map';
@use '@material/theme/keys';
@use '@material/theme/theme';
@use '@material/tokens/resolvers';
@use './button-theme';
@use './elevation-theme';
@ -52,7 +47,7 @@ $light-theme: map.merge(
@include theme.validate-theme($light-theme, $theme);
$theme: elevation-theme.resolve-theme-elevation-keys(
$theme,
$resolvers: $resolvers
$resolver: map.get($resolvers, elevation)
);
@include keys.declare-custom-properties($theme, $_custom-property-prefix);
}