Merge pull request #7949 from SvenDowideit/remove-doubled-up-page-heading

Make the side bar about in-document navigation by removing the duplicated h1

docs/theme/mkdocs/base.html

@@ -47,12 +47,16 @@
 <div id="wrap">
   {% include "nav.html" %}
   <div id="content" class="container">
-{% if current_page.title != '**HIDDEN**' %}
+    <div class="row">
-    <div class="row" id="top-header">
+      <div class="span3" id="leftnav">
-      <div class="span7">
+        <div id="toc_table">
-        <h1 class="header2">{{ current_page.title }}</h1>
+          <ul class="nav nav-tabs nav-stacked">
+            {% include "toc.html" %}
+          </ul>
         </div>
-      <div class="span5">
+      </div>
+      <div class="span9 content-body">
+        {% include "beta_warning.html" %}
         <div id="versionnav" class="span3 pull-right">
           <ul class="nav version pull-right">
             <li class="dropdown">
@@ -66,19 +70,6 @@
             </li>
           </ul>
         </div>
-      </div>
-    </div>
-{% endif %}
-    <div class="row">
-      <div class="span3" id="leftnav">
-        <div id="toc_table">
-          <ul class="nav nav-tabs nav-stacked">
-            {% include "toc.html" %}
-          </ul>
-        </div>
-      </div>
-      <div class="span9 content-body">
-        {% include "beta_warning.html" %}
         {{ content }}
       </div>
     </div>

docs/theme/mkdocs/css/docs.css

@@ -329,3 +329,9 @@ ol li {
 table.table tr td img {
     width:100%;
 }
+#versionnav ul {
+    list-style: none outside none;
+}
+#versionnav ul ul {
+    padding: 0;
+}