aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-18 19:53:32 -0700
committerMark Otto <[email protected]>2013-07-18 19:53:32 -0700
commite440ff4b3f872af175873283899cb40f50b8010f (patch)
tree5d85cf9f4a540fc4ca88cb7785816c20c364b8a7 /dist/css/bootstrap.css
parent0a3722112c9dff08785689051e581857cce572de (diff)
downloadbootstrap-e440ff4b3f872af175873283899cb40f50b8010f.tar.xz
bootstrap-e440ff4b3f872af175873283899cb40f50b8010f.zip
`<input>` and `<select>` sizing update
Restores `font-size` and more to the `<select>` element while also changing from `min-height` to `height` for input sizing. Fixes #8520 as opened by @ShaunR (would've merged that PR but I moved everything around right before).
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css9
1 files changed, 5 insertions, 4 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 195249c93..db7191b2c 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1342,7 +1342,7 @@ input[type="search"],
input[type="tel"],
input[type="color"] {
display: block;
- min-height: 38px;
+ height: 38px;
padding: 8px 12px;
font-size: 14px;
line-height: 1.428571429;
@@ -1466,7 +1466,6 @@ input[type="checkbox"] {
line-height: normal;
}
-select,
input[type="file"] {
height: 38px;
/* In IE7, the height of the select element cannot be changed by height, only font-size. TODO: Check if this is still needed when dropping IE7 support */
@@ -1573,6 +1572,7 @@ textarea::-webkit-input-placeholder {
margin-left: 10px;
}
+select.input-large,
textarea.input-large,
input[type="text"].input-large,
input[type="password"].input-large,
@@ -1588,12 +1588,13 @@ input[type="url"].input-large,
input[type="search"].input-large,
input[type="tel"].input-large,
input[type="color"].input-large {
- min-height: 56px;
+ height: 56px;
padding: 14px 16px;
font-size: 18px;
border-radius: 6px;
}
+select.input-small,
textarea.input-small,
input[type="text"].input-small,
input[type="password"].input-small,
@@ -1609,7 +1610,7 @@ input[type="url"].input-small,
input[type="search"].input-small,
input[type="tel"].input-small,
input[type="color"].input-small {
- min-height: 30px;
+ height: 30px;
padding: 5px 10px;
font-size: 12px;
border-radius: 3px;