material-components/material-web
1
1
Fork 0
mirror of https://github.com/material-components/material-web.git synced 2024-09-11 13:46:10 +03:00
Code Issues Projects Releases Wiki Activity

fix(menu): tonal surface update

Browse Source 
PiperOrigin-RevId: 522244590
This commit is contained in:
Elizabeth Mitchell 2023-04-05 22:05:40 -07:00 committed by Copybara-Service
parent f15d8ca2fa
commit 7ccc21e0d2
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
list/lib/_list.scss
View File

@ -12,7 +12,6 @@
@use 'sass:string';
// go/keep-sorted end
// go/keep-sorted start
@use '../../elevation/lib/elevation';
@use '../../sass/theme';
@use '../../tokens';
@use './listitem/list-item';

9
menu/lib/_menu.scss
View File

@ -39,21 +39,20 @@ $_custom-property-prefix: 'menu';
@include md-list.theme(
(
list-item-container-color: var(--_container-color),
'list-item-container-color': var(--_container-color),
)
);
@include elevation.theme(
(
level: var(--_container-elevation),
shadow-color: var(--_container-shadow-color),
surface-tint: var(--_container-surface-tint-layer-color),
'level': var(--_container-elevation),
'shadow-color': var(--_container-shadow-color),
)
);
@include focus-ring.theme(
(
shape: var(--_container-shape),
'shape': var(--_container-shape),
)
);

4
menu/lib/menu.ts
View File

@ -8,7 +8,7 @@
// tslint:disable:no-new-decorators
import '../../list/list.js';
import '../../focus/focus-ring.js';
import '../../elevation/elevation-surface.js';
import '../../elevation/elevation.js';
import {html, isServer, LitElement} from 'lit';
import {eventOptions, property, query, state} from 'lit/decorators.js';
@ -297,7 +297,7 @@ export abstract class Menu extends LitElement {
* Renders the elevation component.
*/
protected renderElevation() {
return html`<md-elevation-surface shadow></md-elevation-surface>`;
return html`<md-elevation></md-elevation>`;
}
/**

5
tokens/_md-comp-list.scss
View File

@ -7,13 +7,12 @@
@use 'sass:map';
// go/keep-sorted end
// go/keep-sorted start
@use './md-sys-color';
@use './md-sys-elevation';
@use './md-sys-shape';
@use './md-sys-state';
@use './md-sys-typescale';
// TODO(b/272526637): tonal surface update
@use './v0_161/md-comp-list';
@use './v0_161/md-sys-color';
@use './v0_172/md-comp-list';
// go/keep-sorted end
$_default: (

5
tokens/_md-comp-menu.scss
View File

@ -4,11 +4,10 @@
//
// go/keep-sorted start
@use './md-sys-color';
@use './md-sys-elevation';
@use './md-sys-shape';
// TODO(b/272526637): tonal surface update
@use './v0_161/md-comp-menu';
@use './v0_161/md-sys-color';
@use './v0_172/md-comp-menu';
// go/keep-sorted end
$_default: (