From 98bae993a38f43dc45e6a23b5302f882926a0ab1 Mon Sep 17 00:00:00 2001 From: emyarod Date: Fri, 1 Feb 2019 14:46:33 -0600 Subject: [PATCH 1/2] fix(button): set default button heights --- src/components/button/_button.scss | 2 +- src/components/button/_mixins.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/button/_button.scss b/src/components/button/_button.scss index e7367ca1bdee..2ec39cc76819 100644 --- a/src/components/button/_button.scss +++ b/src/components/button/_button.scss @@ -305,7 +305,7 @@ .#{$prefix}--btn--sm { @include letter-spacing; - height: auto; + height: rem(32px); padding: $button-padding-sm; } diff --git a/src/components/button/_mixins.scss b/src/components/button/_mixins.scss index 4c13b9453ef5..59ade5208dab 100644 --- a/src/components/button/_mixins.scss +++ b/src/components/button/_mixins.scss @@ -81,7 +81,7 @@ flex-shrink: 0; font-size: $button-font-size; font-weight: $button-font-weight; - height: auto; + height: rem(48px); padding: $button-padding; border-radius: $button-border-radius; text-align: left; From c7bf16106a08de7dcb0f5b54ad4811583c31e6ca Mon Sep 17 00:00:00 2001 From: emyarod Date: Fri, 1 Feb 2019 16:23:26 -0600 Subject: [PATCH 2/2] refactor(button): use $button-height variable --- src/components/button/_mixins.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/button/_mixins.scss b/src/components/button/_mixins.scss index 59ade5208dab..63df1d88d015 100644 --- a/src/components/button/_mixins.scss +++ b/src/components/button/_mixins.scss @@ -81,7 +81,7 @@ flex-shrink: 0; font-size: $button-font-size; font-weight: $button-font-weight; - height: rem(48px); + height: rem($button-height); padding: $button-padding; border-radius: $button-border-radius; text-align: left;