From a96664b835e044dddcf0feaf44697f6ee751d80f Mon Sep 17 00:00:00 2001
From: Elizabeth Mitchell <lizmitchell@google.com>
Date: Mon, 8 Aug 2022 21:44:00 -0700
Subject: [PATCH] fix(field): supporting text typography not resolving

PiperOrigin-RevId: 466241475
---
 field/lib/_filled-field-theme.scss   | 1 +
 field/lib/_outlined-field-theme.scss | 1 +
 field/lib/_supporting-text.scss      | 8 +++-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/field/lib/_filled-field-theme.scss b/field/lib/_filled-field-theme.scss
index 08d7677e03..b4b538446a 100644
--- a/field/lib/_filled-field-theme.scss
+++ b/field/lib/_filled-field-theme.scss
@@ -99,6 +99,7 @@ $dark-theme: values(
 
 @function _resolve-theme($theme, $resolvers) {
   $theme: label-theme.resolve-theme($theme, $resolvers);
+  $theme: supporting-text-theme.resolve-theme($theme, $resolvers);
   $theme: shape.resolve-theme(
     $theme,
     map.get($resolvers, shape),
diff --git a/field/lib/_outlined-field-theme.scss b/field/lib/_outlined-field-theme.scss
index 7466b6caee..b43290d3f0 100644
--- a/field/lib/_outlined-field-theme.scss
+++ b/field/lib/_outlined-field-theme.scss
@@ -99,6 +99,7 @@ $dark-theme: values(
 
 @function _resolve-theme($theme, $resolvers) {
   $theme: label-theme.resolve-theme($theme, $resolvers);
+  $theme: supporting-text-theme.resolve-theme($theme, $resolvers);
   $theme: shape.resolve-theme(
     $theme,
     map.get($resolvers, shape),
diff --git a/field/lib/_supporting-text.scss b/field/lib/_supporting-text.scss
index 61695d6861..47eb9bc811 100644
--- a/field/lib/_supporting-text.scss
+++ b/field/lib/_supporting-text.scss
@@ -12,11 +12,9 @@
     justify-content: space-between;
   }
 
-  .md3-field__supporting-text,
+  .md3-field__supporting-text-start,
   .md3-field__supporting-text-end {
-    ::slotted(:not(:empty)) {
-      // Can't be an inline display element (<span>) for padding-top to work.
-      display: inline-flex;
-    }
+    // Can't be an inline display element (<span>) for padding-top to work.
+    display: flex;
   }
 }