2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00

Merge pull request #6039 from desheikh/2.2.2-wip

help-block margin-top should also apply after a span.uneditable-input
This commit is contained in:
Mark Otto
2012-11-29 23:32:38 -08:00
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -1957,7 +1957,8 @@ legend + .control-group {
.form-horizontal input + .help-block,
.form-horizontal select + .help-block,
.form-horizontal textarea + .help-block {
.form-horizontal textarea + .help-block,
.form-horizontal span.uneditable-input + .help-block {
margin-top: 10px;
}
+2 -1
View File
@@ -672,7 +672,8 @@ legend + .control-group {
// And apply it only to .help-block instances that follow a form control
input,
select,
textarea {
textarea,
span.uneditable-input {
+ .help-block {
margin-top: @baseLineHeight / 2;
}