Fix x-paddings for select (with floating label, and in Firefox) (#34008)

diff --git a/scss/forms/_floating-labels.scss b/scss/forms/_floating-labels.scss
index 8b2e2b8eb6f05d61a6194474b4ddf2489487471f..09d9294dc57b87326276b32e53ef3c89c21410eb 100644 (file)
--- a/scss/forms/_floating-labels.scss
+++ b/scss/forms/_floating-labels.scss
@@ -4,7 +4,6 @@
   > .form-control,
   > .form-select {
     height: $form-floating-height;
-    padding: $form-floating-padding-y $form-floating-padding-x;
   }
 
   > label {
@@ -21,6 +20,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-select.scss b/scss/forms/_form-select.scss
index 15d5061ad6d2abc613fe9e78497dcc6b04a05aa2..70256255a7db3d21d169872ac6bb5be82d9f56d1 100644 (file)
--- 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;