diff options
| author | Mark Otto <[email protected]> | 2012-11-30 00:13:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-30 00:13:30 -0800 |
| commit | fca35c0dba060da14ccb29fc56dc37aa1de533c4 (patch) | |
| tree | 04cc972e705bedb2910247bdcfb0c8ede3cee09a /less/forms.less | |
| parent | 7e56e2265d67ae81ad8be52af4d56f189929207a (diff) | |
| parent | bca3ff4ed6f42701ceae1405f518c35ec8c623be (diff) | |
| download | bootstrap-fca35c0dba060da14ccb29fc56dc37aa1de533c4.tar.xz bootstrap-fca35c0dba060da14ccb29fc56dc37aa1de533c4.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
Diffstat (limited to 'less/forms.less')
| -rw-r--r-- | less/forms.less | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/less/forms.less b/less/forms.less index 33f6ded80..41da55d04 100644 --- a/less/forms.less +++ b/less/forms.less @@ -691,7 +691,10 @@ legend + .control-group { // And apply it only to .help-block instances that follow a form control input, select, - textarea { + textarea, + .uneditable-input, + .input-prepend, + .input-append { + .help-block { margin-top: @baseLineHeight / 2; } |