From d04fbb80a9bf5d62dae669468c2c13045e8de5c1 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Mon, 4 Apr 2016 17:29:38 +0100
Subject: Remove user-meta; "Your reports" to "Your account"

---
 web/cobrands/angus/base.scss              |  4 +-
 web/cobrands/angus/layout.scss            | 27 ----------
 web/cobrands/bromley/layout.scss          | 26 ----------
 web/cobrands/greenwich/base.scss          |  2 +-
 web/cobrands/greenwich/layout.scss        |  9 ----
 web/cobrands/harrogate/layout.scss        | 16 ------
 web/cobrands/oxfordshire/layout.scss      | 22 +-------
 web/cobrands/oxfordshire/oxfordshire.scss | 10 ----
 web/cobrands/sass/_base.scss              | 28 +++-------
 web/cobrands/sass/_layout.scss            | 86 -------------------------------
 web/cobrands/stevenage/layout.scss        |  7 +--
 11 files changed, 13 insertions(+), 224 deletions(-)

(limited to 'web')

diff --git a/web/cobrands/angus/base.scss b/web/cobrands/angus/base.scss
index 54e9b25b3..efe540630 100644
--- a/web/cobrands/angus/base.scss
+++ b/web/cobrands/angus/base.scss
@@ -26,7 +26,7 @@ body.frontpage #site-logo,
     }
 }
 
-.item-list--reports__item, #user-meta p, #front-main #postcodeForm {
+.item-list--reports__item, #front-main #postcodeForm {
 //    background-color: $greenwich_light_grey;
 }
 
@@ -61,4 +61,4 @@ label[for=pc] {
     margin: 0 0.3em 0 0.2em;
     border-radius: 100%;
     vertical-align: -2px;
-}
\ No newline at end of file
+}
diff --git a/web/cobrands/angus/layout.scss b/web/cobrands/angus/layout.scss
index 7a129c3cf..35d629400 100644
--- a/web/cobrands/angus/layout.scss
+++ b/web/cobrands/angus/layout.scss
@@ -165,17 +165,6 @@ body.frontpage {
       background-color: $base_bg;
     }
   }
-  #user-meta p {
-    right: -119px;
-    top: -93px;
-    margin: 0;
-    padding: 0;
-    color: $base_bg;
-
-    a {
-      position: static;
-    }
-  }
 }
 
 body.twothirdswidthpage .content .sticky-sidebar {
@@ -378,16 +367,6 @@ body.mappage {
     }
   }
 
-  #user-meta {
-    p {
-      color: $primary_text;
-    }
-
-    & ~ .container .content {
-      padding-top: 3.5em; // make room for user menu!
-    }
-  }
-
   #category_meta h4 {
     display: none;
   }
@@ -399,12 +378,6 @@ body.mappage {
   }
 }
 
-#user-meta p {
-  top: 6em;
-  left: -6em;
-  color: $angus_light_grey;
-}
-
 .angus_footer {
   border-top: solid 8px $angus_grey;
   background: $angus_dark_grey;
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index ed3ba193f..27bd45889 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -64,32 +64,6 @@ body.alertindex form.full-width {
   margin-left: 0;
 }
 
-// Override the little banner you get when you're logged in on the map page
-// because FMS makes it a different colour and moves it over to the left.
-body.mappage #user-meta p {
-  background-color: $bromley_blue;
-  border-bottom: 1px solid #444;
-}
-
-// And also override the banner on other pages so that it lines up properly
-#user-meta, body.mappage #user-meta {
-  max-width: 1200px;
-}
-#user-meta p,
-body.frontpage #user-meta p {
-  top: 0;
-  right: auto;
-  background-color: $bromley_blue;
-  color: #fff;
-  box-shadow: none;
-}
-
-// Because we've moved the user-meta, we also have to move the #front-main div
-// down a bit so that it shows the #user-meta
-#front-main {
-  margin-top:3em
-}
-
 // The page h1 needs to be white on desktop, because it's in a blue box
 h1.main {
   color: #fff;
diff --git a/web/cobrands/greenwich/base.scss b/web/cobrands/greenwich/base.scss
index 69b9db052..8b665501c 100644
--- a/web/cobrands/greenwich/base.scss
+++ b/web/cobrands/greenwich/base.scss
@@ -29,7 +29,7 @@ body.frontpage #site-logo,
     background-size: cover;
 }
 
