From: Mark Otto <markdotto@gmail.com>
Date: Sun, 7 Feb 2016 02:20:27 +0000 (-0800)
Subject: Fixes #17194: Ensure proper height on default select.form-control instances
X-Git-Tag: v4.0.0-alpha.3~294
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caa36b8dd723945a788b1dcb2c845ee05532155e;p=thirdparty%2Fbootstrap.git

Fixes #17194: Ensure proper height on default select.form-control instances
---

diff --git a/scss/_forms.scss b/scss/_forms.scss
index c492d1f1c2..03f1409064 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -21,14 +21,6 @@
   @include box-shadow($input-box-shadow);
   @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);
 
-  // Make inputs at least the height of their button counterpart (base line-height + padding + border).
-  // Only apply the height to textual inputs and some selects.
-  // &:not(textarea),
-  // &:not(select[size]),
-  // &:not(select[multiple]) {
-  //   height: $input-height;
-  // }
-
   // Unstyle the caret on `<select>`s in IE10+.
   &::-ms-expand {
     background-color: transparent;
@@ -62,6 +54,11 @@
   }
 }
 
+select.form-control {
+  &:not([size], [multiple]) {
+    height: $input-height;
+  }
+}
 
 // Make file inputs better match text inputs by forcing them to new lines.
 .form-control-file,