diff options
| -rw-r--r-- | templates/web/fixmystreet/alert/index.html | 24 | ||||
| -rw-r--r-- | templates/web/fixmystreet/alert/list.html | 1 | ||||
| -rw-r--r-- | web/cobrands/bromley/layout.scss | 24 |
3 files changed, 36 insertions, 13 deletions
diff --git a/templates/web/fixmystreet/alert/index.html b/templates/web/fixmystreet/alert/index.html index 8d4459c01..010dfe55c 100644 --- a/templates/web/fixmystreet/alert/index.html +++ b/templates/web/fixmystreet/alert/index.html @@ -2,6 +2,18 @@ <h1>[% loc('Local RSS feeds and email alerts') %]</h1> +[% IF photos.size %] +<div class="sticky-sidebar"> + <aside> + <h2>[% loc('Some photos of recent reports') %]</h2> + [% FOREACH p IN photos %] + <a href="/report/[% p.id %]"><img border="0" height="100" + src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + [% END %] + </aside> +</div> +[% END %] + <p> [% loc('FixMyStreet has a variety of RSS feeds and email alerts for local problems, including alerts for all problems within a particular ward or council, or all problems @@ -27,16 +39,4 @@ within a certain distance of a particular location.') %] </fieldset> </form> -[% IF photos.size %] -<div class="sticky-sidebar"> - <aside> - <h2>[% loc('Some photos of recent reports') %]</h2> - [% FOREACH p IN photos %] - <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> - [% END %] - </aside> -</div> -[% END %] - [% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/alert/list.html b/templates/web/fixmystreet/alert/list.html index 8305fff6f..84899d457 100644 --- a/templates/web/fixmystreet/alert/list.html +++ b/templates/web/fixmystreet/alert/list.html @@ -20,7 +20,6 @@ <form id="alerts" name="alerts" method="post" action="/alert/subscribe"> -[%# XXX These photos should perhaps be in a vertical column on the right hand side, as currently. %] [% IF photos.size %] <div class="sticky-sidebar"> <aside> diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss index 73c597a6c..bd9ae28fe 100644 --- a/web/cobrands/bromley/layout.scss +++ b/web/cobrands/bromley/layout.scss @@ -75,3 +75,27 @@ body.mappage .content { top: 0; } +// Fix location of aside sidebar +body.twothirdswidthpage { + .content { + aside { + @include box-shadow(none); + } + .sticky-sidebar { + aside { + position: absolute; + top: 0; + } + } + } +} +@media only screen and (min-width: 48em) and (max-width: 61em) { + body.twothirdswidthpage { + .content { + .sticky-sidebar { + top: auto; + } + } + } +} + |