From bd125fe4562712da5ecc1b4abd559fd1e737f8cd Mon Sep 17 00:00:00 2001 From: Daniel Freedman Date: Fri, 17 Feb 2023 12:23:32 -0800 Subject: [PATCH] fix(segementedbutton)!: move to `label-text-type` token PiperOrigin-RevId: 510493878 --- segmentedbutton/lib/_shared.scss | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/segmentedbutton/lib/_shared.scss b/segmentedbutton/lib/_shared.scss index e0faecd63a..bca53e3e5d 100644 --- a/segmentedbutton/lib/_shared.scss +++ b/segmentedbutton/lib/_shared.scss @@ -13,7 +13,6 @@ @use '../../motion/animation'; @use '../../ripple/ripple'; @use '../../sass/color'; -@use '../../sass/resolvers'; @use '../../sass/touch-target'; @use '../../sass/typography'; // go/keep-sorted end @@ -107,10 +106,7 @@ } .md3-segmented-button__label-text { - font-family: var(--_label-text-font); - font-size: var(--_label-text-size); - letter-spacing: var(--_label-text-tracking); - font-weight: var(--_label-text-weight); + font: var(--_label-text-type); } &.md3-segmented-button--selected:enabled { @@ -361,11 +357,7 @@ } @function resolve-tokens($tokens) { - $tokens: typography.resolve-theme( - $tokens, - map.get(resolvers.$material, 'typography'), - 'label-text' - ); + $tokens: typography.resolve-tokens($tokens, 'label-text'); $tokens: _flatten-disabled-colors($tokens); @return $tokens; }