diff options
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55280 -> 55304 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 15 | ||||
| -rw-r--r-- | less/forms.less | 11 |
3 files changed, 12 insertions, 14 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 33fb717b6..17f272fc5 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 64c024c9b..433a345ab 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -982,7 +982,6 @@ select:focus:required:invalid:focus { } .input-prepend, .input-append { - display: inline-block; margin-bottom: 5px; } .input-prepend input, @@ -1071,7 +1070,13 @@ select:focus:required:invalid:focus { .form-horizontal .help-inline, .form-search .uneditable-input, .form-inline .uneditable-input, -.form-horizontal .uneditable-input { +.form-horizontal .uneditable-input, +.form-search .input-prepend, +.form-inline .input-prepend, +.form-horizontal .input-prepend, +.form-search .input-append, +.form-inline .input-append, +.form-horizontal .input-append { display: inline-block; margin-bottom: 0; } @@ -1081,11 +1086,7 @@ select:focus:required:invalid:focus { display: none; } .form-search label, -.form-inline label, -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { +.form-inline label { display: inline-block; } .form-search .input-append, diff --git a/less/forms.less b/less/forms.less index 5fc8f5261..5045dc254 100644 --- a/less/forms.less +++ b/less/forms.less @@ -361,7 +361,6 @@ select:focus:required:invalid { // Allow us to put symbols and text within the input field for a cleaner look .input-prepend, .input-append { - display: inline-block; margin-bottom: 5px; input, select, @@ -440,7 +439,9 @@ select:focus:required:invalid { textarea, select, .help-inline, - .uneditable-input { + .uneditable-input, + .input-prepend, + .input-append { display: inline-block; margin-bottom: 0; } @@ -450,11 +451,7 @@ select:focus:required:invalid { } } .form-search label, -.form-inline label, -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { +.form-inline label { display: inline-block; } // Remove margin for input-prepend/-append |