From: Mark Otto <markdotto@gmail.com>
Date: Sun, 25 Dec 2016 22:22:03 +0000 (-0800)
Subject: Replaces #21270 with proper fix
X-Git-Tag: v4.0.0-alpha.6~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04d48ba5049d38db9f367442372128f7202cc9b1;p=thirdparty%2Fbootstrap.git

Replaces #21270 with proper fix

Rather than overriding this just on inline form examples, this should be for all static form controls to match inputs.
---

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 0f0a3de308..29d2944240 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -135,6 +135,7 @@ select.form-control {
 .form-control-static {
   padding-top: $input-padding-y;
   padding-bottom: $input-padding-y;
+  margin-bottom: 0; // match inputs if this class comes on inputs with default margins
   line-height: $input-line-height;
   border: solid transparent;
   border-width: 1px 0;
@@ -338,7 +339,6 @@ select.form-control-lg {
     // Make static controls behave like regular ones
     .form-control-static {
       display: inline-block;
-      margin-bottom: 0;
     }
 
     .input-group {