From 1f1957afd4cb6aa96cfeead3c2b3ecc621af90cc Mon Sep 17 00:00:00 2001 From: Kevin Ball Date: Wed, 31 May 2017 09:44:06 -0700 Subject: [PATCH] Fix units on input and select heights --- scss/forms/_select.scss | 2 +- scss/forms/_text.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/forms/_select.scss b/scss/forms/_select.scss index f93025e16..5f5097a07 100644 --- a/scss/forms/_select.scss +++ b/scss/forms/_select.scss @@ -19,7 +19,7 @@ $select-triangle-color: $dark-gray !default; $select-radius: $global-radius !default; @mixin form-select { - $height: ($input-font-size * $input-line-height) + (get-side($input-padding, 'top') + get-side($input-padding, 'bottom')) - rem-calc(1); + $height: ($input-font-size * unitless-calc($input-line-height)) + (get-side($input-padding, 'top') + get-side($input-padding, 'bottom')) - rem-calc(1); height: $height; margin: 0 0 $form-spacing; diff --git a/scss/forms/_text.scss b/scss/forms/_text.scss index 166de1e1b..b34b121ed 100644 --- a/scss/forms/_text.scss +++ b/scss/forms/_text.scss @@ -83,7 +83,7 @@ $input-radius: $global-radius !default; $form-button-radius: $global-radius !default; @mixin form-element { - $height: ($input-font-size * $input-line-height) + (get-side($input-padding, 'top') + get-side($input-padding, 'bottom')) - rem-calc(1); + $height: ($input-font-size * unitless-calc($input-line-height)) + (get-side($input-padding, 'top') + get-side($input-padding, 'bottom')) - rem-calc(1); display: block; box-sizing: border-box; -- 2.47.2