From bca3ff4ed6f42701ceae1405f518c35ec8c623be Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Nov 2012 23:39:33 -0800 Subject: [PATCH] Fixes #5853: Maintain 10px margin above help block when following input groups --- docs/assets/css/bootstrap.css | 4 +++- less/forms.less | 4 +++- 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; }