From b748677e472552c45c2fdc32c7ae9462cd2c0ce8 Mon Sep 17 00:00:00 2001
From: Steven Day <steve@mysociety.org>
Date: Thu, 30 Jul 2015 16:46:07 +0100
Subject: Fix sidebar running over the footer on alerts page

This page used the .sticky-sidebar class that is used in the help
section to present the in-page navigation of a lot of text. There,
there's no danger of the sidebar being scrolled over the footer
because it's very short. On this page though, there is.

This commit removes that class, so that the recent photos are fixed
in position with the top of the content. I don't think this is a
great loss for usability or design. It also removes the alertindex
class, which was only used to work around this issue.

Closes #1168
---
 templates/web/base/alert/index.html          | 4 ++--
 templates/web/base/alert/list.html           | 2 +-
 templates/web/fixmybarangay/alert/index.html | 2 +-
 web/cobrands/eastsussex/layout.scss          | 4 ----
 web/cobrands/fixmystreet/layout.scss         | 8 --------
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/templates/web/base/alert/index.html b/templates/web/base/alert/index.html
index e3dead34a..314008846 100644
--- a/templates/web/base/alert/index.html
+++ b/templates/web/base/alert/index.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage alertindex' %]
+[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %]
 
 <h1>[% loc('Local RSS feeds and email alerts') %]</h1>
 
@@ -37,7 +37,7 @@ To find out what local alerts we have for you, please enter your [% c.cobrand.co
 </form>
 
 [% IF photos.size %]
-<div class="sticky-sidebar" id="alert_recent">
+<div id="alert_recent">
   <aside>
     <h2>[% loc('Some photos of recent reports') %]</h2>
     [% FOREACH p IN photos;
diff --git a/templates/web/base/alert/list.html b/templates/web/base/alert/list.html
index 447bfcd76..7b262f9e7 100644
--- a/templates/web/base/alert/list.html
+++ b/templates/web/base/alert/list.html
@@ -21,7 +21,7 @@
 <form id="alerts" name="alerts" method="post" action="/alert/subscribe">
 
   [% IF photos.size %]
-    <div id="alert_photos" class="sticky-sidebar">
+    <div id="alert_photos">
       <aside>
         <h2>[% loc('Photos of recent nearby reports') %]</h2>
         [% FOREACH p IN photos;
diff --git a/templates/web/fixmybarangay/alert/index.html b/templates/web/fixmybarangay/alert/index.html
index 58c4080e8..c168fa41b 100644
--- a/templates/web/fixmybarangay/alert/index.html
+++ b/templates/web/fixmybarangay/alert/index.html
@@ -27,7 +27,7 @@ FixMyBarangay has a RSS feeds and email alerts for local problems.
 <form id="alerts" name="alerts" method="post" action="/alert/subscribe">
 
 [% IF photos.size %]
-<div class="sticky-sidebar" id="alert_recent">
+<div id="alert_recent">
   <aside>
     <h2>[% loc('Some photos of recent reports') %]</h2>
     [% FOREACH p IN photos;
diff --git a/web/cobrands/eastsussex/layout.scss b/web/cobrands/eastsussex/layout.scss
index dad118198..9e818f0a5 100644
--- a/web/cobrands/eastsussex/layout.scss
+++ b/web/cobrands/eastsussex/layout.scss
@@ -108,10 +108,6 @@ body.mappage {
     line-height: 14px;
 }
 
-body.twothirdswidthpage.alertindex .content .sticky-sidebar aside {
-    top: -17em;
-}
-
 body.twothirdswidthpage .content .sticky-sidebar aside {
     top: 0;
     position: absolute;
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index 1d56e675c..b6698055d 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -249,14 +249,6 @@ body.twothirdswidthpage {
     }
 }
 
-/* hide the footer on the alert page as the interaction with the
- * photo sidebar is awkward to fix */
-body.alertindex {
-  #footer-nav {
-    display: none;
-  }
-}
-
 .next-steps {
   @include clearfix;
   margin-bottom: 2em; // add some space between this and the footer
-- 
cgit v1.2.3