|
10 | 10 | width: 100%;
|
11 | 11 |
|
12 | 12 | > .form-control,
|
13 |
| - > .form-select { |
| 13 | + > .form-select, |
| 14 | + > .form-floating { |
14 | 15 | position: relative; // For focus state's z-index
|
15 | 16 | flex: 1 1 auto;
|
16 | 17 | width: 1%;
|
|
19 | 20 |
|
20 | 21 | // Bring the "active" form control to the top of surrounding elements
|
21 | 22 | > .form-control:focus,
|
22 |
| - > .form-select:focus { |
| 23 | + > .form-select:focus, |
| 24 | + > .form-floating:focus-within { |
23 | 25 | z-index: 3;
|
24 | 26 | }
|
25 | 27 |
|
|
96 | 98 | // stylelint-disable-next-line no-duplicate-selectors
|
97 | 99 | .input-group {
|
98 | 100 | &:not(.has-validation) {
|
99 |
| - > :not(:last-child):not(.dropdown-toggle):not(.dropdown-menu), |
100 |
| - > .dropdown-toggle:nth-last-child(n + 3) { |
| 101 | + > :not(:last-child):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating), |
| 102 | + > .dropdown-toggle:nth-last-child(n + 3), |
| 103 | + > .form-floating:not(:last-child) > .form-control, |
| 104 | + > .form-floating:not(:last-child) > .form-select { |
101 | 105 | @include border-end-radius(0);
|
102 | 106 | }
|
103 | 107 | }
|
104 | 108 |
|
105 | 109 | &.has-validation {
|
106 |
| - > :nth-last-child(n + 3):not(.dropdown-toggle):not(.dropdown-menu), |
107 |
| - > .dropdown-toggle:nth-last-child(n + 4) { |
| 110 | + > :nth-last-child(n + 3):not(.dropdown-toggle):not(.dropdown-menu):not(.form-floating), |
| 111 | + > .dropdown-toggle:nth-last-child(n + 4), |
| 112 | + > .form-floating:nth-last-child(n + 3) > .form-control, |
| 113 | + > .form-floating:nth-last-child(n + 3) > .form-select { |
108 | 114 | @include border-end-radius(0);
|
109 | 115 | }
|
110 | 116 | }
|
|
114 | 120 | $validation-messages: $validation-messages + ":not(." + unquote($state) + "-tooltip)" + ":not(." + unquote($state) + "-feedback)";
|
115 | 121 | }
|
116 | 122 |
|
117 |
| - > :not(:first-child):not(.dropdown-menu)#{$validation-messages} { |
| 123 | + > :not(:first-child):not(.dropdown-menu):not(.form-floating)#{$validation-messages}, |
| 124 | + > .form-floating:not(:first-child) > .form-control, |
| 125 | + > .form-floating:not(:first-child) > .form-select { |
118 | 126 | margin-left: -$input-border-width;
|
119 | 127 | @include border-start-radius(0);
|
120 | 128 | }
|
|
0 commit comments