diff options
| author | Mark Otto <[email protected]> | 2012-08-14 14:57:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-08-14 14:57:49 -0700 |
| commit | 5144c77b272e12a48913faa0b7d1e54eccd2e638 (patch) | |
| tree | d05c7cf08bb93bc470e09c38376c9eea80a731cd | |
| parent | 50df524ba1b504e069e69e6f317184357f397cd0 (diff) | |
| download | bootstrap-5144c77b272e12a48913faa0b7d1e54eccd2e638.tar.xz bootstrap-5144c77b272e12a48913faa0b7d1e54eccd2e638.zip | |
fixes #4358: make select elements 30px tall to match inputs
| -rw-r--r-- | docs/assets/css/bootstrap.css | 5 | ||||
| -rw-r--r-- | less/forms.less | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fb69a19ba..f22d2824d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -943,6 +943,7 @@ input[type="color"], font-size: 14px; line-height: 20px; color: #555555; + vertical-align: middle; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1031,13 +1032,13 @@ input[type="checkbox"] { select, input[type="file"] { - height: 28px; + 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 */ - line-height: 28px; + line-height: 30px; } select { diff --git a/less/forms.less b/less/forms.less index 0b3f10cb0..852f0bb6b 100644 --- a/less/forms.less +++ b/less/forms.less @@ -151,9 +151,9 @@ input[type="checkbox"] { // Set the height of select and file controls to match text inputs select, 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 */ - line-height: 28px; + line-height: 30px; } // Make select elements obey height by applying a border |