From 732efd25c7a1ff3ecb41ae3c0059a75a75c476c1 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 11 Jan 2016 16:20:32 +0000
Subject: [PATCH] Refactor markup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Strips it down to only what’s necessary

As a separate commit for easier diffing.
---
 .../stylesheets/components/switcher.scss      | 70 ++++---------------
 app/templates/admin_template.html             | 24 +++----
 2 files changed, 25 insertions(+), 69 deletions(-)

diff --git a/app/assets/stylesheets/components/switcher.scss b/app/assets/stylesheets/components/switcher.scss
index 89399c34d..72817edff 100644
--- a/app/assets/stylesheets/components/switcher.scss
+++ b/app/assets/stylesheets/components/switcher.scss
@@ -1,67 +1,27 @@
+.management-navigation {
 
-#user-bar {
-  border-bottom: 1px solid #bfc1c3;
-  max-width: 960px;
-  margin: 0 15px;
+  @extend %site-width-container;
   @include core-19();
-  padding: 10px 0 8px 0; 
+  border-bottom: 1px solid $border-colour;
+  padding: 10px 0 8px;
 
   a:link,
   a:visited {
     text-decoration: none;
   }
 
-  span a:hover {
-    color: $link-hover-colour;
-  }
+  &-account {
+
+    @include media(tablet) {
+
+      text-align: right;
+
+      a {
+        margin-left: 20px;
+      }
+
+    }
 
   }
-  @media (min-width: 641px) {
-    #user-bar {
-      margin: 0 30px;
-      line-height: 1.25; } }
-  @media (min-width: 1020px) {
-    #user-bar {
-      margin: 0 auto; } }
-
-
-#service-switcher {
-}
-
-#user-name {
-  margin: 0 20px 0 0;
-}
-
-#user-admin {
-}
-@media (min-width: 641px) {
-  #user-admin {
-  display: block;
-  float: right;
-  } }
-
-
-#service-nav {
-  // display: none;
-  @include core-19();
-  list-style: none;
-  ul li {
-   display: block;position: relative;float: left;
-  }
 
 }
-
-#service-arrow-right {
-  display:none;
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index c7149bb59..5e91e6cb1 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -48,22 +48,18 @@
 {% block content %}
 
   {% if current_user.is_authenticated() %}
-    <nav id="user-bar">
-      <span id="service-switcher">
-        <a id="toggle-service-switcher" href="#">
-          <span id="service-arrow-right">&blacktriangleright;</span>
-          <span id="service-arrow-down">&blacktriangledown;</span>
+    <nav class="management-navigation">
+      <div class="grid-row">
+        <div class="column-half">
           Service name
-        </a>
-      </span>
-      <div id="user-admin">
-        <span id="user-name"><a href="{{ url_for('.userprofile') }}">{{ current_user.name }}</a></span>
-        <span id="sign-out"><a href="{{ url_for('main.sign_out')}}">Sign out</a></span>
+          <a href="#">Switch to A N Other service</a>
+          <a href="#">Add a new service to Notify…</a>
+        </div>
+        <div class="column-half management-navigation-account">
+          <a href="{{ url_for('.userprofile') }}">{{ current_user.name }}</a>
+          <a href="{{ url_for('main.sign_out')}}">Sign out</a>
+        </div>
       </div>
-      <ul id="service-nav">
-        <li><a href="#">Switch to A N Other service</a></li>
-        <li><a href="#">Add a new service to Notify</a></li>
-      </ul>
     </nav>
   {% endif %}