aboutsummaryrefslogtreecommitdiff
path: root/less/forms.less
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 /less/forms.less
parentfb37ec16f87b2d3a5d194eb3f61d25f564a71110 (diff)
downloadbootstrap-96b545c6b5ebf5f74b75a735359187bd9b80689d.tar.xz
bootstrap-96b545c6b5ebf5f74b75a735359187bd9b80689d.zip
Fixes #13989: Don't extend the input sizes; manually chain the selectors
Diffstat (limited to 'less/forms.less')
-rw-r--r--less/forms.less12
1 files changed, 4 insertions, 8 deletions
diff --git a/less/forms.less b/less/forms.less
index ca9194cf2..dd113013f 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -306,11 +306,13 @@ input[type="checkbox"] {
// Build on `.form-control` with modifier classes to decrease or increase the
// height and font-size of form controls.
-.input-sm {
+.input-sm,
+.form-group-sm .form-control {
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
}
-.input-lg {
+.input-lg,
+.form-group-l .form-control {
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
}
@@ -523,9 +525,6 @@ input[type="checkbox"] {
padding-top: ((@padding-large-vertical * @line-height-large) + 1);
}
}
- .form-control {
- &:extend(.input-lg);
- }
}
.form-group-sm {
@media (min-width: @screen-sm-min) {
@@ -533,8 +532,5 @@ input[type="checkbox"] {
padding-top: (@padding-small-vertical + 1);
}
}
- .form-control {
- &:extend(.input-sm);
- }
}
}