diff options
Diffstat (limited to 'scss/forms/_form-control.scss')
| -rw-r--r-- | scss/forms/_form-control.scss | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss index c781ae7b9e..e7eeca769e 100644 --- a/scss/forms/_form-control.scss +++ b/scss/forms/_form-control.scss @@ -170,7 +170,7 @@ textarea { .form-control-color { width: $form-color-width; - height: auto; // Override fixed browser height + height: $input-height; padding: $input-padding-y; &:not(:disabled):not([readonly]) { @@ -178,12 +178,14 @@ textarea { } &::-moz-color-swatch { - height: if(unit($input-line-height) == "", $input-line-height * 1em, $input-line-height); + border: 0 !important; // stylelint-disable-line declaration-no-important @include border-radius($input-border-radius); } &::-webkit-color-swatch { - height: if(unit($input-line-height) == "", $input-line-height * 1em, $input-line-height); @include border-radius($input-border-radius); } + + &.form-control-sm { height: $input-height-sm; } + &.form-control-lg { height: $input-height-lg; } } |