1 files changed, 19 insertions, 55 deletions
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 3859f09f6..d273eec1f 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -48,11 +48,8 @@ h1 {
 
 // Page wrapper and header bits follow
 
-.container{
-  margin: 0 auto;
-  padding: 0em;
-  width: 60em;
-  position: relative;
+.container {
+    position: relative;
 }
 
 // Body sometimes has a .top_banner at the start, which we don't want to
@@ -136,19 +133,13 @@ h1 {
 }
 
 // .content Is the white box
-
-// The narrow single column box
 .content {
-  margin: 1em 0.5em 0;
+  margin: 1em 0 0 0;
   padding: 1em;
   background: #fff;
   color: #222;
 }
 
-.full-width {
-  margin: 0 ($mappage-sidebar-padding * -1);
-}
-
 // map page - has fixed header and different styling
 body.mappage {
   .wrapper {
@@ -156,7 +147,7 @@ body.mappage {
   }
 
   .container {
-    width: auto;
+    max-width: none;
     position: static;
   }
 
@@ -165,6 +156,10 @@ body.mappage {
     margin: 0;
   }
 
+  .full-width {
+    margin: 0 ($mappage-sidebar-padding * -1);
+  }
+
   #site-header {
     // With the exception of the #site-logo child, the rest of
     // #site-header gets entirely hidden behind .nav-wrapper-2
@@ -176,14 +171,6 @@ body.mappage {
     height: $mappage-header-height;
   }
 
-  #site-logo {
-    margin-#{$left}: 1em;
-  }
-
-  #main-nav {
-    margin-#{$right}: 1em;
-  }
-
 //  .nav-menu--main a, .nav-menu--main span {
 //    padding: 1.4em 0.75em 1.35em;
 //  }
@@ -480,6 +467,17 @@ body.twothirdswidthpage {
       }
     }
   }
+
+  @media (max-width: 61em) {
+    // make twothirdswidthpage nearly as small as main
+    // .content: just enough to still fit the sidebar in
+    .content {
+      width:30em;
+      .sticky-sidebar {
+        #{$left}: 32em;
+      }
+    }
+  }
 }
 
 // Centre the login and password change pages,
@@ -976,37 +974,3 @@ textarea.form-error {
     float: $right;
     width: 25%;
 }
-
-/* MEDIA QUERIES */
-@media only screen and (min-width: 48em) and (max-width: 61em) {
-  .container {
-      width: 100%;
-  }
-
-  // Remove central positioning of mainmenu and float right.
-  // Left padding is to ensure no overlap of the site-logo
-  // Background styling replicates header styling
-
-  #main-nav {
-    width: auto;
-    float: $right;
-    padding-#{$left}: 180px;
-  }
-
-  //Revert to mobile use of the .full-width class
-  .full-width{
-    width: auto;
-    margin: 0em -1em;
-  }
-
-  //make twothirdswidthpage nearly as small as main
-  //.content: just enough to still fit the sidebar in
-  body.twothirdswidthpage {
-    .content {
-      width:30em;
-      .sticky-sidebar {
-        #{$left}: 32em;
-      }
-    }
-  }
-}