From e526852f5371a649a376fd0af2a5bcf44a34323c Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 11 Apr 2016 10:40:32 +0100
Subject: [PATCH] Remove keylines from nav
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We have lots of keylines in our pages, eg tables, email message previews

This makes the pages look quite cluttered, especially because the
keylines don’t always align.

I think it looks much cleaner without the keylines in the nav, and we
have few enough nav items that we don’t need to chunk them up.
---
 .../stylesheets/components/navigation.scss       |  7 +------
 app/templates/main_nav.html                      | 16 +++-------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss
index d0093bd11..232c334c8 100644
--- a/app/assets/stylesheets/components/navigation.scss
+++ b/app/assets/stylesheets/components/navigation.scss
@@ -1,6 +1,6 @@
 .navigation {
 
-  padding: 20px 0 0 0;
+  padding: $gutter-two-thirds $gutter-half 0 0;
 
   ul,
   h2 {
@@ -9,11 +9,6 @@
     list-style-type: none;
   }
 
-  ul {
-    border-bottom: 1px solid $border-colour;
-    padding: 0 0 10px 0;
-  }
-
   h2 {
     font-weight: bold;
     margin-bottom: 10px;
diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html
index 705c7ec4a..923aaa781 100644
--- a/app/templates/main_nav.html
+++ b/app/templates/main_nav.html
@@ -2,35 +2,25 @@
   <h2 class="navigation-service-name">
     <a href="{{ url_for('.service_dashboard', service_id=current_service.id) }}">{{ current_service.name }}</a>
   </h2>
-  {% if current_user.has_permissions(['view_activity'], admin_override=True) %}
   <ul>
+  {% if current_user.has_permissions(['view_activity'], admin_override=True) %}
     <li><a href="{{ url_for('.view_notifications', service_id=current_service.id, page=1) }}">Activity</a></li>
-  </ul>
   {% endif %}
   {% if current_user.has_permissions(['view_activity', 'manage_templates', 'manage_api_keys'], admin_override=True, any_=True) %}
-  <ul>
     <li><a href="{{ url_for('.choose_template', service_id=current_service.id, template_type='sms') }}">Text message templates</a></li>
     <li><a href="{{ url_for('.choose_template', service_id=current_service.id, template_type='email') }}">Email templates</a></li>
-  </ul>
   {% endif %}
   {% if current_user.has_permissions(['manage_users', 'manage_settings'], admin_override=True) %}
-  <ul>
     <li><a href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
     <li><a href="{{ url_for('.service_settings', service_id=current_service.id) }}">Settings</a></li>
-  </ul>
   {% elif current_user.has_permissions(['view_activity']) %}
-  <ul>
     <li><a href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
-  </ul>
   {% endif %}
   {% if current_user.has_permissions(['manage_api_keys']) %}
-  <ul>
     <li><a href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a></li>
-  </ul>
   {% endif %}
   {% if current_user.has_permissions(admin_override=True) %}
-    <ul>
-      <li><a href="{{ url_for('.show_all_services') }}"> List all services </a></li>
-    </ul>
+    <li><a href="{{ url_for('.show_all_services') }}"> List all services </a></li>
   {% endif %}
+  </ul>
 </nav>