diff options
| -rw-r--r-- | templates/web/fixmystreet/alert/list.html | 15 | ||||
| -rw-r--r-- | templates/web/fixmystreet/header.html | 1 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 26 |
3 files changed, 32 insertions, 10 deletions
diff --git a/templates/web/fixmystreet/alert/list.html b/templates/web/fixmystreet/alert/list.html index 4b25b54b4..ccd5ed11c 100644 --- a/templates/web/fixmystreet/alert/list.html +++ b/templates/web/fixmystreet/alert/list.html @@ -6,7 +6,7 @@ END; %] -[% INCLUDE 'header.html', title => title %] +[% INCLUDE 'header.html', title = title, bodyclass = 'twothirdswidthpage' %] [% IF pretty_pc %] [% @@ -22,6 +22,7 @@ <input type="hidden" name="type" value="local"> <input type="hidden" name="pc" value="[% pc | html %]"> +[%# XXX These photos should perhaps be in a vertical column on the right hand side, as currently. %] [% IF photos.size %] <div id="alert_photos"> <h2>[% loc('Photos of recent nearby reports') %]</h2> @@ -67,17 +68,17 @@ <p><strong> [% loc('Problems within the boundary of:') %] </strong></p> - <ul> + <ul class="plain-list"> [% ELSE %] <ul id="rss_feed" class="plain-list"> [% END %] [% FOREACH option IN options %] - <li> + <li[% IF ! (loop.count % 2) %] class="a"[% END %]> <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label class="inline" for="[% option.id %]">[% option.text %]</label> <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + <label class="inline" for="[% option.id %]">[% option.text %]</label> </li> [% END %] </ul> @@ -85,13 +86,13 @@ title="[% option.rss_text %]" alt="RSS feed" border="0"></a> <p><strong> [% loc('Or problems reported to:') %] </strong></p> - <ul> + <ul class="plain-list"> [% FOREACH option IN reported_to_options %] - <li> + <li[% IF ! (loop.count % 2) %] class="a"[% END %]> <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label for="[% option.id %]">[% option.text %]</label> <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + <label class="inline" for="[% option.id %]">[% option.text %]</label> </li> [% END %] </ul> diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 878118afc..fade721d5 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -11,7 +11,6 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> - <link rel="stylesheet" href="[% version('/css/core.css') %]"> <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/base.css') %]"> <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)"> <!--[if (lt IE 9) & (!IEMobile)]> diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 09304aabf..07b89cfe3 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1092,9 +1092,14 @@ a:hover.button-left { background:rgba(0, 0, 0, 0.7); } -//copyright attribution .olControlAttribution { - bottom:0.5em !important; + bottom: 0.5em !important; + left: 3px; + color: #222222; +} +.olControlPermalink { + bottom: 3px !important; + right: 3px; } /* Drag is only present in noscript form. XXX Copy from core. */ @@ -1379,3 +1384,20 @@ ul.breadcrumb { margin-bottom:0; } } + +#alerts { + ul { + margin-bottom: 1em; + } + li { + padding: 0em; + margin-bottom: 0.5em; + } + .a { + background: #f6f6f6; + } + img { + float: right; + } +} + |