mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05: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:
commit
fe7b6decb1
2 changed files with 4 additions and 2 deletions
3
docs/assets/css/bootstrap.css
vendored
3
docs/assets/css/bootstrap.css
vendored
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue