Fix units on input and select heights

diff --git a/scss/forms/_select.scss b/scss/forms/_select.scss
index f93025e16574ffd21137afbbe89fe8aec99ceb1a..5f5097a077a6fe82b5a2d32b37ca3d814b6bb852 100644 (file)
--- 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 166de1e1ba9c02cebf32c26d7215a5be10870c2c..b34b121ed28d38c0d1dbbcead9d1e7fb94ffdb46 100644 (file)
--- 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;