From: Shaun Simmons <shaun@envysphere.com>
Date: Wed, 30 Aug 2017 20:59:44 +0000 (-0400)
Subject: Fixes #9344
X-Git-Tag: v6.4.4-rc1~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10602%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fixes #9344
---

diff --git a/scss/forms/_input-group.scss b/scss/forms/_input-group.scss
index e26618a87..804a27bf2 100644
--- a/scss/forms/_input-group.scss
+++ b/scss/forms/_input-group.scss
@@ -22,7 +22,7 @@ $input-prefix-border: 1px solid $medium-gray !default;
 $input-prefix-padding: 1rem !default;
 
 @mixin foundation-form-prepostfix {
-  $height: ($input-font-size + $form-spacing * 1.5);
+  $height: ($input-font-size * $input-line-height) + (get-side($input-padding, 'top') + get-side($input-padding, 'bottom')) - rem-calc(1);;
 
   .input-group {
     display: if($global-flexbox, flex, table);
@@ -91,12 +91,8 @@ $input-prefix-padding: 1rem !default;
 
     @if $global-flexbox {
       flex: 1 1 0px; // sass-lint:disable-line zero-unit
-      height: auto;
       min-width: 0;
     }
-    @else {
-      height: $height;
-    }
   }
 
   .input-group-button {
@@ -135,8 +131,8 @@ $input-prefix-padding: 1rem !default;
 
   // Specificity bump needed to prevent override by buttons
   @if not $global-flexbox {
-      .input-group .input-group-button {
-          display: table-cell;
-      }
+    .input-group .input-group-button {
+      display: table-cell;
+    }
   }
 }