aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/twbs/bootstrap/scss/forms
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/twbs/bootstrap/scss/forms')
-rw-r--r--vendor/twbs/bootstrap/scss/forms/_floating-labels.scss1
-rw-r--r--vendor/twbs/bootstrap/scss/forms/_input-group.scss11
2 files changed, 8 insertions, 4 deletions
diff --git a/vendor/twbs/bootstrap/scss/forms/_floating-labels.scss b/vendor/twbs/bootstrap/scss/forms/_floating-labels.scss
index acefe4ebc..6e5c9a75f 100644
--- a/vendor/twbs/bootstrap/scss/forms/_floating-labels.scss
+++ b/vendor/twbs/bootstrap/scss/forms/_floating-labels.scss
@@ -16,6 +16,7 @@
height: 100%; // allow textareas
padding: $form-floating-padding-y $form-floating-padding-x;
overflow: hidden;
+ text-align: start;
text-overflow: ellipsis;
white-space: nowrap;
pointer-events: none;
diff --git a/vendor/twbs/bootstrap/scss/forms/_input-group.scss b/vendor/twbs/bootstrap/scss/forms/_input-group.scss
index 83d52c51e..247f74a7a 100644
--- a/vendor/twbs/bootstrap/scss/forms/_input-group.scss
+++ b/vendor/twbs/bootstrap/scss/forms/_input-group.scss
@@ -22,7 +22,7 @@
> .form-control:focus,
> .form-select:focus,
> .form-floating:focus-within {
- z-index: 3;
+ z-index: 5;
}
// Ensure buttons are always above inputs for more visually pleasing borders.
@@ -33,7 +33,7 @@
z-index: 2;
&:focus {
- z-index: 3;
+ z-index: 5;
}
}
}
@@ -120,10 +120,13 @@
$validation-messages: $validation-messages + ":not(." + unquote($state) + "-tooltip)" + ":not(." + unquote($state) + "-feedback)";
}
- > :not(:first-child):not(.dropdown-menu):not(.form-floating)#{$validation-messages},
+ > :not(:first-child):not(.dropdown-menu)#{$validation-messages} {
+ margin-left: -$input-border-width;
+ @include border-start-radius(0);
+ }
+
> .form-floating:not(:first-child) > .form-control,
> .form-floating:not(:first-child) > .form-select {
- margin-left: -$input-border-width;
@include border-start-radius(0);
}
}