From a5fe8f30375a56d49b94287bfb3199b0913febb7 Mon Sep 17 00:00:00 2001 From: Elizabeth Mitchell Date: Wed, 5 Apr 2023 21:25:00 -0700 Subject: [PATCH] fix(navigationbar): tonal surface update PiperOrigin-RevId: 522237428 --- navigationbar/lib/_navigation-bar.scss | 2 +- navigationbar/lib/navigation-bar.ts | 6 +++--- tokens/_md-comp-navigation-bar.scss | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/navigationbar/lib/_navigation-bar.scss b/navigationbar/lib/_navigation-bar.scss index a035634b67..7e6f0c055c 100644 --- a/navigationbar/lib/_navigation-bar.scss +++ b/navigationbar/lib/_navigation-bar.scss @@ -57,7 +57,7 @@ } } - md-elevation-surface { + md-elevation { z-index: 0; } } diff --git a/navigationbar/lib/navigation-bar.ts b/navigationbar/lib/navigation-bar.ts index f2b85a0806..3ed26596ab 100644 --- a/navigationbar/lib/navigation-bar.ts +++ b/navigationbar/lib/navigation-bar.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import '../../elevation/elevation-surface.js'; +import '../../elevation/elevation.js'; import {html, LitElement, PropertyValues, TemplateResult} from 'lit'; import {property, queryAssignedElements} from 'lit/decorators.js'; @@ -41,8 +41,8 @@ export class NavigationBar extends LitElement implements NavigationBarState { @keydown="${this.handleKeydown}" @navigation-tab-interaction="${this.handleNavigationTabInteraction}" @navigation-tab-rendered=${this.handleNavigationTabConnected} - >
`; } diff --git a/tokens/_md-comp-navigation-bar.scss b/tokens/_md-comp-navigation-bar.scss index 919cf26591..b12d05ea47 100644 --- a/tokens/_md-comp-navigation-bar.scss +++ b/tokens/_md-comp-navigation-bar.scss @@ -4,13 +4,12 @@ // // 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-navigation-bar'; -@use './v0_161/md-sys-color'; +@use './v0_172/md-comp-navigation-bar'; // go/keep-sorted end $_default: (