mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-17 02:54:01 +02:00
Code Issues Releases Wiki Activity

fixes #4358: make select elements 30px tall to match inputs

Browse Source
This commit is contained in:
Mark Otto
2012-08-14 14:57:49 -07:00
parent 50df524ba1
commit 5144c77b27
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/assets/css/bootstrap.css vendored
View File

@@ -943,6 +943,7 @@ input[type="color"],
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
color: #555555; color: #555555;
vertical-align: middle;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
@@ -1031,13 +1032,13 @@ input[type="checkbox"] {
select, select,
input[type="file"] { input[type="file"] {
height: 28px; height: 30px;
/* 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: 28px; line-height: 30px;
} }
select { select {

4
less/forms.less
View File

@@ -151,9 +151,9 @@ input[type="checkbox"] {
// 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: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ height: 30px; /* 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: 28px; line-height: 30px;
} }
// Make select elements obey height by applying a border // Make select elements obey height by applying a border