Merge pull request #34 from alphagov/quarter-width-nav

Make navigation column 1/4 width

app/assets/stylesheets/_grids.scss

@@ -0,0 +1,7 @@
+.column-one-quarter {
+  @include grid-column(1/4);
+}
+
+.column-three-quarters {
+  @include grid-column(3/4);
+}

app/assets/stylesheets/app.scss

@@ -40,20 +40,10 @@
   }
 }
 
-
-
 #global-header #logo {
-      white-space: nowrap;
+  white-space: nowrap;
 }
 
-
-.column-three-quarters {
-  @include grid-column(3/4);
-}
-
-
-
-
 a:visited {
-    color: #005ea5;
+  color: $link-colour;
 }

app/assets/stylesheets/components/navigation.scss

@@ -1,23 +1,26 @@
-#navigation {
-  padding: 50px 0 0 0;
-}
+.navigation {
 
-#navigation li {
-  @include core-16();
-  margin: 3px 0;
-}
+  padding: $gutter 0 0 0;
 
-#navigation ul {
-  border-bottom: 1px solid #777;
-  margin: 0 20px 0 0;
-  list-style-type: none;
-  padding: 0;
-}
+  li {
+    @include core-16();
+    margin: 3px 0;
+  }
 
-#navigation a:link,a:visited {
-  text-decoration: none;
-}
+  ul {
+    border-bottom: 1px solid $border-colour;
+    margin: 0 20px 0 0;
+    list-style-type: none;
+    padding: 0;
+  }
 
-#navigation a:hover {
-    color: #2e8aca;
-}
+  a:link,
+  a:visited {
+    text-decoration: none;
+  }
+
+  a:hover {
+    color: $link-hover-colour;
+  }
+
+}

app/assets/stylesheets/main.scss

@@ -28,6 +28,7 @@
 @import '../govuk_elements/public/sass/elements/tables';
 
 // Specific to this application
+@import 'grids';
 @import 'components/template-picker';
 @import 'components/placeholder';
 @import 'components/sms-message';

app/templates/main_nav.html

@@ -1,5 +1,4 @@
-{% macro main_nav() %}
-  <nav id="navigation">
+<nav class="navigation">
   <h3><a href="{{ url_for('.dashboard') }}">Service name</a></h3>
   <ul>
     <li><a href="{{ url_for('.sendsms') }}">Send text messages</a></li>
@@ -16,5 +15,4 @@
   <ul>
     <li><a href="/user-profile">Your details</a></li>
   </ul>
-  </nav>
-{% endmacro %}
+</nav>

app/templates/withnav_template.html

@@ -3,10 +3,10 @@
 
 {% block fullwidth_content %}
 	<div class="grid-row">
-	  <div class="column-third">
-	    {{ main_nav() }}
+	  <div class="column-one-quarter">
+	    {% include "main_nav.html" %}
 	  </div>
-	  <div class="column-two-thirds">
+	  <div class="column-three-quarters">
 	    {% block maincolumn_content %}{% endblock %}
 	  </div>
 	</div>