diff options
| author | Martijn Cuppens <[email protected]> | 2020-10-30 21:36:44 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-10-30 22:36:44 +0200 |
| commit | a108e2bbf821219a85d747fa2677cc9dde6432f1 (patch) | |
| tree | 3c1558e0507835ba10b8ede1ee3f33ec4644a476 /scss/forms | |
| parent | 6fc35e3231225559a6a4689bfa9727dcfb7fafde (diff) | |
| download | bootstrap-a108e2bbf821219a85d747fa2677cc9dde6432f1.tar.xz bootstrap-a108e2bbf821219a85d747fa2677cc9dde6432f1.zip | |
Fix color heights (#32023)
Diffstat (limited to 'scss/forms')
| -rw-r--r-- | scss/forms/_form-control.scss | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss index 7fe9f7200..1fd1e1a8b 100644 --- a/scss/forms/_form-control.scss +++ b/scss/forms/_form-control.scss @@ -207,17 +207,20 @@ textarea { .form-control-color { max-width: 3rem; + height: auto; // Override fixed browser height padding: $input-padding-y; &:not(:disabled):not([readonly]) { cursor: pointer; } -} -.form-control-color::-moz-color-swatch { - @include border-radius($input-border-radius); -} + &::-moz-color-swatch { + height: if(unit($input-line-height) == "", $input-line-height * 1em, $input-line-height); + @include border-radius($input-border-radius); + } -.form-control-color::-webkit-color-swatch { - @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); + } } |