1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-13 17:14:04 +02:00

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.
This commit is contained in:
Mark Otto
2016-12-25 14:22:03 -08:00
committed by Mark Otto
parent 2cad717634
commit 04d48ba504

View File

@@ -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 {
// 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 {