diff options
| author | Mark Otto <[email protected]> | 2012-07-10 00:32:04 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-07-10 00:32:30 -0700 |
| commit | 5d8e78e0faedb4365216f1ebbc5d70dc560f3f6e (patch) | |
| tree | 67bc139371c6a5242fae8823c2c2897e3ce0561c /less/forms.less | |
| parent | 75d952ffd80c3c3e18b2e47eac30a2b23d8ae7a7 (diff) | |
| download | bootstrap-5d8e78e0faedb4365216f1ebbc5d70dc560f3f6e.tar.xz bootstrap-5d8e78e0faedb4365216f1ebbc5d70dc560f3f6e.zip | |
fixes #3605: add support for input-prepend/-append to .form-search
Diffstat (limited to 'less/forms.less')
| -rw-r--r-- | less/forms.less | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/less/forms.less b/less/forms.less index 078b36704..ddadab8ca 100644 --- a/less/forms.less +++ b/less/forms.less @@ -22,7 +22,7 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: @baseLineHeight * 1.5; + margin-bottom: @baseLineHeight; font-size: @baseFontSize * 1.5; line-height: @baseLineHeight * 2; color: @grayDark; @@ -399,8 +399,8 @@ select:focus:required:invalid { // ------------ // Allow us to put symbols and text within the input field for a cleaner look -.input-prepend, -.input-append { +.input-append, +.input-prepend { margin-bottom: 5px; font-size: 0; white-space: nowrap; // Prevent span and input from separating @@ -489,15 +489,34 @@ select:focus:required:invalid { // SEARCH FORM // ----------- -input.search-query { +.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */ - margin-bottom: 0; // remove the default margin on all inputs + margin-bottom: 0; // Remove the default margin on all inputs .border-radius(14px); } +/* Allow for input prepend/append in search forms */ +.form-search .input-append .search-query, +.form-search .input-prepend .search-query { + .border-radius(0); // Override due to specificity +} +.form-search .input-append .search-query { + .border-radius(14px 0 0 14px) +} +.form-search .input-append .btn { + .border-radius(0 14px 14px 0) +} +.form-search .input-prepend .search-query { + .border-radius(0 14px 14px 0) +} +.form-search .input-prepend .btn { + .border-radius(14px 0 0 14px) +} + + // HORIZONTAL & VERTICAL FORMS |