From: Mark Otto <markotto@twitter.com>
Date: Tue, 14 Aug 2012 21:57:49 +0000 (-0700)
Subject: fixes #4358: make select elements 30px tall to match inputs
X-Git-Tag: v2.1.0~2^2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5144c77b272e12a48913faa0b7d1e54eccd2e638;p=thirdparty%2Fbootstrap.git

fixes #4358: make select elements 30px tall to match inputs
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index fb69a19ba6..f22d2824d7 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -943,6 +943,7 @@ input[type="color"],
   font-size: 14px;
   line-height: 20px;
   color: #555555;
+  vertical-align: middle;
   -webkit-border-radius: 3px;
      -moz-border-radius: 3px;
           border-radius: 3px;
@@ -1031,13 +1032,13 @@ input[type="checkbox"] {
 
 select,
 input[type="file"] {
-  height: 28px;
+  height: 30px;
   /* In IE7, the height of the select element cannot be changed by height, only font-size */
 
   *margin-top: 4px;
   /* For IE7, add top margin to align select with labels */
 
-  line-height: 28px;
+  line-height: 30px;
 }
 
 select {
diff --git a/less/forms.less b/less/forms.less
index 0b3f10cb06..852f0bb6be 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -151,9 +151,9 @@ input[type="checkbox"] {
 // Set the height of select and file controls to match text inputs
 select,
 input[type="file"] {
-  height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
+  height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
   *margin-top: 4px; /* For IE7, add top margin to align select with labels */
-  line-height: 28px;
+  line-height: 30px;
 }
 
 // Make select elements obey height by applying a border