Merge branch 'master' of github.com:carbon-design-system/carbon into …

…release/v10.16.0-rc.1
carbon-design-system · Jul 15, 2020 · 4c30648 · 4c30648
2 parents 0232dc3 + d734a44
commit 4c30648
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -14056,7 +14056,7 @@ Button base styles
   justify-content: space-between;
   vertical-align: top;
   flex-shrink: 0;
-  min-height: rem($button-height);
+  min-height: $button-height;
   padding: $button-padding;
   border-radius: $button-border-radius;
   text-align: left;

diff --git a/packages/components/src/components/button/_mixins.scss b/packages/components/src/components/button/_mixins.scss
@@ -20,7 +20,7 @@
   justify-content: space-between;
   vertical-align: top;
   flex-shrink: 0;
-  min-height: rem($button-height);
+  min-height: $button-height;
   padding: $button-padding;
   border-radius: $button-border-radius;
   text-align: left;

diff --git a/packages/components/src/globals/scss/_theme-tokens.scss b/packages/components/src/globals/scss/_theme-tokens.scss
@@ -88,7 +88,7 @@ $button-border-radius: 0 !default;
 /// @type Number
 /// @access public
 /// @group button
-$button-height: 48px !default;
+$button-height: 3rem !default;
 
 /// @type Value
 /// @access public