From 412e99e263bc7fccc0c624384f43f76845f01af2 Mon Sep 17 00:00:00 2001
From: Sean Larkin <sean.larkin@cuw.edu>
Date: Mon, 21 Nov 2016 14:21:09 -0600
Subject: [PATCH 1/4] feat(sidebar): add version in desktop sidebar

---
 components/sidebar/sidebar.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/sidebar/sidebar.jsx b/components/sidebar/sidebar.jsx
index 766f9aade602..b6b9436ea0aa 100644
--- a/components/sidebar/sidebar.jsx
+++ b/components/sidebar/sidebar.jsx
@@ -3,17 +3,17 @@ import SidebarItem from '../sidebar-item/sidebar-item';
 import './sidebar-style';
 
 export default props => {
-  let { sectionName, pages, currentPage } = props;
+  let { sectionName, pages, currentPage, version } = props;
 
   return (
     <nav className="sidebar">
       <div className="sidebar__inner">
+        <h3 className="sidebar--item">Version 2.1</h3>
         <SidebarItem 
           url={ `/${sectionName}` } 
           title="Introduction"
           currentPage= { currentPage }
         />
-
         {
           pages.map(({ url, title, anchors }, i) =>
             <SidebarItem

From 82546e76ceceeb460cf809531e969200be65c16c Mon Sep 17 00:00:00 2001
From: Sean Larkin <sean.larkin@cuw.edu>
Date: Mon, 21 Nov 2016 14:28:41 -0600
Subject: [PATCH 2/4] feat(sidebar): update bottom margin

---
 components/sidebar-item/sidebar-item-style.scss | 4 ++++
 components/sidebar/sidebar.jsx                  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/sidebar-item/sidebar-item-style.scss b/components/sidebar-item/sidebar-item-style.scss
index da29d46ba958..682f5b58b3c9 100644
--- a/components/sidebar-item/sidebar-item-style.scss
+++ b/components/sidebar-item/sidebar-item-style.scss
@@ -34,6 +34,10 @@
     margin: 0.5em 0 1em;
   }
 
+  &__version {
+    margin-bottom: 10px;
+  }
+
   &__anchor {
     margin:0.25em 0;
 
diff --git a/components/sidebar/sidebar.jsx b/components/sidebar/sidebar.jsx
index b6b9436ea0aa..bcf723de2e85 100644
--- a/components/sidebar/sidebar.jsx
+++ b/components/sidebar/sidebar.jsx
@@ -8,7 +8,7 @@ export default props => {
   return (
     <nav className="sidebar">
       <div className="sidebar__inner">
-        <h3 className="sidebar--item">Version 2.1</h3>
+        <h3 className="sidebar-item__version">Version 2.1</h3>
         <SidebarItem 
           url={ `/${sectionName}` } 
           title="Introduction"

From 05ac71f60f69e797fa0cd2e086e72d7b93e359b4 Mon Sep 17 00:00:00 2001
From: Sean Larkin <sean.larkin@cuw.edu>
Date: Mon, 21 Nov 2016 14:34:15 -0600
Subject: [PATCH 3/4] Update sidebar.jsx

remove unused var
---
 components/sidebar/sidebar.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sidebar/sidebar.jsx b/components/sidebar/sidebar.jsx
index bcf723de2e85..78c585128658 100644
--- a/components/sidebar/sidebar.jsx
+++ b/components/sidebar/sidebar.jsx
@@ -3,7 +3,7 @@ import SidebarItem from '../sidebar-item/sidebar-item';
 import './sidebar-style';
 
 export default props => {
-  let { sectionName, pages, currentPage, version } = props;
+  let { sectionName, pages, currentPage } = props;
 
   return (
     <nav className="sidebar">

From fe3fbafa7fbbd34235bdbc0f433beb795c7a659a Mon Sep 17 00:00:00 2001
From: Sean Larkin <sean.larkin@cuw.edu>
Date: Mon, 21 Nov 2016 23:46:41 -0600
Subject: [PATCH 4/4] fix(sidebar): fix index pages missing from section and
 fix layout

---
 .../sidebar-mobile/sidebar-mobile-style.scss  |  9 ++++++
 components/sidebar-mobile/sidebar-mobile.jsx  | 29 +++++++++++++++----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/components/sidebar-mobile/sidebar-mobile-style.scss b/components/sidebar-mobile/sidebar-mobile-style.scss
index b28162a8530b..0d28f68adebe 100644
--- a/components/sidebar-mobile/sidebar-mobile-style.scss
+++ b/components/sidebar-mobile/sidebar-mobile-style.scss
@@ -63,6 +63,15 @@
   text-transform: uppercase;
   color: getColor(mine-shaft);
   margin: 1em 16px 0.25em;
+
+  &--block {
+    display: block;
+  }
+
+  &:active,
+  &--active {
+    color: getColor(malibu);
+  }
 }
 
 .sidebar-mobile__page {
diff --git a/components/sidebar-mobile/sidebar-mobile.jsx b/components/sidebar-mobile/sidebar-mobile.jsx
index 1a6ce8745ee1..4fb118c91765 100644
--- a/components/sidebar-mobile/sidebar-mobile.jsx
+++ b/components/sidebar-mobile/sidebar-mobile.jsx
@@ -58,12 +58,29 @@ export default class SidebarMobile extends React.Component {
    * @return {array} - Markup containing sections and links
    */
   _getSections() {
-    return this.props.sections.map(section => (
-      <div key={ section.url }>
-        <h3 className='sidebar-mobile__section'>{ section.title }</h3>
-        { this._getPages(section.pages) }
-      </div>
-    ));
+    let pathname = '';
+
+    if (typeof window !== 'undefined') {
+      pathname = window.location.pathname;
+    }
+
+    return this.props.sections.map(section => {
+      let active = pathname === section.url || pathname.includes(`/${section.url}`),
+          absoluteUrl = `/${section.url}`;
+      return (
+        <div key={ absoluteUrl }>
+          <Link 
+            className={ `sidebar-mobile__section sidebar-mobile__section--block ${active ? 'sidebar-mobile__section--active' : ''}` } 
+            key={ absoluteUrl }
+            to={ absoluteUrl }
+            onClick={ this._close.bind(this) }>  
+            <h3>{ section.title }</h3>
+          </Link>
+          
+          { this._getPages(section.pages) }
+        </div>
+      );
+    });
   }
 
   /**