1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-02 01:42:36 +02:00

Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3

Conflicts:
	css.html
This commit is contained in:
Mark Otto
2013-07-26 15:08:45 -07:00
2 changed files with 4 additions and 9 deletions

View File

@@ -421,13 +421,8 @@ select {
// --------------------------------------------------
// Horizontal forms are built on grid classes.
.form-horizontal {
.row + .row {
margin-top: 15px;
}
.control-label {
.form-horizontal .control-label {
padding-top: 6px;
}
}
// Only right align form labels here when the columns stop stacking