From 4e0ba0c9ed5a372c86a04ff27ef6fd6099a02ce7 Mon Sep 17 00:00:00 2001
From: Ari Chivukula <ari.c@me.com>
Date: Fri, 23 Mar 2018 06:57:33 -0400
Subject: [PATCH 1/4] Add option for sticky subnav to pages

---
 _layouts/page.html              | 2 +-
 _sass/components/_side-nav.scss | 5 +++++
 demo/page.md                    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/_layouts/page.html b/_layouts/page.html
index 30e14bad4..dabb924ae 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -5,7 +5,7 @@
 ---
 {% assign sidenav = site.data.navigation[page.sidenav] | default: page.sidenav %}
 {% if sidenav %}
-<aside class="usa-layout-docs-sidenav sidenav">
+<aside class="usa-layout-docs-sidenav sidenav {% if page.sticky_sidenav %}usa-sticky-sidenav{% endif %}">
   {% include sidenav.html links=sidenav %}
 </aside>
 
diff --git a/_sass/components/_side-nav.scss b/_sass/components/_side-nav.scss
index 69f60b79c..a34709bf2 100644
--- a/_sass/components/_side-nav.scss
+++ b/_sass/components/_side-nav.scss
@@ -1,3 +1,8 @@
+.usa-sticky-sidenav {
+  position: sticky;
+  top: 1rem;
+}
+
 .usa-sidenav-list {
   @if variable-exists(side-nav-bg) {
     background-color: $side-nav-bg;
diff --git a/demo/page.md b/demo/page.md
index 50804d969..90f8ab509 100644
--- a/demo/page.md
+++ b/demo/page.md
@@ -4,6 +4,7 @@ permalink: /docs/
 
 layout: post
 sidenav: docs
+sticky_sidenav: true
 subnav:
   - text: Section one
     href: '#section-one'
@@ -34,4 +35,3 @@ This is some more [content](https://18f.gsa.gov/).
 ###### Section six
 
 This is some more [content](https://18f.gsa.gov/).
-

From f1d9efef9981c5e27a965711765eb001adf0e7ed Mon Sep 17 00:00:00 2001
From: Ari Chivukula <ari@dds.mil>
Date: Fri, 30 Mar 2018 04:42:37 -0400
Subject: [PATCH 2/4] Add to other pages with sidenavs

---
 _layouts/project.html     | 2 +-
 _layouts/team-member.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_layouts/project.html b/_layouts/project.html
index f3d474949..6a68f5ad7 100644
--- a/_layouts/project.html
+++ b/_layouts/project.html
@@ -3,7 +3,7 @@
 ---
 
 
-<aside class="usa-layout-docs-sidenav sidenav">
+<aside class="usa-layout-docs-sidenav sidenav {% if page.sticky_sidenav %}usa-sticky-sidenav{% endif %}">
   <ul class="usa-sidenav-list">
     {% for item in site.projects %}
       <li>
diff --git a/_layouts/team-member.html b/_layouts/team-member.html
index 6915fb8c9..ba209570d 100644
--- a/_layouts/team-member.html
+++ b/_layouts/team-member.html
@@ -3,7 +3,7 @@
 ---
 
 
-<aside class="usa-layout-docs-sidenav sidenav">
+<aside class="usa-layout-docs-sidenav sidenav {% if page.sticky_sidenav %}usa-sticky-sidenav{% endif %}">
   <ul class="usa-sidenav-list">
     {% for item in site.team %}
       <li>

From 3c0030446c77bd1aaefdf6a92fb19df10fe437a7 Mon Sep 17 00:00:00 2001
From: "Ari Chivukula (USDS)" <ari@dds.mil>
Date: Wed, 4 Apr 2018 11:34:14 -0400
Subject: [PATCH 3/4] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 8f8fb67a9..9d822810e 100644
--- a/README.md
+++ b/README.md
@@ -226,6 +226,8 @@ redcarpet:
     - with_toc_data
 ```
 
+**Pro tip:** If you're like us and prefer your navigation sticky, you can add `sticky_sidenav: true` on [page](#layout-page), [project](#layout-project), and [team member](#layout-team-member) layouts to have the sidenav follow as you scroll.
+
 ### Color and font configuration
 
 The default colors and fonts can be configured in the `_data/theme.yml` file.

From e14048f4694ffc3f7366e51af152b58777295395 Mon Sep 17 00:00:00 2001
From: "Ari Chivukula (USDS)" <ari@dds.mil>
Date: Thu, 5 Apr 2018 10:45:59 -0400
Subject: [PATCH 4/4] Update page.md

---
 demo/page.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demo/page.md b/demo/page.md
index 90f8ab509..e21571849 100644
--- a/demo/page.md
+++ b/demo/page.md
@@ -4,7 +4,6 @@ permalink: /docs/
 
 layout: post
 sidenav: docs
-sticky_sidenav: true
 subnav:
   - text: Section one
     href: '#section-one'