diff options
| -rw-r--r-- | templates/web/fixmystreet/around/around_map_list_items.html | 14 | ||||
| -rwxr-xr-x | templates/web/fixmystreet/around/display_location.html | 4 | ||||
| -rw-r--r-- | templates/web/fixmystreet/around/on_map_list_items.html | 14 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 33 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 10 |
5 files changed, 55 insertions, 20 deletions
diff --git a/templates/web/fixmystreet/around/around_map_list_items.html b/templates/web/fixmystreet/around/around_map_list_items.html index bd57d0a26..eb4a14d2d 100644 --- a/templates/web/fixmystreet/around/around_map_list_items.html +++ b/templates/web/fixmystreet/around/around_map_list_items.html @@ -4,13 +4,15 @@ [% dist = tprintf("%.1f", (p.distance || 0) ) %] <li> - <a href="[% c.uri_for('/report', p.problem.id ) %]">[% p.problem.title | html %]</a> - <small>[% prettify_epoch( p.problem.confirmed_local.epoch, 1 ) %], [% dist %]km</small> - [% IF p.problem.is_fixed %] - <small>[% loc('(fixed)') %]</small> - [% END %] + <a href="[% c.uri_for('/report', p.problem.id ) %]"> + <h4>[% p.problem.title | html %]</h4> + <small>[% prettify_epoch( p.problem.confirmed_local.epoch, 1 ) %], [% dist %]km</small> + [% IF p.problem.is_fixed %] + <small>[% loc('(fixed)') %]</small> + [% END %] + </a> </li> [% END %] [% ELSE %] - <li>[% loc('No problems found.') %]</li> + <li><p>[% loc('No problems found.') %]</p></li> [% END %]
\ No newline at end of file diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html index 8caeb76ae..b247ae1da 100755 --- a/templates/web/fixmystreet/around/display_location.html +++ b/templates/web/fixmystreet/around/display_location.html @@ -91,13 +91,13 @@ <section class="full-width"> <h4 class="static-with-rule">[% loc('Problems on the map') %]</h4> - <ul class="issue-list"> + <ul class="issue-list-a"> [% INCLUDE "around/on_map_list_items.html" %] </ul> <h4 class="static-with-rule">[% loc( 'Problems nearby' ) %]</h4> - <ul class="issue-list"> + <ul class="issue-list-a"> [% INCLUDE "around/around_map_list_items.html" %] </ul> </section> diff --git a/templates/web/fixmystreet/around/on_map_list_items.html b/templates/web/fixmystreet/around/on_map_list_items.html index 245be7190..046045069 100644 --- a/templates/web/fixmystreet/around/on_map_list_items.html +++ b/templates/web/fixmystreet/around/on_map_list_items.html @@ -1,13 +1,15 @@ [% IF on_map.size %] [% FOREACH p IN on_map %] <li> - <a href="[% c.uri_for('/report', p.id ) %]">[% p.title | html %]</a> - <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small> - [% IF p.is_fixed %] - <small>[% loc('(fixed)') %]</small> - [% END %] + <a href="[% c.uri_for('/report', p.id ) %]"> + <h4>[% p.title | html %]</h4> + <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small> + [% IF p.is_fixed %] + <small>[% loc('(fixed)') %]</small> + [% END %] + </a> </li> [% END %] [% ELSE %] - <li>[% loc('No problems have been reported yet.') %]</li> + <li><p>[% loc('No problems have been reported yet.') %]</p></li> [% END %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index db0d94404..1d5cf1eca 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -418,7 +418,7 @@ input.red-btn{ border-bottom: 0.25em solid $primary; li{ list-style: none; - background: #f6f6f6; + background: #f6f6f6; margin: 0.25em 0 0 0; padding: 0.5em 1em; display:block; @@ -443,6 +443,37 @@ input.red-btn{ } } +.issue-list-a { + margin: 0 0 1em 0; + padding: 0px; + border-bottom: 0.25em solid $primary; + li { + list-style: none; + margin:0; + padding:0; + a { + margin: 0.25em 0 0 0; + padding: 0.5em 1em; + display:block; + background: #f6f6f6; + color:#222222; + &:hover { + text-decoration:none; + color:#222222; + background:#e6e6e6; + } + h4 { + margin:0; + } + } + >p { + margin: 0.25em 0 0 0; + padding: 0.5em 1em; + background: #f6f6f6; + } + } +} + #map_box{ background: #333; height: 10em; diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index e9b87062b..e3bdd561c 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -133,9 +133,9 @@ #map_box{ position: absolute; height: 25em; - width: 30em; - right: 0em; - top: 0em; + width: 29em; + right: 1em; + top: 0; z-index:1; } @@ -212,9 +212,9 @@ textarea{ } #report-a-poblem-sidebar { position:absolute; - left:29em; + left:28.5em; top:0; - width:15em; + width:15.25em; .sidebar-tips { background:#eeeeee; padding:1em; |