aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-04-25 21:45:31 -0700
committerMark Otto <[email protected]>2015-04-25 21:45:31 -0700
commit1e64e720a46edbb260aa060215c6cc2caa51338f (patch)
tree97c2066094b8434c49693c386cf28544d274d090
parent2b1c06f5b190f8999f55360a0f6c79f4e0521e03 (diff)
parentd42fbb9830d6659b34dd2f30e1f2d7ec7cb54132 (diff)
downloadbootstrap-1e64e720a46edbb260aa060215c6cc2caa51338f.tar.xz
bootstrap-1e64e720a46edbb260aa060215c6cc2caa51338f.zip
Merge pull request #16333 from pine3ree/patch-2
form-group size + form-control-feedback
-rw-r--r--less/forms.less6
1 files changed, 4 insertions, 2 deletions
diff --git a/less/forms.less b/less/forms.less
index d1efabdab..d1dac9711 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -401,13 +401,15 @@ input[type="checkbox"] {
pointer-events: none;
}
.input-lg + .form-control-feedback,
-.input-group-lg + .form-control-feedback {
+.input-group-lg + .form-control-feedback,
+.form-group-lg .form-control + .form-control-feedback {
width: @input-height-large;
height: @input-height-large;
line-height: @input-height-large;
}
.input-sm + .form-control-feedback,
-.input-group-sm + .form-control-feedback {
+.input-group-sm + .form-control-feedback,
+.form-group-sm .form-control + .form-control-feedback {
width: @input-height-small;
height: @input-height-small;
line-height: @input-height-small;