4 files changed, 13 insertions, 14 deletions
diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html
index 45239073d..3d0ee4f31 100644
--- a/templates/web/fixmystreet/auth/general.html
+++ b/templates/web/fixmystreet/auth/general.html
@@ -1,5 +1,4 @@
 [% INCLUDE 'header.html', bodyclass='authpage', title = loc('Sign in or create an account') %]
-[%# should bodyclass='twothirdspage' instead? Need override for Harrogate %]
 
 <h1>[% loc('Sign in') %]</h1>
 
diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss
index 2e0ce47f0..8d57949a0 100644
--- a/web/cobrands/greenwich/layout.scss
+++ b/web/cobrands/greenwich/layout.scss
@@ -16,8 +16,6 @@ $fixed_page_width: 990px;
 .ie6 #site-logo,
 body.frontpage #site-logo,
 .ie6 body.frontpage #site-logo,
-body.authpage #site-logo,
-.ie6 body.authpage #site-logo,
 body.twothirdswidthpage #site-logo,
 .ie6 body.twothirdswidthpage #site-logo
 {
diff --git a/web/cobrands/harrogate/layout.scss b/web/cobrands/harrogate/layout.scss
index 480a07f5d..dba7ed5b0 100644
--- a/web/cobrands/harrogate/layout.scss
+++ b/web/cobrands/harrogate/layout.scss
@@ -8,9 +8,6 @@
     body.frontpage #site-logo,
     .ie6 body.frontpage #site-logo,
     
-    body.authpage #site-logo,
-    .ie6 body.authpage #site-logo,
-
     body.twothirdswidthpage #site-logo,
     .ie6 body.twothirdswidthpage #site-logo
     {
@@ -29,9 +26,6 @@
     body.twothirdswidthpage #site-header,
     .ie6 body.twothirdswidthpage #site-header,
 
-    body.authpage #site-header,
-    .ie6 body.authpage #site-header,
-
     body.mappage #site-header,
     .ie6 body.mappage #site-header,
     body.mappage .nav-wrapper-2,
@@ -58,11 +52,7 @@
     }
 }
 
-body.fullwidthpage #main-nav,
-body.frontpage #main-nav,
-body.twothirdswidthpage #main-nav,
-body.authpage #main-nav
-{
+#main-nav {
     margin-top: 3.2em;
 }
 
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index ea85c0f13..26460c580 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -498,6 +498,18 @@ body.twothirdswidthpage {
   }
 }
 
+// Centre the login and password change pages,
+// but keep them narrow to match the report sidebar
+body.authpage {
+  .content {
+    margin-#{$left}: auto;
+    margin-#{$right}: auto;
+    margin-bottom: 0;
+    box-shadow: none;
+    padding: 1em; // same as .twothirdswidthpage .content
+  }
+}
+
 
 // table wrapper - this enables anything to become a
 // table with div children as table cells