diff options
| author | Jacob Thornton <[email protected]> | 2012-01-29 13:16:02 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-29 13:16:02 -0800 |
| commit | 910e78d26ad476d11331e8bb9b0233e0b2ba21e3 (patch) | |
| tree | 89c22731c23c1808bf92db1ceb670ca2cd3c7677 /less/forms.less | |
| parent | 49d565a6da38359a776f83f31a1f1ccd658c88a7 (diff) | |
| parent | 9fa8bde44d9bb6f26b16c7633a01bbe5ce7b20a4 (diff) | |
| download | bootstrap-910e78d26ad476d11331e8bb9b0233e0b2ba21e3.tar.xz bootstrap-910e78d26ad476d11331e8bb9b0233e0b2ba21e3.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'less/forms.less')
| -rw-r--r-- | less/forms.less | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/less/forms.less b/less/forms.less index b0daeb034..6b0f5ec52 100644 --- a/less/forms.less +++ b/less/forms.less @@ -175,6 +175,11 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; // space out consecutive inline controls } +// But don't forget to remove their padding on first-child +.controls > .radio.inline:first-child, +.controls > .checkbox.inline:first-child { + padding-top: 5px; // has to be padding because margin collaspes +} @@ -490,9 +495,20 @@ select:focus:required:invalid { } } .form-search label, -.form-inline label { +.form-inline label, +.form-search .input-append, +.form-inline .input-append, +.form-search .input-prepend, +.form-inline .input-prepend { display: inline-block; } +// Make the prepend and append add-on vertical-align: middle; +.form-search .input-append .add-on, +.form-inline .input-prepend .add-on, +.form-search .input-append .add-on, +.form-inline .input-prepend .add-on { + vertical-align: middle; +} // Margin to space out fieldsets .control-group { |