From c51e9fa4ee8fe8020decec064803e686eb9e1dde Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Sat, 21 Mar 2020 15:44:08 +0100
Subject: [PATCH] Fix wrapping bug (#30345)

---
 scss/_reboot.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index b5fc6f1013..4a1a16437c 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -500,8 +500,11 @@ fieldset {
   border: 0; // 2
 }
 
-// 1. By using `float: left`, the legend will behave like a block element
+// 1. By using `float: left`, the legend will behave like a block element.
+//    This way the border of a fieldset wraps around the legend if present.
 // 2. Correct the text wrapping in Edge.
+// 3. Fix wrapping bug.
+//    See https://github.com/twbs/bootstrap/issues/29712
 
 legend {
   float: left; // 1
@@ -512,6 +515,10 @@ legend {
   font-weight: $legend-font-weight;
   line-height: inherit;
   white-space: normal; // 2
+
+  + * {
+    clear: left; // 3
+  }
 }
 
 // Fix height of inputs with a type of datetime-local, date, month, week, or time