Merge branch 'master' into 3615-definition-tooltip-dismiss-esc

carbon-design-system · Jan 27, 2020 · 1aa6811 · 1aa6811
2 parents a18cbd9 + f124075
commit 1aa6811
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -13094,8 +13094,7 @@ Button styles
   }
 
   .#{$prefix}--btn--field {
-    height: 40px;
-    min-height: 40px;
+    min-height: rem(40px);
     padding: $button-padding-field;
   }
 
@@ -17269,7 +17268,7 @@ Inline loading styles
   }
 
   .#{$prefix}--inline-loading__text {
-    @include type-style('body-short-01');
+    @include type-style('label-01');
     color: $text-02;
   }