From b67493d5f112465a636f7fc5fcd31828d8785243 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 23 Sep 2020 16:16:19 -0700
Subject: [PATCH] Bring over changes from #30966 and add to them to tighten
 things up

---
 scss/forms/_floating-labels.scss | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scss/forms/_floating-labels.scss b/scss/forms/_floating-labels.scss
index 39466403009b..ef74efbf4ebe 100644
--- a/scss/forms/_floating-labels.scss
+++ b/scss/forms/_floating-labels.scss
@@ -53,8 +53,16 @@
 //
 
 @supports (-ms-ime-align: auto) {
+  .form-floating {
+    display: flex;
+    flex-direction: column-reverse;
+  }
   .form-floating > label {
-    display: none;
+    position: static;
+    padding: 0;
+    margin-bottom: calc(#{$form-floating-padding-y} / 2);
+    border: 0;
+    @include transition(none);
   }
   .form-floating > .form-control::-ms-input-placeholder {
     color: $input-placeholder-color;