Merge branch 'main' into global-focus-varsglobal-focus-vars

5 files changed, 9 insertions, 8 deletions

diff --git a/scss/forms/_floating-labels.scss b/scss/forms/_floating-labels.scss
index 8b2e2b8eb..2f4295480 100644
--- a/scss/forms/_floating-labels.scss
+++ b/scss/forms/_floating-labels.scss
@@ -4,7 +4,7 @@
   > .form-control,
   > .form-select {
     height: $form-floating-height;
-    padding: $form-floating-padding-y $form-floating-padding-x;
+    line-height: $form-floating-line-height;
   }
 
   > label {
@@ -21,6 +21,8 @@
 
   // stylelint-disable no-duplicate-selectors
   > .form-control {
+    padding: $form-floating-padding-y $form-floating-padding-x;
+
     &::placeholder {
       color: transparent;
     }
diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss
index b34250a71..6321b4100 100644
--- a/scss/forms/_form-check.scss
+++ b/scss/forms/_form-check.scss
@@ -17,7 +17,7 @@
 .form-check-input {
   width: $form-check-input-width;
   height: $form-check-input-width;
-  margin-top: ($line-height-base - $form-check-input-width) / 2; // line-height minus check height
+  margin-top: ($line-height-base - $form-check-input-width) * .5; // line-height minus check height
   vertical-align: top;
   background-color: $form-check-input-bg;
   background-repeat: no-repeat;
diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss
index bac416f8c..96423c530 100644
--- a/scss/forms/_form-control.scss
+++ b/scss/forms/_form-control.scss
@@ -73,7 +73,6 @@
   }
 
   // File input buttons theming
-  // stylelint-disable-next-line selector-pseudo-element-no-unknown
   &::file-selector-button {
     padding: $input-padding-y $input-padding-x;
     margin: (-$input-padding-y) (-$input-padding-x);
@@ -89,7 +88,6 @@
     @include transition($btn-transition);
   }
 
-  // stylelint-disable-next-line selector-pseudo-element-no-unknown
   &:hover:not(:disabled):not([readonly])::file-selector-button {
     background-color: $form-file-button-hover-bg;
   }
@@ -150,7 +148,6 @@
   @include font-size($input-font-size-sm);
   @include border-radius($input-border-radius-sm);
 
-  // stylelint-disable-next-line selector-pseudo-element-no-unknown
   &::file-selector-button {
     padding: $input-padding-y-sm $input-padding-x-sm;
     margin: (-$input-padding-y-sm) (-$input-padding-x-sm);
@@ -170,7 +167,6 @@
   @include font-size($input-font-size-lg);
   @include border-radius($input-border-radius-lg);
 
-  // stylelint-disable-next-line selector-pseudo-element-no-unknown
   &::file-selector-button {
     padding: $input-padding-y-lg $input-padding-x-lg;
     margin: (-$input-padding-y-lg) (-$input-padding-x-lg);
@@ -203,7 +199,7 @@ textarea {
 // stylelint-enable selector-no-qualifying-type
 
 .form-control-color {
-  max-width: 3rem;
+  width: $form-color-width;
   height: auto; // Override fixed browser height
   padding: $input-padding-y;
 
diff --git a/scss/forms/_form-range.scss b/scss/forms/_form-range.scss
index ae1d841d5..6de42132e 100644
--- a/scss/forms/_form-range.scss
+++ b/scss/forms/_form-range.scss
@@ -27,7 +27,7 @@
   &::-webkit-slider-thumb {
     width: $form-range-thumb-width;
     height: $form-range-thumb-height;
-    margin-top: ($form-range-track-height - $form-range-thumb-height) / 2; // Webkit specific
+    margin-top: ($form-range-track-height - $form-range-thumb-height) * .5; // Webkit specific
     @include gradient-bg($form-range-thumb-bg);
     border: $form-range-thumb-border;
     @include border-radius($form-range-thumb-border-radius);
diff --git a/scss/forms/_form-select.scss b/scss/forms/_form-select.scss
index 15d5061ad..4506a979a 100644
--- a/scss/forms/_form-select.scss
+++ b/scss/forms/_form-select.scss
@@ -7,6 +7,8 @@
   display: block;
   width: 100%;
   padding: $form-select-padding-y $form-select-indicator-padding $form-select-padding-y $form-select-padding-x;
+  // stylelint-disable-next-line property-no-vendor-prefix
+  -moz-padding-start: subtract($form-select-padding-x, 3px); // See https://github.com/twbs/bootstrap/issues/32636
   font-family: $form-select-font-family;
   @include font-size($form-select-font-size);
   font-weight: $form-select-font-weight;
@@ -20,6 +22,7 @@
   border: $form-select-border-width solid $form-select-border-color;
   @include border-radius($form-select-border-radius, 0);
   @include box-shadow($form-select-box-shadow);
+  @include transition($form-select-transition);
   appearance: none;
 
   &:focus {