root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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
parent 322a56354f ddd154481b
commit fe7b6decb1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/assets/css/bootstrap.css vendored
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;
}

3
less/forms.less
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;
}