Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <otto@github.com>2012-11-30 11:39:33 +0400
committerMark Otto <otto@github.com>2012-11-30 11:39:33 +0400
commitbca3ff4ed6f42701ceae1405f518c35ec8c623be (patch)
treeb92cc1ad9d26194028944324d6cdbd9b24a56e37
parentf087b3428c6b48ee34b8da3991fc692e04719898 (diff)
Fixes #5853: Maintain 10px margin above help block when following input groups
-rw-r--r--docs/assets/css/bootstrap.css4
-rw-r--r--less/forms.less4
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 50453131c2..732724f137 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1958,7 +1958,9 @@ legend + .control-group {
.form-horizontal input + .help-block,
.form-horizontal select + .help-block,
.form-horizontal textarea + .help-block,
-.form-horizontal .uneditable-input + .help-block {
+.form-horizontal .uneditable-input + .help-block,
+.form-horizontal .input-prepend + .help-block,
+.form-horizontal .input-append + .help-block {
margin-top: 10px;
}
diff --git a/less/forms.less b/less/forms.less
index 1e1a04bdfb..2dff229191 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -673,7 +673,9 @@ legend + .control-group {
input,
select,
textarea,
- .uneditable-input {
+ .uneditable-input,
+ .input-prepend,
+ .input-append {
+ .help-block {
margin-top: @baseLineHeight / 2;
}