X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=scss%2Fbootstrap%2Fmixins%2F_forms.scss;fp=scss%2Fbootstrap%2Fmixins%2F_forms.scss;h=a32163049c9439a3285771342037a64418944545;hp=39b52f3cae23b6ea00da6da67fcf4b4e2bf97e8c;hb=b1da0768aed0ffc12b300174eff724a412fad487;hpb=2b33573f81a301e8ee55ba2bbb872b7edd18f4f6

diff --git a/scss/bootstrap/mixins/_forms.scss b/scss/bootstrap/mixins/_forms.scss
index 39b52f3cae..a32163049c 100644
--- a/scss/bootstrap/mixins/_forms.scss
+++ b/scss/bootstrap/mixins/_forms.scss
@@ -64,6 +64,13 @@
     color: color-yiq($color);
     background-color: rgba($color, $form-feedback-tooltip-opacity);
     @include border-radius($form-feedback-tooltip-border-radius);
+
+    // See https://github.com/twbs/bootstrap/pull/31557
+    // Align tooltip to form elements
+    .form-row > .col > &,
+    .form-row > [class*="col-"] > & {
+      left: $form-grid-gutter-width / 2;
+    }
   }
 
   @include form-validation-state-selector($state) {
@@ -108,7 +115,7 @@
 
       @if $enable-validation-icons {
         padding-right: $custom-select-feedback-icon-padding-right;
-        background: $custom-select-background, escape-svg($icon) $custom-select-bg no-repeat $custom-select-feedback-icon-position / $custom-select-feedback-icon-size;
+        background: $custom-select-background, $custom-select-bg escape-svg($icon) $custom-select-feedback-icon-position / $custom-select-feedback-icon-size no-repeat;
       }
 
       &:focus {