Always show sidebar navigation

This change always includes the side navigation on
the left. Previously it was hidden if there was
additional content supplied by a custom sidebar
extension. This is now shown additionally above
the navigation itself.

static/scss/_page.scss

@@ -43,12 +43,24 @@
       nav {
         display: none;
 
+        #side-nav {
+          width: 100%;
+        }
+
+        #outer-nav{
+          overflow: hidden;
+          height: 100%;
+        }
+
         @media (min-width: $screen-md-min) {
           display: block;
-          height: 90vh;
+          height: 60vh;
+
 
           &.mm-menu {
             background-color: $body-bg;
+            height: 30vh;
+
 
             .mm-prev:before {
               left: 8px;

templates/cms_twocolumn.html

@@ -3,10 +3,12 @@
 
 {% block body %}
 <div>
-  <nav id="side-nav">
+  <nav id='outer-nav'>
     {% static_placeholder "sitewide sidebar" %}
-    {% include 'includes/sidebar.html' %}
     {% placeholder "sidebar" inherit %}
+    <nav id="side-nav">
+      {% include 'includes/sidebar.html' %}
+    </nav>
   </nav>
   <article>
     {% placeholder "main" %}

templates/includes/sidebar.html

@@ -1,7 +1,5 @@
 {% load menu_tags %}
 {% load i18n %}
-{% if request.current_page.get_descendant_count > 0 and not request.current_page.sidebarextension %}
 <ul>
   {% include 'includes/nav.html' %}
 </ul>
-{% endif %}