diff options
author | Mark Otto <markd.otto@gmail.com> | 2022-07-18 06:50:41 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-18 06:50:41 +0300 |
commit | 71cbb88f098f186518a20c22294a0cbda944ec6b (patch) | |
tree | 97fb2d09025a218881d6a38a7b7a000beb4a5cc8 /scss | |
parent | 6d101b15a4af000b32be236063e9e5b58385d077 (diff) |
Support input groups in floating forms (#36759)
* Support input groups in floating forms
* Update bundlewatch
Co-authored-by: 719media <ben@719media.com>
Diffstat (limited to 'scss')
-rw-r--r-- | scss/forms/_input-group.scss | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/scss/forms/_input-group.scss b/scss/forms/_input-group.scss index 140052936c..83d52c51e0 100644 --- a/scss/forms/_input-group.scss +++ b/scss/forms/_input-group.scss @@ -10,7 +10,8 @@ width: 100%; > .form-control, - > .form-select { + > .form-select, + > .form-floating { position: relative; // For focus state's z-index flex: 1 1 auto; width: 1%; @@ -19,7 +20,8 @@ // Bring the "active" form control to the top of surrounding elements > .form-control:focus, - > .form-select:focus { + > .form-select:focus, + > .form-floating:focus-within { z-index: 3; } @@ -96,15 +98,19 @@ // stylelint-disable-next-line no-duplicate-selectors .input-group { &:not(.has-validation) { - > :not(:last-child):not(.dropdown-toggle):not(.dropdown-menu), - > .dropdown-toggle:nth-last-child(n + 3) { + > :not(:last-child):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating), + > .dropdown-toggle:nth-last-child(n + 3), + > .form-floating:not(:last-child) > .form-control, + > .form-floating:not(:last-child) > .form-select { @include border-end-radius(0); } } &.has-validation { - > :nth-last-child(n + 3):not(.dropdown-toggle):not(.dropdown-menu), - > .dropdown-toggle:nth-last-child(n + 4) { + > :nth-last-child(n + 3):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating), + > .dropdown-toggle:nth-last-child(n + 4), + > .form-floating:nth-last-child(n + 3) > .form-control, + > .form-floating:nth-last-child(n + 3) > .form-select { @include border-end-radius(0); } } @@ -114,7 +120,9 @@ $validation-messages: $validation-messages + ":not(." + unquote($state) + "-tooltip)" + ":not(." + unquote($state) + "-feedback)"; } - > :not(:first-child):not(.dropdown-menu)#{$validation-messages} { + > :not(:first-child):not(.dropdown-menu):not(.form-floating)#{$validation-messages}, + > .form-floating:not(:first-child) > .form-control, + > .form-floating:not(:first-child) > .form-select { margin-left: -$input-border-width; @include border-start-radius(0); } |