Merge branch '3.0.0-wip' into bs3_new_nav

This commit is contained in:
Mark Otto 2013-03-29 14:21:03 -07:00
commit 4ce9203f2c
2 changed files with 8 additions and 0 deletions

View File

@ -1705,6 +1705,9 @@ select:focus:invalid:focus {
.form-horizontal .control-group > .controls {
margin-left: 180px;
}
.form-horizontal .form-actions {
padding-left: 180px;
}
}
.btn {

View File

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