Merge pull request #6039 from desheikh/2.2.2-wip

help-block margin-top should also apply after a span.uneditable-input

Merge pull request #6039 from desheikh/2.2.2-wip
help-block margin-top should also apply after a span.uneditable-input
fe7b6dec · Mark Otto · 322a5635 · ddd15448 · fe7b6dec · fe7b6dec
Commit fe7b6dec authored 12 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 2 deletions
+4 -2
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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;
 }

--- a/less/forms.less
+++ b/less/forms.less
@@ -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;
    }