From: Mark Otto <markdotto@gmail.com>
Date: Tue, 18 Aug 2015 06:42:58 +0000 (-0700)
Subject: really temporarily disable those heights
X-Git-Tag: v4.0.0-alpha~27^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcc92778d54692253e5b41bf1eb93a19fcc89191;p=thirdparty%2Fbootstrap.git

really temporarily disable those heights
---

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 1a4139f196..9888da1d68 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -144,7 +144,7 @@
 // issue documented in https://github.com/twbs/bootstrap/issues/15074.
 
 .form-control-sm {
-  height: $input-height-sm;
+  // height: $input-height-sm;
   padding: $input-padding-y-sm $input-padding-x-sm;
   font-size: $font-size-sm;
   line-height: $line-height-sm;
@@ -152,7 +152,7 @@
 }
 
 .form-control-lg {
-  height: $input-height-lg;
+  // height: $input-height-lg;
   padding: $input-padding-y-lg $input-padding-x-lg;
   font-size: $font-size-lg;
   line-height: $line-height-lg;