Skip to content

Commit

Permalink
dev: move subnav to components
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael committed Sep 22, 2017
1 parent 4b6697a commit a6ca226
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion app/assets/sass/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion app/views/components/confirm-pages.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{% block content %}

{% set active = "patterns" %}
{% set active = "components" %}
{% include "includes/top_nav.html" %}

<main id="content" role="main">
Expand Down
2 changes: 1 addition & 1 deletion app/views/components/highlighting-matches.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{% block content %}

{% set active = "patterns" %}
{% set active = "components" %}
{% include "includes/top_nav.html" %}

<main id="content" role="main">
Expand Down
6 changes: 6 additions & 0 deletions app/views/components/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/views/components/table-multiselect.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{% block content %}

{% set active = "patterns" %}
{% set active = "components" %}
{% include "includes/top_nav.html" %}

<main id="content" role="main">
Expand Down
2 changes: 1 addition & 1 deletion app/views/components/tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{% block content %}

{% set active = "patterns" %}
{% set active = "components" %}
{% include "includes/top_nav.html" %}

<main id="content" role="main">
Expand Down
File renamed without changes.
6 changes: 0 additions & 6 deletions app/views/patterns/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit a6ca226

Please sign in to comment.