fix(dialog)!: migrate to header-type and supporting-text-type tokens

PiperOrigin-RevId: 510407267
material-components · Feb 17, 2023 · 66948a4 · 66948a4
1 parent 4797037
commit 66948a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/dialog/lib/_dialog.scss b/dialog/lib/_dialog.scss
@@ -140,11 +140,7 @@
     gap: var(--_header-spacing);
     -webkit-font-smoothing: antialiased;
     color: var(--_headline-color);
-    font-family: var(--_headline-font);
-    line-height: var(--_headline-line-height);
-    font-size: var(--_headline-size);
-    letter-spacing: var(--_headline-tracking);
-    font-weight: var(--_headline-weight);
+    font: var(--_headline-type);
   }
 
   .content {
@@ -154,11 +150,7 @@
     margin-block-end: var(--_content-block-end-spacing);
     -webkit-font-smoothing: antialiased;
     color: var(--_supporting-text-color);
-    font-family: var(--_supporting-text-font);
-    line-height: var(--_supporting-text-line-height);
-    font-size: var(--_supporting-text-size);
-    letter-spacing: var(--_supporting-text-tracking);
-    font-weight: var(--_supporting-text-weight);
+    font: var(--_supporting-text-type);
   }
 
   .footer {

diff --git a/dialog/lib/_tokens.scss b/dialog/lib/_tokens.scss
@@ -12,6 +12,7 @@
 @use '../../sass/shape';
 @use '../../sass/string-ext';
 @use '../../sass/theme';
+@use '../../sass/typography';
 @use '../../sass/var';
 @use '../../tokens';
 // go/keep-sorted end
@@ -74,9 +75,7 @@ $_fullscreen-tokens: (
   $remove-prefix: 'action-';
   $tokens: _map-without-keys-with-prefix($tokens, $remove-prefix);
 
-  // b/203778922: `*-type` used by other platforms but not web.
-  $unsupported-tokens: ('headline-type', 'supporting-text-type');
-  @return map.remove($tokens, $unsupported-tokens...);
+  @return typography.resolve-tokens($tokens, 'headline', 'supporting-text');
 }
 
 /**