mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-09 23:26:40 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/assets/css/bootstrap.css vendored
View File

@@ -1792,10 +1792,15 @@ legend + .control-group {
} }
.form-horizontal .help-block { .form-horizontal .help-block {
margin-top: 10px;
margin-bottom: 0; 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 { .form-horizontal .form-actions {
padding-left: 160px; padding-left: 160px;
} }

9
less/forms.less
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 // Remove bottom margin on block level help text since that's accounted for on .control-group
.help-block { .help-block {
margin-top: @baseLineHeight / 2;
margin-bottom: 0; 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 // Move over buttons in .form-actions to align with .controls
.form-actions { .form-actions {
padding-left: 160px; padding-left: 160px;