From: Kevin Ball <kmball11@gmail.com>
Date: Wed, 31 May 2017 16:44:06 +0000 (-0700)
Subject: Fix units on input and select heights
X-Git-Tag: v6.4.0-rc1~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10093%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fix units on input and select heights
---

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;