From c07fdbc3648965b0971d8634a3b24affd10ad285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <gael.poupard@orange.com>
Date: Thu, 4 Jun 2020 11:04:31 +0200
Subject: [PATCH 1/2] docs(example): drop IE workaround since it works fine in
 IE

---
 .../floating-labels/floating-labels.css       | 23 ++++++++++---------
 .../4.5/examples/floating-labels/index.html   |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/site/docs/4.5/examples/floating-labels/floating-labels.css b/site/docs/4.5/examples/floating-labels/floating-labels.css
index d8ad2f3c15db..1abf4c44cc55 100644
--- a/site/docs/4.5/examples/floating-labels/floating-labels.css
+++ b/site/docs/4.5/examples/floating-labels/floating-labels.css
@@ -67,11 +67,23 @@ body {
   color: transparent;
 }
 
+.form-label-group input:not(:-ms-input-placeholder) {
+  padding-top: 1.25rem;
+  padding-bottom: .25rem;
+}
+
 .form-label-group input:not(:placeholder-shown) {
   padding-top: 1.25rem;
   padding-bottom: .25rem;
 }
 
+.form-label-group input:not(:-ms-input-placeholder) ~ label {
+  padding-top: .25rem;
+  padding-bottom: .25rem;
+  font-size: 12px;
+  color: #777;
+}
+
 .form-label-group input:not(:placeholder-shown) ~ label {
   padding-top: .25rem;
   padding-bottom: .25rem;
@@ -89,14 +101,3 @@ body {
     color: #777;
   }
 }
-
-/* Fallback for IE
--------------------------------------------------- */
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-  .form-label-group > label {
-    display: none;
-  }
-  .form-label-group input:-ms-input-placeholder {
-    color: #777;
-  }
-}
diff --git a/site/docs/4.5/examples/floating-labels/index.html b/site/docs/4.5/examples/floating-labels/index.html
index d837ccaf1c89..f4b525d5010e 100644
--- a/site/docs/4.5/examples/floating-labels/index.html
+++ b/site/docs/4.5/examples/floating-labels/index.html
@@ -9,7 +9,7 @@
   <div class="text-center mb-4">
     <img class="mb-4" src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/brand/bootstrap-solid.svg" alt="" width="72" height="72">
     <h1 class="h3 mb-3 font-weight-normal">Floating labels</h1>
-    <p>Build form controls with floating labels via the <code>:placeholder-shown</code> pseudo-element. <a href="https://caniuse.com/#feat=css-placeholder-shown">Works in latest Chrome, Safari, and Firefox.</a></p>
+    <p>Build form controls with floating labels via the <code>:placeholder-shown</code> pseudo-element. <a href="https://caniuse.com/#feat=css-placeholder-shown">Works in latest Chrome, Safari, Firefox and IE 10/11 (prefixed).</a></p>
   </div>
 
   <div class="form-label-group">

From b9e49efd226cd20de2f30bd9f353a9ddda81612d Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Fri, 12 Jun 2020 19:33:20 -0700
Subject: [PATCH 2/2] Serial comma

---
 site/docs/4.5/examples/floating-labels/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/docs/4.5/examples/floating-labels/index.html b/site/docs/4.5/examples/floating-labels/index.html
index f4b525d5010e..42cbdeb274d3 100644
--- a/site/docs/4.5/examples/floating-labels/index.html
+++ b/site/docs/4.5/examples/floating-labels/index.html
@@ -9,7 +9,7 @@
   <div class="text-center mb-4">
     <img class="mb-4" src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/brand/bootstrap-solid.svg" alt="" width="72" height="72">
     <h1 class="h3 mb-3 font-weight-normal">Floating labels</h1>
-    <p>Build form controls with floating labels via the <code>:placeholder-shown</code> pseudo-element. <a href="https://caniuse.com/#feat=css-placeholder-shown">Works in latest Chrome, Safari, Firefox and IE 10/11 (prefixed).</a></p>
+    <p>Build form controls with floating labels via the <code>:placeholder-shown</code> pseudo-element. <a href="https://caniuse.com/#feat=css-placeholder-shown">Works in latest Chrome, Safari, Firefox, and IE 10/11 (prefixed).</a></p>
   </div>
 
   <div class="form-label-group">