Commit 04d48ba5 authored by Mark Otto's avatar Mark Otto Committed by Mark Otto
Browse files

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.
parent 2cad7176
Showing with 1 addition and 1 deletion
+1 -1
...@@ -135,6 +135,7 @@ select.form-control { ...@@ -135,6 +135,7 @@ select.form-control {
.form-control-static { .form-control-static {
padding-top: $input-padding-y; padding-top: $input-padding-y;
padding-bottom: $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; line-height: $input-line-height;
border: solid transparent; border: solid transparent;
border-width: 1px 0; border-width: 1px 0;
...@@ -338,7 +339,6 @@ select.form-control-lg { ...@@ -338,7 +339,6 @@ select.form-control-lg {
// Make static controls behave like regular ones // Make static controls behave like regular ones
.form-control-static { .form-control-static {
display: inline-block; display: inline-block;
margin-bottom: 0;
} }
.input-group { .input-group {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment