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 0f0a3de308e71604cacf29b0c58ce57bd73cea4a..29d29442409a421ab83dbf74d38c22713af47027 100644 (file)
--- 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 {