Final changes to RTD theme before merge

Jordan Cheney
1 parent 4a25f0a0
Showing 4 changed files with 111 additions and 85 deletions
docs/mkdocs.yml
docs/themes/readthedocs/base.html
docs/themes/readthedocs/css/theme_extra.css
docs/themes/readthedocs/toc.html → docs/themes/readthedocs/nav.html
@@ -4,8 +4,8 @@ site_favicon: docs/img/openbr.ico
 copyright: 2012 The MITRE Corporation
 theme: readthedocs
-#theme_dir: themes/readthedocs/
-theme_dir: themes/materialize
+theme_dir: themes/readthedocs/
+#theme_dir: themes/materialize
 include_next_prev: False
@@ -46,70 +46,71 @@
 </head>
 <body class="wy-body-for-nav" role="document">
+    <div class="wy-grid-for-nav">
+        {# SIDE NAV, TOGGLES ON MOBILE #}
+        <nav data-toggle="wy-nav-shift" class="wy-nav-side stickynav">
+            <div class="wy-side-nav-search">
+                <a href="{{ homepage_url }}" class="icon icon-home"> {{ site_name }}</a>
+                {% include "searchbox.html" %}
+            </div>
-  <div class="wy-grid-for-nav">
-
-    {# SIDE NAV, TOGGLES ON MOBILE #}
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side stickynav">
-      <div class="wy-side-nav-search">
-        <a href="{{ homepage_url }}" class="icon icon-home"> {{ site_name }}</a>
-        {% include "searchbox.html" %}
-      </div>
-
-      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-        <ul class="current">
-          {% for nav_item in nav %}
-            <li>{% include "toc.html" %}<li>
-          {% endfor %}
-        </ul>
-      </div>
-      &nbsp;
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="{{ homepage_url }}">{{ site_name }}</a>
-      </nav>
-
-      {# PAGE CONTENT #}
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          {% include "breadcrumbs.html" %}
-          <div role="main">
-            <div class="section">
-              {% block content %}
-                {{ content }}
-              {% endblock %}
+            <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+                <ul class="current">
+                    {% for nav_item in nav %}
+                        <li>{% include "nav.html" %}<li>
+                    {% endfor %}
+                </ul>
+            </div>
+            &nbsp;
+        </nav>
+
+        <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+            {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
+            <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+                <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+                <a href="{{ homepage_url }}">{{ site_name }}</a>
+            </nav>
+
+            {# PAGE CONTENT #}
+            <div class="wy-nav-content">
+                <div class="rst-content">
+                    {% include "breadcrumbs.html" %}
+
+                    <div role="main">
+                        <div class="section">
+                            {% block content %}
+                                <div class="toc" data-spy="affix" role="navigation" aria-label="main navigation">
+                                    <ul class="current">
+                                        <span>Table of Contents</span>
+                                        <ul>
+                                            {% for toc_item in toc %}
+                                                <li><a href="{{ toc_item.url }}"><span>{{ toc_item.title }}</span></a></li>
+                                            {% endfor %}
+                                        </ul>
+                                    </ul>
+                                </div>
+                                {{ content }}
+                            {% endblock %}
+                        </div>
+                    </div>
+                    {%- block footer %}
+                        {% include "footer.html" %}
+                    {% endblock %}
+                </div>
             </div>
-          </div>
-	  {%- block footer %}
-          {% include "footer.html" %}
-	  {% endblock %}
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-
-<div class="rst-versions" role="note" style="cursor: pointer">
-    <span class="rst-current-version" data-toggle="rst-current-version">
-      {% if repo_name == 'GitHub' %}
-          <a class="icon icon-github" style="float: left; color: #fcfcfc"> GitHub</a>
-      {% elif repo_name == 'Bitbucket' %}
-          <a class="icon icon-bitbucket" style="float: left; color: #fcfcfc"> BitBucket</a>
-      {% endif %}
-      {% if previous_page %}
-        <span><a href="{{ previous_page.url }}" style="color: #fcfcfc;">&laquo; Previous</a></span>
-      {% endif %}
-      {% if next_page %}
-        <span style="margin-left: 15px"><a href="{{ next_page.url }}" style="color: #fcfcfc">Next &raquo;</a></span>
-      {% endif %}
-    </span>
-</div>
+
+        </section>
+    </div>
+
+    <div class="rst-versions" role="note" style="cursor: pointer">
+        <span class="rst-current-version" data-toggle="rst-current-version">
+            {% if repo_name == 'GitHub' %}
+                <a class="icon icon-github" style="float: left; color: #fcfcfc"> GitHub</a>
+            {% elif repo_name == 'Bitbucket' %}
+                <a class="icon icon-bitbucket" style="float: left; color: #fcfcfc"> BitBucket</a>
+            {% endif %}
+        </span>
+    </div>
 </body>
 </html>
@@ -37,10 +37,34 @@ h3, h4, h5, h6 {
  */
 .wy-nav-side {
     height: 100%;
+    width: 25%;
     overflow-y: auto;
 }
-/*
+.wy-nav-content-wrap {
+    padding-left: 25%;
+    margin-left: 0px;
+    background-color: #FFF;
+}
+
+.toc {
+    position: fixed;
+    margin-top: -50px;
+    padding-left: 750px;
+}
+
+@media (max-width:767px) {
+    .wy-nav-content-wrap {
+        padding-left: 0%;
+    }
+}
+
+@media (max-width: 1300px) {
+    .toc {
+        visibility: hidden;
+    }
+}
+
  * readthedocs theme hides nav items when the window height is
  * too small to contain them.
  *
-{% if nav_item.children %}
-    <li class="toctree-l1 {% if nav_item.active%}current{%endif%}">
-    <a class="{% if nav_item.active%}current{%endif%}" href="{{ nav_item.children[0].url }}">{{ nav_item.title }}</a>
-    <ul class="subnav">
-        {% if nav_item.active %}
-            {% for nav_item in nav_item.children[1:] %}
-                {% include 'toc.html' %}
+<ul class="subnav">
+    {% if nav_item.children %}
+        {% if nav_item.children[0].title == "Overview" %}
+            <li class="l1 {% if nav_item.active%}current{%endif%}">
+                <a href="{{ nav_item.children[0].url }}">{{ nav_item.title }}</a>
+            </li>
+            {% if nav_item.active %}
+                {% for nav_item in nav_item.children[1:] %}
+                    {% include 'nav.html' %}
+                {% endfor %}
+            {% endif %}
+        {% else %}
+            <li><span>{{ nav_item.title }}</span></li>
+            {% for nav_item in nav_item.children %}
+                {% include 'nav.html' %}
             {% endfor %}
         {% endif %}
-    </ul>
-{% else %}
-    <li class="toctree-l1 {% if nav_item.active%}current{%endif%}">
-    <a class="{% if nav_item.active%}current{%endif%}" href="{{ nav_item.url }}">{{ nav_item.title }}</a>
-        {% if nav_item == current_page %}
-            <ul class="subnav">
-            {% for toc_item in toc %}
-                <li class="toctree-l3"><a href="{{ toc_item.url }}">{{ toc_item.title }}</a></li>
-            {% endfor %}
-            </ul>
-        {% endif %}
-    </li>
-{% endif %}
+    {% else %}
+        <li class="l1 {% if nav_item.active%}current{%endif%}">
+            <a class="{% if nav_item.active%}current{%endif%}" href="{{ nav_item.url }}">{{ nav_item.title }}</a>
+        </li>
+    {% endif %}
+</ul>