Change how fullpage class works

Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>

3 files changed, 49 insertions, 21 deletions

diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html
index ddd1554d4..8fb0bbcb6 100644
--- a/templates/web/fixmystreet/index.html
+++ b/templates/web/fixmystreet/index.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'header.html', title => '' , mainclass => 'fullwidthpage', bodyclass => 'frontpage' %]
+[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %]
 
 [% IF error %]
     <p class="error">[% error %]</p>
diff --git a/templates/web/fixmystreet/reports/index.html b/templates/web/fixmystreet/reports/index.html
index 2dfdc6df2..57b9dfe33 100755
--- a/templates/web/fixmystreet/reports/index.html
+++ b/templates/web/fixmystreet/reports/index.html
@@ -1,9 +1,10 @@
-[% INCLUDE 'header.html', title = loc('Summary reports'),  mainclass => 'fullwidthpage' %]
+[% INCLUDE 'header.html', title = loc('Summary reports'),  bodyclass => 'fullwidthpage' %]
 
-<p>
-[% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there.') %]
-[% loc('Greyed-out lines are councils that no longer exist.') %]
-</p>
+<h1>[% loc('All Reports') %]</h1>
+
+<div class="intro">
+	<p>[% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there. Greyed-out lines are councils that no longer exist.') %]</p>
+</div>
 
 <table cellpadding="3" cellspacing="1" border="0">
 <tr>
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index 1347c4482..5536cc340 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -94,7 +94,7 @@ body {
 }
 //fix logo position as a result of fiddling the with position attributes
 //on the parent elements
-.ie6, .ie7 {
+.ie6, .ie7, .ie8 {
   #site-logo {
     position: absolute;
     top:-3.25em;
@@ -184,8 +184,22 @@ body {
   margin-bottom: -1em;
   @include box-shadow(0px 0px 6px 1px #000);
 }
-.fullwidthpage {
-  width: 57em;
+// full width page
+body.fullwidthpage {
+  background:#1a1a1a;
+  .content {
+    width: 57em;
+  }
+  .nav-wrapper-2{
+    background: #1a1a1a;
+    position:absolute;
+  }
+  #site-logo{
+    position: absolute;
+  }
+  .intro {
+    width:43em;
+  }
 }
 
 #map_box{
@@ -376,7 +390,6 @@ textarea{
 
 /* Frontpage */
 body.frontpage {
-  background:#1a1a1a;
   .wrapper {
     >.container {
       width:100%;
@@ -387,15 +400,12 @@ body.frontpage {
     }
   }
   .nav-wrapper-2{
-    background: #1a1a1a;
     height:6em;
-    position:absolute;
   }
   #site-header{
     height:9em;
   }
   #site-logo{
-    position: absolute;
     top:3em;
     width: 300px;
     height: 60px;
@@ -410,20 +420,28 @@ body.frontpage {
 }
 //logo fix
 .ie6, .ie7, .ie8 {
-  body.frontpage #site-logo {
-    position:relative;
-    width:60em;
-    margin:0 auto;
+  body.frontpage {
+    #site-logo {
+      position:relative;
+      width:60em;
+      margin:0 auto;
+    }
+    .wrapper .content{
+      padding-top:12em;
+      margin-top:1em;
+    }
+    #user-meta p {
+      top:-1em;
+    }
   }
 }
 .ie6, .ie7 {
   body.frontpage #site-logo {
-    top:-2em;
+    top:-1em;
   }
 }
 //weird margining thing for ie8
-.ie8,
-.ie8 body.frontpage {
+.ie8 {
   .wrapper .content {
     margin-top:7em;
   }
@@ -431,6 +449,14 @@ body.frontpage {
     top:5em;
   }
 }
+.ie8 body.frontpage {
+  .wrapper .content {
+    margin-top:5em;
+  }
+  #user-meta p {
+    top:3em;
+  }
+}
 
 
 #front-main {
@@ -486,6 +512,7 @@ body.frontpage {
 }
 .ie6, .ie7 {
   #front-main {
+    top:2em;
     padding-top:1em;
   }
 }
@@ -714,7 +741,7 @@ body.frontpage {
   }
 
   //make fullpage auto width
-  .fullwidthpage {
+  body.fullwidthpage .content {
     width: auto;
   }