-.item-list--reports__item, #user-meta p, #front-main #postcodeForm {
+.item-list--reports__item, #front-main #postcodeForm {
     background-color: $greenwich_light_grey;
 }
 
diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss
index eff3f854e..df572341e 100644
--- a/web/cobrands/greenwich/layout.scss
+++ b/web/cobrands/greenwich/layout.scss
@@ -68,10 +68,6 @@ body.frontpage #site-header, #site-header {
 }
 
 body.frontpage {
-    #user-meta p {
-        top: -9em;
-    }
-
     .item-list--reports__item {
         border-left: solid 4px $primary;
     }
@@ -83,11 +79,6 @@ body.frontpage {
     }
 }
 
-body.twothirdswidthpage #user-meta p {
-    padding-bottom: 0;
-    z-index: 2;
-}
-
 .nav-wrapper .nav-wrapper-2 {
     border-top: none;
 }
diff --git a/web/cobrands/harrogate/layout.scss b/web/cobrands/harrogate/layout.scss
index 904a707b1..82be53820 100644
--- a/web/cobrands/harrogate/layout.scss
+++ b/web/cobrands/harrogate/layout.scss
@@ -39,10 +39,6 @@ $mappage-header-height: 10em;
     body.fullwidthpage .container .content footer .tablewrapper a:visited {
         color: white;
     }
-
-    body.mappage #user-meta+.container .content {
-        padding-top: 1.5em;
-    }
 }
 
 #main-nav {
@@ -123,18 +119,6 @@ body.mappage .nav-wrapper .nav-wrapper-2 {
 
 }
 
-body.frontpage #user-meta p {
-    top: -2.4em;
-}
-
-body.mappage #user-meta {
-    top: 2em;
-    p {
-        background: $primary;
-        border-color: $primary_dark;
-    }
-}
-
 body.mappage .content {
     margin-top: 4em;
 }
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index b6446e38c..bc78a8681 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -28,8 +28,7 @@ body, body a {
 }
 
 // Currently hide the nav-wrapper, because it's in going into Oxfordshire's own nav
-// likewise with user-meta
-.nav-wrapper, #user-meta {
+.nav-wrapper {
     display: none;
 }
 
@@ -158,25 +157,6 @@ body.mappage {
         }
       }
     }
-
-    .oxford-user {
-      display: block;
-      font-size: 13px;
-      margin: 0;
-      color: mix(#ddd, #069b01, 80%);
-
-      p {
-          margin: 0;
-          padding-top: ($mappage-header-height - 20px) / 2;
-          padding-bottom: ($mappage-header-height - 20px) / 2;
-          line-height: 20px;
-      }
-
-      a {
-        padding: 0 10px;
-        text-decoration: none;
-      }
-    }
   }
 
   .wrapper .table-cell {
diff --git a/web/cobrands/oxfordshire/oxfordshire.scss b/web/cobrands/oxfordshire/oxfordshire.scss
index 46de1f22b..20a38ac7f 100644
--- a/web/cobrands/oxfordshire/oxfordshire.scss
+++ b/web/cobrands/oxfordshire/oxfordshire.scss
@@ -64,16 +64,6 @@ body {
       margin: 0px 5px 0px 5px
     }
   }
-  .oxford-user {
-    float: right;
-    p {
-      padding: 0.25em;
-      margin: 0.5em 0;
-      a {
-        margin: 0 0.5em;
-      }
-    }
-  }
 }
 
 #oxford-main-menu {
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index dfe03ebf1..822739cda 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -554,27 +554,6 @@ body.mappage .wrapper {
   position: static;
 }
 
