From c86a32154287aafb3ffa80cba09a63b786848a12 Mon Sep 17 00:00:00 2001
From: Adam Jones <jones_adam@rocketmail.com>
Date: Mon, 31 Aug 2020 14:05:01 +0100
Subject: [PATCH 1/3] Fix form validation tooltip alignment

---
 scss/mixins/_forms.scss | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 39b52f3cae23..20278c60c2e2 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -53,7 +53,6 @@
   .#{$state}-tooltip {
     position: absolute;
     top: 100%;
-    left: 0;
     z-index: 5;
     display: none;
     max-width: 100%; // Contain to parent when possible
@@ -64,6 +63,19 @@
     color: color-yiq($color);
     background-color: rgba($color, $form-feedback-tooltip-opacity);
     @include border-radius($form-feedback-tooltip-border-radius);
+
+    // CSS hacks for IE's absolute positioning
+    // stylelint-disable-next-line
+    _:-ms-input-placeholder,
+    :root .form-row > .col > &,
+    :root .form-row > [class*="col-"] > & {
+      left: $form-grid-gutter-width / 2;
+    }
+    // stylelint-disable-next-line
+    _:-ms-input-placeholder,
+    :root & {
+      left: 0;
+    }
   }
 
   @include form-validation-state-selector($state) {

From 9e727e213a0972beaec6a28380f023f806d6906c Mon Sep 17 00:00:00 2001
From: Adam Jones <jones_adam@rocketmail.com>
Date: Sun, 4 Oct 2020 13:31:25 +0100
Subject: [PATCH 2/3] Remove CSS hacks

---
 scss/mixins/_forms.scss | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 20278c60c2e2..70ef15988f1d 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -53,6 +53,7 @@
   .#{$state}-tooltip {
     position: absolute;
     top: 100%;
+    left: 0;
     z-index: 5;
     display: none;
     max-width: 100%; // Contain to parent when possible
@@ -64,18 +65,11 @@
     background-color: rgba($color, $form-feedback-tooltip-opacity);
     @include border-radius($form-feedback-tooltip-border-radius);
 
-    // CSS hacks for IE's absolute positioning
-    // stylelint-disable-next-line
-    _:-ms-input-placeholder,
-    :root .form-row > .col > &,
-    :root .form-row > [class*="col-"] > & {
+    // Align tooltip to form elements
+    .form-row > .col > &,
+    .form-row > [class*="col-"] > & {
       left: $form-grid-gutter-width / 2;
     }
-    // stylelint-disable-next-line
-    _:-ms-input-placeholder,
-    :root & {
-      left: 0;
-    }
   }
 
   @include form-validation-state-selector($state) {

From c5b371209dbeffb4f94510bff18e728f4beb2418 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Thu, 29 Oct 2020 10:16:15 +0200
Subject: [PATCH 3/3] Update _forms.scss

---
 scss/mixins/_forms.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 70ef15988f1d..6b65ad3f6f82 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -65,6 +65,7 @@
     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-"] > & {