aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-07-02 23:14:23 -0700
committerMark Otto <[email protected]>2014-07-02 23:14:23 -0700
commit96b545c6b5ebf5f74b75a735359187bd9b80689d (patch)
tree70e251be88b13eea63b0648adc36ee52687d42c7 /dist/css/bootstrap.css
parentfb37ec16f87b2d3a5d194eb3f61d25f564a71110 (diff)
downloadbootstrap-96b545c6b5ebf5f74b75a735359187bd9b80689d.tar.xz
bootstrap-96b545c6b5ebf5f74b75a735359187bd9b80689d.zip
Fixes #13989: Don't extend the input sizes; manually chain the selectors
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css18
1 files changed, 12 insertions, 6 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index d7d4ccc43..3d5967461 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2491,35 +2491,41 @@ fieldset[disabled] .checkbox label {
padding-left: 0;
}
.input-sm,
-.form-horizontal .form-group-sm .form-control {
+.form-group-sm .form-control {
height: 30px;
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px;
}
-select.input-sm {
+select.input-sm,
+select.form-group-sm .form-control {
height: 30px;
line-height: 30px;
}
textarea.input-sm,
-select[multiple].input-sm {
+textarea.form-group-sm .form-control,
+select[multiple].input-sm,
+select[multiple].form-group-sm .form-control {
height: auto;
}
.input-lg,
-.form-horizontal .form-group-lg .form-control {
+.form-group-l .form-control {
height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
border-radius: 6px;
}
-select.input-lg {
+select.input-lg,
+select.form-group-l .form-control {
height: 46px;
line-height: 46px;
}
textarea.input-lg,
-select[multiple].input-lg {
+textarea.form-group-l .form-control,
+select[multiple].input-lg,
+select[multiple].form-group-l .form-control {
height: auto;
}
.has-feedback {