kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

fix select alignment and height

Browse source
This commit is contained in:
Mark Otto 2012-01-25 12:04:19 -08:00
parent 86191d898b
commit 2b2c72b9aa
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
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: Wed Jan 25 11:50:14 PST 2012 * Date: Wed Jan 25 12:03:47 PST 2012
*/ */
article, article,
aside, aside,
@ -541,17 +541,17 @@ input[type=button], input[type=reset], input[type=submit] {
height: auto; height: auto;
} }
select, input[type=file] { select, input[type=file] {
height: 27px; height: 28px;
/* In IE7, the height of the select element cannot be changed by height, only font-size */ /* In IE7, the height of the select element cannot be changed by height, only font-size */
*margin-top: 4px; *margin-top: 4px;
/* For IE7, add top margin to align select with labels */ /* For IE7, add top margin to align select with labels */
line-height: 27px; line-height: 28px;
} }
select { select {
width: 220px; width: 220px;
vertical-align: middle; vertical-align: baseline;
background-color: #ffffff; background-color: #ffffff;
} }
select[multiple], select[size] { select[multiple], select[size] {

4
bootstrap.min.css vendored
View file

@ -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=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=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;} 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:28px;*margin-top:4px;line-height:28px;}
select{width:220px;vertical-align:middle;background-color:#ffffff;} select{width:220px;vertical-align:baseline;background-color:#ffffff;}
select[multiple],select[size]{height:auto;} select[multiple],select[size]{height:auto;}
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;}

6
lib/forms.less
View file

@ -103,15 +103,15 @@ input[type=submit] {
// Set the height of select and file controls to match text inputs // Set the height of select and file controls to match text inputs
select, select,
input[type=file] { 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 */ *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 // Chrome on Linux and Mobile Safari need background-color
select { select {
width: 220px; // default input width + 10px of padding that doesn't get applied width: 220px; // default input width + 10px of padding that doesn't get applied
vertical-align: middle; vertical-align: baseline;
background-color: @white; background-color: @white;
} }