diff options
| -rw-r--r-- | templates/web/base/dashboard/index.html | 49 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/dashboard.scss | 22 | ||||
| -rw-r--r-- | web/cobrands/sass/_base.scss | 4 |
3 files changed, 40 insertions, 35 deletions
diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html index b3cf68e0a..d7ad6ddfa 100644 --- a/templates/web/base/dashboard/index.html +++ b/templates/web/base/dashboard/index.html @@ -34,11 +34,9 @@ </select> </p> - <p> + <p class="no-label"> <input type="submit" class="btn" value="[% loc('Look up') %]"> </p> - - <br clear="all" /> </div> @@ -133,25 +131,32 @@ <h2>[% loc('Reports') %]</h2> -<p>[% loc('Report state:') %] <select class="form-control" name="state"> -<option value=''>[% loc('All') %]</option> - [% FOR group IN filter_states %] - [% FOR state IN group.1 %] - [% NEXT IF state == 'hidden' %] - <option [% 'selected ' IF state == q_state %] value="[% state %]">[% prettify_state(state, 1) %]</option> - [% END %] - [% END %] -</select> -</p> -<p> -<label for="start_date">[% loc('Start Date') %]</label><input name="start_date" type="date" value="[% start_date | html %]"> -</p> - -<p> -<label for="end_date">[% loc('End Date') %]</label><input name="end_date" type="date" value="[% end_date | html %]"> -</p> -<input type="submit" class="btn" value="[% loc('Look up') %]"> -<a class="export_as_csv" href="[% c.req.uri_with({ export => 1 }) %]">[% loc('Export as CSV') %]</a> +<div class="filters"> + <p> + <label for="state">[% loc('Report state:') %]</label> + <select class="form-control" name="state"> + <option value=''>[% loc('All') %]</option> + [% FOR group IN filter_states %] + [% FOR state IN group.1 %] + [% NEXT IF state == 'hidden' %] + <option [% 'selected ' IF state == q_state %] value="[% state %]">[% prettify_state(state, 1) %]</option> + [% END %] + [% END %] + </select> + </p> + <p> + <label for="start_date">[% loc('Start Date') %]</label> + <input name="start_date" type="date" value="[% start_date | html %]" class="form-control"> + </p> + <p> + <label for="end_date">[% loc('End Date') %]</label> + <input name="end_date" type="date" value="[% end_date | html %]" class="form-control"> + </p> + <p class="no-label"> + <input type="submit" class="btn" value="[% loc('Look up') %]"> + <a class="btn export_as_csv" href="[% c.req.uri_with({ export => 1 }) %]">[% loc('Export as CSV') %]</a> + </p> +</div> <table width="100%" id="reports"> <tr> diff --git a/web/cobrands/fixmystreet/dashboard.scss b/web/cobrands/fixmystreet/dashboard.scss index fb4fd7a8a..3e0de0d2b 100644 --- a/web/cobrands/fixmystreet/dashboard.scss +++ b/web/cobrands/fixmystreet/dashboard.scss @@ -5,8 +5,6 @@ } #overview { - margin-top: 1em; - th[scope=col] { font-size:0.8em; } @@ -66,22 +64,25 @@ } } - .filters{ + .filters { + @include clearfix(); background-color:#ffec99; - margin:0 -1em; + margin: 0 -1em 1em -1em; border-top:#ffd000 solid 0.75em; padding:0 1em; p { float: $left; padding:0 1em; - width:25%; + max-width:25%; font-size:0.75em; color:#333333; - input { - margin-top: 2.5em; - } } + + .no-label { + margin-top: 1.25em + 1.5em + 0.5em; // label line-height + margin-top + margin-bottom + } + select { width:100%; } @@ -98,8 +99,3 @@ font-size:2.25em; } } - - .export_as_csv { - font-size: 0.75em; - font-weight: bold; - } diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 016967457..27cb8fded 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -233,6 +233,10 @@ input[type=number], input[type=text], input[type=password], input[type=email], +input[type=date], +input[type=time], +input[type=datetime], +input[type=url], textarea { @include box-sizing(border-box); display: block; |