diff options
| author | Jacob Thornton <[email protected]> | 2012-02-13 18:42:57 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-13 18:42:57 -0800 |
| commit | a8c478e05189d195d4b921c5d0eb6c601ea35711 (patch) | |
| tree | 592350f61d1a4ba91ed587ea8615b5a850ea13d7 /less/forms.less | |
| parent | 6e77c9d1233c1621deeaa2dd00e6eca3fd618610 (diff) | |
| parent | 64ea59234f30f51ab5497830d1825c7e043a575e (diff) | |
| download | bootstrap-a8c478e05189d195d4b921c5d0eb6c601ea35711.tar.xz bootstrap-a8c478e05189d195d4b921c5d0eb6c601ea35711.zip | |
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'less/forms.less')
| -rw-r--r-- | less/forms.less | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/less/forms.less b/less/forms.less index 81833b064..be9dbfaa9 100644 --- a/less/forms.less +++ b/less/forms.less @@ -42,7 +42,13 @@ input, button, select, textarea { - #font > .sans-serif(@baseFontSize,normal,@baseLineHeight); + #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here +} +input, +button, +select, +textarea { + #font > #family > .sans-serif(); // And only set font-family here for those that need it (note the missing label element) } // Identify controls by their labels @@ -327,6 +333,7 @@ select:focus:required:invalid { // --------- .help-block { + display: block; // account for any element using help-block margin-top: 5px; margin-bottom: 0; color: @grayLight; @@ -395,6 +402,7 @@ select:focus:required:invalid { .border-radius(3px 0 0 3px); } .uneditable-input { + border-left-color: #eee; border-right-color: #ccc; } .add-on { |