fix select alignment and height

diff --git a/bootstrap.css b/bootstrap.css
index 1556d7704f3acdf745774835882aa9e6168ab1d6..c53264a2d62ee6da3fdfa7635818ace43a5a59e3 100644 (file)
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Wed Jan 25 11:50:14 PST 2012
+ * Date: Wed Jan 25 12:03:47 PST 2012
  */
 article,
 aside,
@@ -541,17 +541,17 @@ input[type=button], input[type=reset], input[type=submit] {
   height: auto;
 }
 select, input[type=file] {
-  height: 27px;
+  height: 28px;
   /* 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: 27px;
+  line-height: 28px;
 }
 select {
   width: 220px;
-  vertical-align: middle;
+  vertical-align: baseline;
   background-color: #ffffff;
 }
 select[multiple], select[size] {

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 8174829501804e98ba0c2e19533b5fb47f326f97..447ecbb2d8bdd94e3d98f6311c9cb0a3e16c1918 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -99,8 +99,8 @@ input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
 input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
-select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;}
-select{width:220px;vertical-align:middle;background-color:#ffffff;}
+select,input[type=file]{height:28px;*margin-top:4px;line-height:28px;}
+select{width:220px;vertical-align:baseline;background-color:#ffffff;}
 select[multiple],select[size]{height:auto;}
 input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 textarea{height:auto;}

diff --git a/lib/forms.less b/lib/forms.less
index 355a33a30d46c38764e065f7d6af9eb268b1cf98..7451f36efcd982733d8fa558b6709dd72392b800 100644 (file)
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -103,15 +103,15 @@ input[type=submit] {
 // Set the height of select and file controls to match text inputs
 select,
 input[type=file] {
-  height: @baseLineHeight * 1.5; /* In IE7, the height of the select element cannot be changed by height, only font-size */
+  height: 28px; /* 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: @baseLineHeight * 1.5;
+  line-height: 28px;
 }
 
 // Chrome on Linux and Mobile Safari need background-color
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
-  vertical-align: middle;
+  vertical-align: baseline;
   background-color: @white;
 }