dev: move subnav to components

UKHomeOffice · Sep 22, 2017 · a6ca226 · a6ca226
1 parent 4b6697a
commit a6ca226
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss
@@ -26,13 +26,13 @@ $box-shadow:	    0 2px 10px rgba($text-colour, 0.5);
 @import "components/confirm-pages";
 @import "components/tabs-horizontal";
 @import "components/tabs";
+@import "components/navigation";
 
 // Patterns
 @import "patterns/case";
 @import "patterns/header";
 @import "patterns/flashcard";
 @import "patterns/modal";
-@import "patterns/navigation";
 @import "patterns/tasks";
 @import "patterns/timeline";
 @import "patterns/help";

diff --git a/app/assets/sass/patterns/_navigation.scss → app/assets/sass/components/_navigation.scss b/app/assets/sass/patterns/_navigation.scss → app/assets/sass/components/_navigation.scss
diff --git a/app/views/components/confirm-pages.html b/app/views/components/confirm-pages.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 
-{% set active = "patterns" %}
+{% set active = "components" %}
 {% include "includes/top_nav.html" %}
 
 <main id="content" role="main">

diff --git a/app/views/components/highlighting-matches.html b/app/views/components/highlighting-matches.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 
-{% set active = "patterns" %}
+{% set active = "components" %}
 {% include "includes/top_nav.html" %}
 
 <main id="content" role="main">

diff --git a/app/views/components/index.html b/app/views/components/index.html
@@ -52,6 +52,12 @@ <h1 class="heading-section">Components</h1>
           label: "experimental",
           desc: "a list of content/links group into cards for visual clarity"
         },
+        {
+          name: "Sub-navigation",
+          link: "/components/navigation",
+          label: "experimental",
+          desc: "navigate to different sections at any time"
+        },
         {
           name: "Checkboxes",
           link: "/components/checkboxes",

diff --git a/app/views/patterns/navigation.html → app/views/components/navigation.html b/app/views/patterns/navigation.html → app/views/components/navigation.html
@@ -6,13 +6,13 @@
 
 {% block content %}
 
-{% set active = "patterns" %}
+{% set active = "components" %}
 {% include "includes/top_nav.html" %}
 
 <main id="content" role="main">
 
   <div class="banner" role="banner">
-    <h1 class="heading-section">Subnavigation links</h1>
+    <h1 class="heading-section">Sub-navigation links</h1>
     <p class="lede">Navigation items that appear below the service name header.</p>
     <ul class="metadata">
       <li>Usage: external/internal</li>
@@ -26,14 +26,14 @@ <h1 class="heading-section">Subnavigation links</h1>
 
       <div class="example example-images" id="example-component">
         <div class="grid-row">
-          {% include "includes/patterns/navigation.html" %}
+          {% include "includes/components/navigation.html" %}
         </div>
       </div>
       <details>
         <summary>Show code snippet</summary>
         <div class="grid-row">
           <div class="column-full">
-            <pre class="language-markup"><code class="language-markup">{% filter escape %}{% include "includes/patterns/navigation.html" %}{% endfilter %}</code></pre>
+            <pre class="language-markup"><code class="language-markup">{% filter escape %}{% include "includes/components/navigation.html" %}{% endfilter %}</code></pre>
           </div>
         </div>
       </details>

diff --git a/app/views/components/table-multiselect.html b/app/views/components/table-multiselect.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 
-{% set active = "patterns" %}
+{% set active = "components" %}
 {% include "includes/top_nav.html" %}
 
 <main id="content" role="main">

diff --git a/app/views/components/tabs.html b/app/views/components/tabs.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 
-{% set active = "patterns" %}
+{% set active = "components" %}
 {% include "includes/top_nav.html" %}
 
 <main id="content" role="main">

diff --git a/app/views/includes/patterns/navigation.html → ...views/includes/components/navigation.html b/app/views/includes/patterns/navigation.html → ...views/includes/components/navigation.html
diff --git a/app/views/patterns/index.html b/app/views/patterns/index.html
@@ -46,12 +46,6 @@ <h1 class="heading-section">Patterns</h1>
           label: "experimental",
           desc: "time-ordered activity showing the history of a person or object with additional context"
         },
-        {
-          name: "Subnavigation links",
-          link: "/patterns/navigation",
-          label: "experimental",
-          desc: "navigate to different sections at any time"
-        },
         {
           name: "Modal window",
           link: "/patterns/modal",