Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix floating label text cut off in select elements #39483

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1069,11 +1069,13 @@ $form-file-button-hover-bg: var(--#{$prefix}secondary-bg) !default;

// scss-docs-start form-floating-variables
$form-floating-height: add(3.5rem, $input-height-border) !default;
$form-floating-line-height: 1.25 !default;
$form-floating-line-height: 1.3125 !default;
$form-floating-padding-x: $input-padding-x !default;
$form-floating-padding-y: 1rem !default;
$form-floating-input-padding-t: 1.625rem !default;
$form-floating-input-padding-b: .625rem !default;
$form-floating-input-padding-t: 1.25rem !default;
$form-floating-input-padding-b: .25rem !default;
$form-floating-textarea-padding-t: 1.625rem !default;
$form-floating-textarea-padding-b: .625rem !default;
$form-floating-label-height: 1.5em !default;
$form-floating-label-opacity: .65 !default;
$form-floating-label-transform: scale(.85) translateY(-.5rem) translateX(.15rem) !default;
Expand Down
48 changes: 28 additions & 20 deletions scss/forms/_floating-labels.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.form-floating {
--#{$prefix}form-floating-input-padding-t: #{$form-floating-input-padding-t};
--#{$prefix}form-floating-input-padding-b: #{$form-floating-input-padding-b};
position: relative;

> .form-control,
Expand All @@ -14,6 +16,7 @@
top: 0;
left: 0;
z-index: 2;
max-width: 100%;
height: 100%; // allow textareas
padding: $form-floating-padding-y $form-floating-padding-x;
overflow: hidden;
Expand All @@ -36,19 +39,19 @@

&:focus,
&:not(:placeholder-shown) {
padding-top: $form-floating-input-padding-t;
padding-bottom: $form-floating-input-padding-b;
padding-top: var(--#{$prefix}form-floating-input-padding-t);
padding-bottom: var(--#{$prefix}form-floating-input-padding-b);
}
// Duplicated because `:-webkit-autofill` invalidates other selectors when grouped
&:-webkit-autofill {
padding-top: $form-floating-input-padding-t;
padding-bottom: $form-floating-input-padding-b;
padding-top: var(--#{$prefix}form-floating-input-padding-t);
padding-bottom: var(--#{$prefix}form-floating-input-padding-b);
}
}

> .form-select {
padding-top: $form-floating-input-padding-t;
padding-bottom: $form-floating-input-padding-b;
padding-top: var(--#{$prefix}form-floating-input-padding-t);
padding-bottom: var(--#{$prefix}form-floating-input-padding-b);
}

> .form-control:focus,
Expand All @@ -58,16 +61,6 @@
~ label {
color: rgba(var(--#{$prefix}body-color-rgb), #{$form-floating-label-opacity});
transform: $form-floating-label-transform;

&::after {
position: absolute;
inset: $form-floating-padding-y ($form-floating-padding-x * .5);
z-index: -1;
height: $form-floating-label-height;
content: "";
background-color: $input-bg;
@include border-radius($input-border-radius);
}
}
}
// Duplicated because `:-webkit-autofill` invalidates other selectors when grouped
Expand All @@ -77,6 +70,25 @@
transform: $form-floating-label-transform;
}
}
> textarea:focus,
> textarea:not(:placeholder-shown) {
// textareas require additional top padding to prevent label from overlapping text,
// and additional bottom padding for when text is scrolled.
--#{$prefix}form-floating-input-padding-t: #{$form-floating-textarea-padding-t};
--#{$prefix}form-floating-input-padding-b: #{$form-floating-textarea-padding-b};
~ label::after {
position: absolute;
inset: $form-floating-padding-y ($form-floating-padding-x * .5);
z-index: -1;
height: $form-floating-label-height;
content: "";
background-color: $input-bg;
@include border-radius($input-border-radius);
}
}
> textarea:disabled ~ label::after {
background-color: $input-disabled-bg;
}

> .form-control-plaintext {
~ label {
Expand All @@ -87,9 +99,5 @@
> :disabled ~ label,
> .form-control:disabled ~ label { // Required for `.form-control`s because of specificity
color: $form-floating-label-disabled-color;

&::after {
background-color: $input-disabled-bg;
}
}
}