aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-12-27 16:08:07 -0600
committerMark Otto <[email protected]>2011-12-27 16:08:07 -0600
commit46d2ad5e221646807fb2bd71881860462988008e (patch)
tree171b4f784015c632f43bea337641c8482dcd2a3d
parent3426877c894b858d89e68c72bc300cd4f670c40f (diff)
downloadbootstrap-46d2ad5e221646807fb2bd71881860462988008e.tar.xz
bootstrap-46d2ad5e221646807fb2bd71881860462988008e.zip
allow select with size attr to not have fixed height
-rw-r--r--bootstrap.css4
-rw-r--r--bootstrap.min.css2
-rw-r--r--lib/forms.less3
3 files changed, 5 insertions, 4 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 51341e902..a1fcc1df6 100644
--- 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 4c794c9e7..0be96084b 100644
--- 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 9d96e8f33..e9c392c76 100644
--- 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;
}