0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

fixes #4729: only use margin-top on .help-block when it follows an input, select, textarea

This commit is contained in:
Mark Otto 2012-08-27 22:42:12 -07:00
parent 7d412b1e14
commit 609142eee2
2 changed files with 14 additions and 2 deletions

View File

@ -1792,10 +1792,15 @@ legend + .control-group {
}
.form-horizontal .help-block {
margin-top: 10px;
margin-bottom: 0;
}
.form-horizontal input + .help-block,
.form-horizontal select + .help-block,
.form-horizontal textarea + .help-block {
margin-top: 10px;
}
.form-horizontal .form-actions {
padding-left: 160px;
}

View File

@ -633,9 +633,16 @@ legend + .control-group {
}
// Remove bottom margin on block level help text since that's accounted for on .control-group
.help-block {
margin-top: @baseLineHeight / 2;
margin-bottom: 0;
}
// And apply it only to .help-block instances that follow a form control
input,
select,
textarea {
+ .help-block {
margin-top: @baseLineHeight / 2;
}
}
// Move over buttons in .form-actions to align with .controls
.form-actions {
padding-left: 160px;