0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

allow select with size attr to not have fixed height

This commit is contained in:
Mark Otto 2011-12-27 16:08:07 -06:00
parent 3426877c89
commit 46d2ad5e22
3 changed files with 5 additions and 4 deletions

4
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 { html, body {
margin: 0; margin: 0;
@ -604,7 +604,7 @@ select {
background-color: #ffffff; background-color: #ffffff;
vertical-align: middle; vertical-align: middle;
} }
select[multiple] { select[multiple], select[size] {
height: inherit; height: inherit;
} }
input[type=image] { input[type=image] {

2
bootstrap.min.css vendored
View File

@ -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;} 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,input[type=file]{height:27px;*margin-top:4px;line-height:27px;}
select{background-color:#ffffff;vertical-align:middle;} 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;} input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
textarea{height:auto;} 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;} 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;}

View File

@ -100,7 +100,8 @@ select {
} }
// Make multiple select elements height not fixed // Make multiple select elements height not fixed
select[multiple] { select[multiple],
select[size] {
height: inherit; height: inherit;
} }