diff options
| -rw-r--r-- | templates/web/base/admin/index.html | 38 | ||||
| -rw-r--r-- | web/cobrands/sass/_admin.scss | 7 | ||||
| -rw-r--r-- | web/cobrands/sass/_base.scss | 3 |
3 files changed, 26 insertions, 22 deletions
diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html index 8691dbcf8..5a469b08e 100644 --- a/templates/web/base/admin/index.html +++ b/templates/web/base/admin/index.html @@ -20,34 +20,40 @@ and to receive notices of updates. </p> [% END %] -<div class="admin-index-search form-txt-submit-box clearfix"> +<div class="admin-index-search clearfix"> <form method="get" action="[% c.uri_for('reports') %]" accept-charset="utf-8"> - <p><label for="search_reports">[% loc('Search Reports') %]</label> + <label for="search_reports">[% loc('Search Reports') %]</label> + <div class="form-txt-submit-box"> <input type="text" class="form-control" name="search" size="30" id="search_reports" value="[% searched | html %]"> <input type="submit" class="btn" value="[% loc('Go') %]"> + </div> </form> <form method="get" action="[% c.uri_for('users') %]" accept-charset="utf-8"> - <p><label for="search_users">[% loc('Search Users') %]</label> + <label for="search_users">[% loc('Search Users') %]</label> + <div class="form-txt-submit-box"> <input type="text" class="form-control" name="search" size="30" id="search_users" value="[% searched | html %]"> <input type="submit" class="btn" value="[% loc('Go') %]"> + </div> </form> [% IF c.user.is_superuser %] - <form method="get" action="[% c.uri_for('bodies') %]"> - <label for="search_body">[% loc('Edit body details') %]</label> - <select class="form-control" id="search_body" name="body"> - [% FOREACH body IN bodies %] - [%- SET id = body.id %] - <option[% IF body.deleted %] class="adminhidden"[% END %] value="[% body.id %]"> - [% body.name | html %] - [%- IF body.parent %], [% body.parent.name | html %][% END -%] - </option> - [% END %] - </select> - <input type="submit" class="btn" value="[% loc('Go') %]"> - </form> +<form method="get" action="[% c.uri_for('bodies') %]"> + <label for="search_body">[% loc('Edit body details') %]</label> + <div class="form-txt-submit-box"> + <select class="form-control" id="search_body" name="body"> + [% FOREACH body IN bodies %] + [%- SET id = body.id %] + <option[% IF body.deleted %] class="adminhidden"[% END %] value="[% body.id %]"> + [% body.name | html %] + [%- IF body.parent %], [% body.parent.name | html %][% END -%] + </option> + [% END %] + </select> + <input type="submit" class="btn" value="[% loc('Go') %]"> + </div> +</form> [% END %] </div> diff --git a/web/cobrands/sass/_admin.scss b/web/cobrands/sass/_admin.scss index 745c74fd7..d36c8ced0 100644 --- a/web/cobrands/sass/_admin.scss +++ b/web/cobrands/sass/_admin.scss @@ -167,12 +167,9 @@ $button_bg_col: #a1a1a1; // also search bar (tables) .admin-index-search { width: 27em; - form { - clear: #{$left}; - } + select { - max-width: 65%; - float: #{$left}; + width: 15em; } } diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 4cdb483ae..063136eb8 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -495,7 +495,8 @@ small#or:after { input[type=tel], input[type=number], input[type=text], - input[type=email] { + input[type=email], + select { width: auto; max-width: none; @include flex(72 0 auto); |