diff options
-rw-r--r-- | scss/forms/_form-control.scss | 10 | ||||
-rw-r--r-- | scss/forms/_input-group.scss | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss index 83579e7273..817d8890c7 100644 --- a/scss/forms/_form-control.scss +++ b/scss/forms/_form-control.scss @@ -7,7 +7,7 @@ .form-control { display: block; width: 100%; - height: $input-height; + min-height: $input-height; padding: $input-padding-y $input-padding-x; font-family: $input-font-family; @include font-size($input-font-size); @@ -96,7 +96,7 @@ // Repeated in `_input_group.scss` to avoid Sass extend issues. .form-control-sm { - height: $input-height-sm; + min-height: $input-height-sm; padding: $input-padding-y-sm $input-padding-x-sm; @include font-size($input-font-size-sm); line-height: $input-line-height-sm; @@ -104,13 +104,9 @@ } .form-control-lg { - height: $input-height-lg; + min-height: $input-height-lg; padding: $input-padding-y-lg $input-padding-x-lg; @include font-size($input-font-size-lg); line-height: $input-line-height-lg; @include border-radius($input-border-radius-lg); } - -textarea.form-control { - height: auto; -} diff --git a/scss/forms/_input-group.scss b/scss/forms/_input-group.scss index f32853a583..d2e7d91aaa 100644 --- a/scss/forms/_input-group.scss +++ b/scss/forms/_input-group.scss @@ -125,7 +125,7 @@ .input-group-lg > .form-control:not(textarea), .input-group-lg > .form-select { - height: $input-height-lg; + min-height: $input-height-lg; } .input-group-lg > .form-control, @@ -142,7 +142,7 @@ .input-group-sm > .form-control:not(textarea), .input-group-sm > .form-select { - height: $input-height-sm; + min-height: $input-height-sm; } .input-group-sm > .form-control, |