Merge branch '3.0.0-wip' into bs3_new_nav

4ce9203f · Mark Otto · 9f596487 · b844d5dd · 4ce9203f · 4ce9203f
Commit 4ce9203f authored Mar 29, 2013 by Mark Otto
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

docs/assets/css/bootstrap.css docs/assets/css/bootstrap.css +3 -0

less/forms.less less/forms.less +5 -0

No files found.
--- 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 {

--- 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;
+    }
+
  }
 }