Merge pull request #16333 from pine3ree/patch-2

form-group size + form-control-feedback

Merge pull request #16333 from pine3ree/patch-2
form-group size + form-control-feedback
1e64e720 · Mark Otto · 2b1c06f5 · d42fbb98 · 1e64e720
Commit 1e64e720 authored 9 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 2 deletions
+4 -2
--- 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;