From: wojtask9 <wojtask9.kde@gmail.com>
Date: Mon, 9 Dec 2019 18:22:12 +0000 (+0100)
Subject: Remove `.form-group` leftovers (#29449)
X-Git-Tag: v5.0.0-alpha1~604
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=043b0544803eb8c71fcc615725e294f9dc7654c4;p=thirdparty%2Fbootstrap.git

Remove `.form-group` leftovers (#29449)
---

diff --git a/scss/forms/_layout.scss b/scss/forms/_layout.scss
index 8cdb053c75..eaef926b2d 100644
--- a/scss/forms/_layout.scss
+++ b/scss/forms/_layout.scss
@@ -22,9 +22,6 @@
 // Make forms appear inline(-block) by adding the `.form-inline` class. Inline
 // forms begin stacked on extra small (mobile) devices and then go inline when
 // viewports reach <768px.
-//
-// Requires wrapping inputs and labels with `.form-group` for proper display of
-// default HTML form controls and our custom form controls (e.g., input groups).
 
 .form-inline {
   display: flex;
@@ -47,19 +44,9 @@
       margin-bottom: 0;
     }
 
-    // Inline-block all the things for "inline"
-    .form-group {
-      display: flex;
-      flex: 0 0 auto;
-      flex-flow: row wrap;
-      align-items: center;
-      margin-bottom: 0;
-    }
-
-    // Allow folks to *not* use `.form-group`
     .form-control {
       display: inline-block;
-      width: auto; // Prevent labels from stacking above inputs in `.form-group`
+      width: auto; // Prevent labels from stacking above inputs
       vertical-align: middle;
     }
 
diff --git a/site/assets/scss/_component-examples.scss b/site/assets/scss/_component-examples.scss
index 71822578f8..492d19eccc 100644
--- a/site/assets/scss/_component-examples.scss
+++ b/site/assets/scss/_component-examples.scss
@@ -119,10 +119,6 @@
     position: static;
     display: block;
   }
-
-  > .form-group:last-child {
-    margin-bottom: 0;
-  }
 }
 
 // Images