refactor: fixes found from internal changes

Author: andrewseguin

src/material/core/tokens/_token-utils.scss

@@ -62,12 +62,12 @@
         #{map.keys($fallbacks-flattened)};
   }
 
-  $fallback: map.get($fallbacks-flattened, $token);
-  @if (sass-utils.is-css-var-name($fallback)) {
-    $fallback: _create-var($fallback, $fallback);
+  $sys-fallback: map.get($fallbacks-flattened, $token);
+  @if (sass-utils.is-css-var-name($sys-fallback)) {
+    $sys-fallback: _create-var($sys-fallback, $fallback);
   }
 
-  @return _create-var(--mat-#{$token}, $fallback);
+  @return _create-var(--mat-#{$token}, $sys-fallback);
 }
 
 // Outputs a map of tokens.

src/material/dialog/dialog.scss

@@ -15,11 +15,6 @@ $mat-dialog-button-horizontal-margin: 8px !default;
 // Fixes b/323588333
 $mat-dialog-container-max-height: 95vh !default;
 
-// Whether to emit fallback values for the structural styles. Previously MDC was emitting
-// paddings in the static styles which meant that users would get them even if they didn't
-// include the `dialog-base`. Eventually we should clean up the usages of this flag.
-$_emit-fallbacks: true;
-
 $fallbacks: m3-dialog.get-tokens();
 
 // Note that we disable fallback declarations, but we don't disable fallback
@@ -95,10 +90,10 @@ $fallbacks: m3-dialog.get-tokens();
   min-width: inherit;
   max-width: inherit;
 
-  box-shadow: token-utils.slot(dialog-container-elevation-shadow, $fallbacks, $_emit-fallbacks);
+  box-shadow: token-utils.slot(dialog-container-elevation-shadow, $fallbacks, none);
 
-  border-radius: token-utils.slot(dialog-container-shape, $fallbacks, $_emit-fallbacks);
-  background-color: token-utils.slot(dialog-container-color, $fallbacks, $_emit-fallbacks);
+  border-radius: token-utils.slot(dialog-container-shape, $fallbacks, 4px);
+  background-color: token-utils.slot(dialog-container-color, $fallbacks, white);
 
   [dir='rtl'] & {
     text-align: right;
@@ -135,7 +130,7 @@ $fallbacks: m3-dialog.get-tokens();
   box-sizing: border-box;
   margin: 0 0 1px;
 
-  padding: token-utils.slot(dialog-headline-padding, $fallbacks, $_emit-fallbacks);
+  padding: token-utils.slot(dialog-headline-padding, $fallbacks, 6px 24px 13px);
 
   // This was used by MDC to set the text baseline. We should figure out a way to
   // remove it, because it can introduce unnecessary whitespace at the beginning
@@ -154,13 +149,12 @@ $fallbacks: m3-dialog.get-tokens();
 
   // Nested to maintain the old specificity.
   .mat-mdc-dialog-container & {
-    color: token-utils.slot(dialog-subhead-color, $fallbacks, $_emit-fallbacks);
-    font-family: token-utils.slot(dialog-subhead-font,
-          $fallbacks, if($_emit-fallbacks, inherit, null));
-    line-height: token-utils.slot(dialog-subhead-line-height, $fallbacks, $_emit-fallbacks);
-    font-size: token-utils.slot(dialog-subhead-size, $fallbacks, $_emit-fallbacks);
-    font-weight: token-utils.slot(dialog-subhead-weight, $fallbacks, $_emit-fallbacks);
-    letter-spacing: token-utils.slot(dialog-subhead-tracking, $fallbacks, $_emit-fallbacks);
+    color: token-utils.slot(dialog-subhead-color, $fallbacks, rgba(0, 0, 0, 0.87));
+    font-family: token-utils.slot(dialog-subhead-font, $fallbacks, inherit);
+    line-height: token-utils.slot(dialog-subhead-line-height, $fallbacks, 1.5rem);
+    font-size: token-utils.slot(dialog-subhead-size, $fallbacks, 1rem);
+    font-weight: token-utils.slot(dialog-subhead-weight, $fallbacks, 400);
+    letter-spacing: token-utils.slot(dialog-subhead-tracking, $fallbacks, 0.03125em);
   }
 }
 
@@ -182,26 +176,23 @@ $fallbacks: m3-dialog.get-tokens();
 
   // Nested to maintain the old specificity.
   .mat-mdc-dialog-container & {
-      color: token-utils.slot(dialog-supporting-text-color, $fallbacks, $_emit-fallbacks);
-      font-family: token-utils.slot(dialog-supporting-text-font,
-            $fallbacks, if($_emit-fallbacks, inherit, null));
-      line-height: token-utils.slot(dialog-supporting-text-line-height,
-            $fallbacks, $_emit-fallbacks);
-      font-size: token-utils.slot(dialog-supporting-text-size, $fallbacks, $_emit-fallbacks);
-      font-weight: token-utils.slot(dialog-supporting-text-weight, $fallbacks, $_emit-fallbacks);
-      letter-spacing: token-utils.slot(dialog-supporting-text-tracking,
-            $fallbacks, $_emit-fallbacks);
+      color: token-utils.slot(dialog-supporting-text-color, $fallbacks, rgba(0, 0, 0, 0.6));
+      font-family: token-utils.slot(dialog-supporting-text-font, $fallbacks, inherit);
+      line-height: token-utils.slot(dialog-supporting-text-line-height, $fallbacks, 1.5rem);
+      font-size: token-utils.slot(dialog-supporting-text-size, $fallbacks, 1rem);
+      font-weight: token-utils.slot(dialog-supporting-text-weight, $fallbacks, 400);
+      letter-spacing: token-utils.slot(dialog-supporting-text-tracking, $fallbacks, 0.03125em);
   }
 
   // These styles need a bit more specificity.
   .mat-mdc-dialog-container & {
-    padding: token-utils.slot(dialog-content-padding, $fallbacks, $_emit-fallbacks);
+    padding: token-utils.slot(dialog-content-padding, $fallbacks, 20px 24px 0);
   }
 
   // Note: we can achieve this with a `:has` selector, but it results in an
   // increased specificity which breaks a lot of internal clients.
   .mat-mdc-dialog-container-with-actions & {
-    padding: token-utils.slot(dialog-with-actions-content-padding, $fallbacks, $_emit-fallbacks);
+    padding: token-utils.slot(dialog-with-actions-content-padding, $fallbacks, 20px 24px 0);
   }
 
   .mat-mdc-dialog-container .mat-mdc-dialog-title + & {
@@ -222,8 +213,8 @@ $fallbacks: m3-dialog.get-tokens();
 
   // For backwards compatibility, actions align at start by default. MDC usually
   // aligns actions at the end of the container.
-  padding: token-utils.slot(dialog-actions-padding, $fallbacks, $_emit-fallbacks);
-  justify-content: token-utils.slot(dialog-actions-alignment, $fallbacks, $_emit-fallbacks);
+  padding: token-utils.slot(dialog-actions-padding, $fallbacks, 16px 24px);
+  justify-content: token-utils.slot(dialog-actions-alignment, $fallbacks, flex-end);
 
   @include cdk.high-contrast {
     border-top-color: CanvasText;