aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-12-25 14:22:03 -0800
committerMark Otto <[email protected]>2016-12-25 15:48:44 -0800
commit04d48ba5049d38db9f367442372128f7202cc9b1 (patch)
tree94a5dae3c499bf88d7088fadf3c46a0f0f0c9ec3
parent2cad717634bcf64845d086ba8539edd4b999cc45 (diff)
downloadbootstrap-04d48ba5049d38db9f367442372128f7202cc9b1.tar.xz
bootstrap-04d48ba5049d38db9f367442372128f7202cc9b1.zip
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.
-rw-r--r--scss/_forms.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 0f0a3de30..29d294424 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 {