aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-03-28 10:46:23 -0700
committerMark Otto <[email protected]>2013-03-28 10:46:23 -0700
commitb844d5dd2fcafc76c7d2111997da6f52b453de22 (patch)
tree07f42084b83e9878babbb47de71acb0b9c550199
parent6696ff5d927fd2d584ddc226521b89fc8b9882eb (diff)
parent090545ffdf8b8f750afb0601a16a7bbac07ff6eb (diff)
downloadbootstrap-b844d5dd2fcafc76c7d2111997da6f52b453de22.tar.xz
bootstrap-b844d5dd2fcafc76c7d2111997da6f52b453de22.zip
Merge pull request #7409 from andriijas/3.0.0-wip-formactions
Make sure form actions are properly aligned with form-horizontal
-rw-r--r--docs/assets/css/bootstrap.css3
-rw-r--r--less/forms.less5
2 files changed, 8 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 50d207001..d096c6c50 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1705,6 +1705,9 @@ select:focus:invalid:focus {
.form-horizontal .control-group > .controls {
margin-left: 180px;
}
+ .form-horizontal .form-actions {
+ padding-left: 180px;
+ }
}
.btn {
diff --git a/less/forms.less b/less/forms.less
index 841966bfe..02aa4242c 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -539,5 +539,10 @@ select:focus:invalid {
margin-left: @component-offset-horizontal;
}
+ // Make sure form actions buttons are aligned with controls
+ .form-actions {
+ padding-left: @component-offset-horizontal;
+ }
+
}
}