-// this is the user's logged in details or the login link etc
-#user-meta {
-  p {
-    position: relative;
-    color: $primary_text;
-    background: $primary;
-    padding: flip(1em 6em 1em 1em, 1em 1em 1em 6em);
-    a {
-      position: absolute;
-      #{$right}: 1em;
-      @include inline-block;
-      text-transform:uppercase;
-      font-size:0.75em;
-      background:#333;
-      padding:0.25em 0.75em;
-      color:#fff;
-      @include border-radius(0.25em);
-    }
-  }
-}
-
 
 // #key-tools is the list that's pulled out an stick to the bottom of the page of desktop, below is mostly just aesthetic
 .shadow-wrap {
@@ -1817,6 +1796,13 @@ table.nicetable {
   }
 }
 
+.my-account-buttons a {
+  display: inline-block;
+  background: #f6f6f6;
+  padding: 0.5em 1em;
+  border-radius: 0.2em;
+}
+
 
 @media screen {
   .print-only {
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index e0913b0ee..c0c213be1 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -296,32 +296,6 @@ body.mappage {
     margin: 0.9em 0.25em 0.85em;
   }
 
-  #user-meta {
-    max-width: none;
-    p {
-      display: block;
-      height: auto;
-      width: 22.2em; // 27em (.content width) - 2em (.content padding) - 6em - 0.8em
-      padding: flip(0.5em 6em 0.5em 0.8em, 0.5em 0.8em 0.5em 6em);
-      top: 0;
-      #{$left}: 0;
-      z-index: 1;
-      box-shadow: none;
-      background: #FCEA9A;
-      border-bottom: 1px solid #ffd000;
-
-      a {
-        // move the "Sign out" link in and down a bit, because of extra padding on parent
-        top: 0.8em;
-        #{$right}: 0.8em;
-      }
-    }
-
-    & + .container .content {
-      padding-top: 3.5em; // make room for user menu!
-    }
-  }
-
   .banner {
     p {
       top: -2.1em; // a few pixels lower than default
@@ -346,9 +320,6 @@ body.mappage {
     #site-logo {
       position: absolute;
     }
-    #user-meta {
-      margin-#{$left}: 2em;
-    }
   }
 }
 //ie8 needs different stuff on .nav-wrapper so we
@@ -715,45 +686,6 @@ body.authpage {
     }
 }
 
-// log in bit, pokes above the .content div
-#user-meta{
-  display:block;
-  position: relative;
-  max-width: 60em;
-  margin: 0 auto;
-  p {
-    @include inline-block;
-    position: absolute;
-    top: 1em;
-    #{$left}: 1em;
-    height:2em;
-    padding: flip(0.25em 6em 0.5em 0.5em, 0.25em 0.5em 0.5em 6em);
-    @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px);
-    a {
-      top:0.5em;
-      #{$right}: 0.5em;
-      font-size:0.6875em;
-      padding:0.5em 0.75em;
-      line-height:1em;
-      &:hover {
-        text-decoration:none;
-        background:#444;
-      }
-    }
-  }
-}
-.ie6, .ie7 {
-  #user-meta {
-    z-index:1;
-    p {
-      top:-2em;
-    }
-  }
-}
-.ie6 #user-meta {
-  width: 60em; //ie6 doesn't like max-width
-}
-
 
 // Wraps around #key-tools box - sticks to the bottom of the screen on desktop
 .shadow-wrap {
@@ -967,24 +899,6 @@ body.frontpage {
     height: 60px;
     background: url($image-sprite) -2px -108px no-repeat;
   }
-  #user-meta {
-    z-index:10;
-    p {
-      top: -4em;
-      #{$left}: auto;
-      #{$right}: 0;
-      color:$primary;
-      background:none;
-      @include box-shadow(rgba(0, 0, 0, 0) 0 0 0);
-      a {
-        background:#fff;
-        color:#1a1a1a;
-        &:hover {
-          background:#ddd;
-        }
-      }
-    }
-  }
 }
 //logo fix
 .iel8 {
diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss
index 19dc38470..76e2f92b8 100644
--- a/web/cobrands/stevenage/layout.scss
+++ b/web/cobrands/stevenage/layout.scss
@@ -106,11 +106,8 @@ body.frontpage {
     .nav-wrapper-2 {
         height: auto;
     }
-    // 1162d5c8 - Changed the colour of the user text when you're logged in to be more readable
-    #user-meta {
-        p {
-            color: #fff;
-        }
+    #site-header {
+        height: auto;
     }
 }
 
-- 
cgit v1.2.3