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.

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.
04d48ba5 · Mark Otto · Mark Otto · 2cad7176 · 04d48ba5
Commit 04d48ba5 authored 8 years ago by Mark Otto Committed by Mark Otto 8 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 1 deletion
+1 -1
--- 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 {