Skip to content

Commit

Permalink
Roadmap update
Browse files Browse the repository at this point in the history
  • Loading branch information
ediblecode committed Aug 16, 2016
1 parent 436ce38 commit a5a7c82
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 14 deletions.
12 changes: 12 additions & 0 deletions web/server/views/about/_about-layout.njk
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
{% extends "../layouts/_sidebar.njk" %}
{% set breadcrumbs = [{ title: "About", href: "/about/" }, { title: title }] %}
{% set title = title + " | About" %}

{% block sidebar %}

<nav role="navigation">
<ul>
<li><a href="/about/">About</a></li>
<li><a href="/about/installation">Installation</a></li>
<li><a href="/about/roadmap">Roadmap</a></li>
</ul>
</nav>

{% endblock %}
2 changes: 1 addition & 1 deletion web/server/views/about/installation.njk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "./_about-layout.njk" %}
{% set title = "Installation" %}

{% block body %}
{% block main %}

<div class="container">
<h1>Installation</h1>
Expand Down
22 changes: 12 additions & 10 deletions web/server/views/about/roadmap.njk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "./_about-layout.njk" %}
{% set title = "Roadmap" %}

{% block body %}
{% block main %}

<div class="container">
<h1>Roadmap</h1>
Expand Down Expand Up @@ -29,21 +29,23 @@
<div class="grid__item one-whole palm--one-half tablet--one-third desktop--one-quarter">
<h3 class="h5">Components</h3>
<ul>
<li><s>Typography</s></li>
<li><s>Grid</s></li>
<li><s>Buttons</s></li>
<li><s>Breadcrumbs</s></li>
<li><s>Alpha/beta banners</s></li>
<li><a href="/style-guide/typography"><s>Typography</s></a></li>
<li><a href="/style-guide/layout"><s>Grid</s></a></li>
<li><a href="/style-guide/buttons"><s>Buttons</s></a></li>
<li><a href="/components/breadcrumbs"><s>Breadcrumbs</s></a></li>
<li><a href="/components/alpha-beta-live"><s>Alpha/beta/live banners</s></a></li>
<li>Navigation</li>
<li>Alerts - info/error/warning</li>
<li>Cookie message</li>
</ul>
</div>
<div class="grid__item one-whole palm--one-half tablet--one-third desktop--one-quarter">
<h3 class="h5">Content</h3>
<ul>
<li>Colour documentation</li>
<li><s>Grid examples</s></li>
<li><s>SASS coding standards</s></li>
<li>SASSDoc generated pages</li>
<li><a href="/style-guide/colour"><s>Colour documentation</s></a></li>
<li><a href="/style-guide/layout"><s>Grid examples</s></a></li>
<li><a href="/sass/code-standards"><s>SASS coding standards</s></a></li>
<li><a href="/sass/docs">SASSDoc generated pages</a></li>
</ul>
</div>
<div class="grid__item one-whole palm--one-half tablet--one-third desktop--one-quarter">
Expand Down
14 changes: 14 additions & 0 deletions web/server/views/components/_components-layout.njk
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
{% extends "../layouts/_sidebar.njk" %}
{% set breadcrumbs = [{ title: "UI Components", href: "/components/" }, { title: title }] %}
{% set title = title + " | UI Components" %}

{% block sidebar %}

<nav role="navigation">
<ul>
<li><a href="/components/">Components</a></li>
<li><a href="/components/alpha-beta-live">Alpha/beta/live</a></li>
<li><a href="/components/breadcrumbs">Breadcrumbs</a></li>
<li><a href="/components/navigation">Navigation</a></li>
<li><a href="/components/tabs">Tabs</a></li>
</ul>
</nav>

{% endblock %}
2 changes: 1 addition & 1 deletion web/server/views/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

{{ item("Tabs", "/components/tabs", "Content is separated into different panes, with only one pane viewable at a time.") }}

{{ item("Alpha/beta", "/components/alpha-beta-live", "Phase tags and banner to denote alpha and beta services") }}
{{ item("Alpha/beta/live", "/components/alpha-beta-live", "Phase tags and banner to denote alpha and beta services") }}

{{ item("Navigation", "/components/navigation", "Lorem ipsum dolor sit amet, consectetur adipisicing elit.") }}

Expand Down
11 changes: 9 additions & 2 deletions web/server/views/layouts/_sidebar.njk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="grid">

{# Sidebar #}
<aside class="grid__item one-whole tablet--one-third desktop--one-quarter" role="complementary">
<aside class="grid__item one-whole tablet--one-third desktop--one-fifth" role="complementary">
{% block sidebar %}

<nav>
Expand Down Expand Up @@ -42,13 +42,20 @@
<ul>
<li><a href="/javascript/docs">Documentation</a></li>
</ul>
<h5>
<a href="/about/">About</a>
</h5>
<ul>
<li><a href="/about/roadmap">Roadmap</a></li>
<li><a href="/about/installation">Installation</a></li>
</ul>
</nav>

{% endblock %}
</aside>

{# Main container #}
<article class="grid__item one-whole tablet--two-thirds desktop--three-quarters" role="main">
<article class="grid__item one-whole tablet--two-thirds desktop--four-fifths" role="main">
{% block main %}
Default body content
{% endblock %}
Expand Down

0 comments on commit a5a7c82

Please sign in to comment.