allow select with size attr to not have fixed height

diff --git a/bootstrap.css b/bootstrap.css
index 51341e9023fb7d3c7cd39f3996642bae0c9829fe..a1fcc1df62fd30f6eaef2e8106bb725602de9959 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: Tue Dec 27 15:49:07 CST 2011
+ * Date: Tue Dec 27 16:07:55 CST 2011
  */
 html, body {
   margin: 0;
@@ -604,7 +604,7 @@ select {
   background-color: #ffffff;
   vertical-align: middle;
 }
-select[multiple] {
+select[multiple], select[size] {
   height: inherit;
 }
 input[type=image] {

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 4c794c9e7400f303d7ed2dbd6f6f0477fe44d7be..0be96084b287f000ebfb31d976e76f64c2278fc7 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -101,7 +101,7 @@ input[type=file]{padding:initial;line-height:initial;border:initial;background-c
 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{background-color:#ffffff;vertical-align:middle;}
-select[multiple]{height:inherit;}
+select[multiple],select[size]{height:inherit;}
 input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 textarea{height:auto;}
 input,textarea{-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}

diff --git a/lib/forms.less b/lib/forms.less
index 9d96e8f33c34d66c41c02ca783e2bd43a7bf40b9..e9c392c763cfec78aea03adcdf1de509da720866 100644 (file)
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -100,7 +100,8 @@ select {
 }
 
 // Make multiple select elements height not fixed
-select[multiple] {
+select[multiple],
+select[size] {
   height: inherit;
 }