- re-merge doc_nav. We've removed the whole idea of a "fixed top", and moved the

"fixed" thing entirely to the left side.  The content now regains full vertical real estate, such
that there's no workarounds needed for anchors, they work directly again.
we had to reorganize the whole layout to accommodate this however.

1 files changed, 78 insertions, 34 deletions

diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css
index 99858b429..14aa86bab 100644
--- a/doc/build/static/docs.css
+++ b/doc/build/static/docs.css
@@ -86,8 +86,9 @@ a.headerlink:hover {
   position: relative;
 }
 
-#docs-top-navigation,
-#docs-bottom-navigation {
+#docs-sidebar-popout,
+#docs-bottom-navigation,
+#index-nav {
   font-family: Verdana, sans-serif;
   background-color: #FBFBEE;
   border: solid 1px #CCC;
@@ -95,12 +96,20 @@ a.headerlink:hover {
   font-size:.8em;
 }
 
-#docs-top-navigation {
-  margin:10px 0px;
-  line-height:1.2em;
-  position: relative;
+#docs-sidebar-popout {
+  font-size:.75em;
+}
+
+#docs-sidebar-popout p,
+#docs-sidebar-popout form {
+  margin:5px 0 5px 0px;
+}
+
+#docs-sidebar-popout h3 {
+  margin:0 0 10px 0;
 }
 
+
 #docs-version-header {
   position: absolute;
   right: 0;
@@ -162,7 +171,8 @@ a.headerlink:hover {
 }
 
 #docs-body,
-#docs-sidebar
+#docs-sidebar,
+#index-nav
  {
   /*font-family: helvetica, arial, sans-serif;
   font-size:.9em;*/
@@ -181,46 +191,71 @@ a.headerlink:hover {
   font-size:.85em;
 }
 
-#docs-sidebar {
+#fixed-sidebar {
+  position: relative;
+}
 
-  width:210px;
-  padding: 0px 0 0 15px;
+#fixed-sidebar.withsidebar {
+  float: left;
+  width:224px;
+}
+
+#fixed-sidebar.preautomated {
+    position: fixed;
+    float: none;
+    top:0;
+    bottom: 0;
+}
+
+#fixed-sidebar.automated {
+    position: fixed;
+    float: none;
+    top: 120px;
+    min-height: 0;
+}
+
+
+#docs-sidebar {
   font-size:.85em;
 
   border: solid 1px #CCC;
 
   z-index: 3;
   background-color: #EFEFEF;
+}
 
-  float: left;
-  top: 120px;
+#index-nav {
+  margin-top:10px;
+  padding:0 10px;
+}
+
+#index-nav form {
+  float:right;
+  padding-top:10px;
+}
+
+#docs-sidebar {
+  padding: 0px 0 0 15px;
+
+  top: 140px;
   bottom: 0;
   min-height: 0;
   overflow-y: auto;
+  margin-top:10px;
 }
 
-
-#docs-top-navigation-container {
+#docs-sidebar-popout {
+  height:120px;
+  max-height: 120px;
 }
 
-#docs-top-navigation-container.automated {
-    position:fixed;
-    top:0;
-    z-index:100;
-    width:100%;
-}
 
-/* http://css-tricks.com/hash-tag-links-padding/ */
-#docs-container.preautomated div.section:before {
-    content: " ";
-    display: block;
-    height:120px;
-    margin-top: -120px;
-    visibility: hidden;
+#fixed-sidebar.preautomated #docs-sidebar,
+#fixed-sidebar.preautomated #docs-sidebar-popout {
+  position:absolute;
 }
 
-
-#docs-sidebar.preautomated:after {
+#fixed-sidebar.preautomated #docs-sidebar:after {
   content: " ";
   display:block;
   height: 150px;
@@ -251,6 +286,10 @@ a.headerlink:hover {
     /*width:210px;*/
 }
 
+#docs-sidebar h3:first-child {
+  margin-top: 0px;
+}
+
 #docs-sidebar h3 a, #docs-sidebar h4 a {
   color: #222222;
 }
@@ -268,18 +307,22 @@ a.headerlink:hover {
     margin-left: 20px;
 }
 
+
+
+
 #docs-body {
   background-color:#FFFFFF;
   padding:1px 10px 10px 10px;
 
   border: solid 1px #CCC;
-
+  margin-top:10px;
 }
 
 #docs-body.withsidebar {
-  margin: 0 0 0 230px;
+  margin-left: 230px;
 }
 
+
 #docs-body h1,
 #docs-body h2,
 #docs-body h3,
@@ -287,12 +330,13 @@ a.headerlink:hover {
   font-family:Helvetica, Arial, sans-serif;
 }
 
-#docs-body h1 {
+#docs-body #sqlalchemy-documentation h1 {
   /* hide the <h1> for each content section. */
   display:none;
   font-size:2.0em;
 }
 
+
 #docs-body h2 {
   font-size:1.8em;
   border-top:1px solid;
@@ -410,7 +454,6 @@ div.admonition, div.topic, .deprecated, .versionadded, .versionchanged {
     box-shadow: 2px 2px 3px #DFDFDF;
 }
 
-
 div.sidebar {
     background-color: #FFFFEE;
     border: 1px solid #DDDDBB;
@@ -466,11 +509,12 @@ dl.method > dt,
 dl.class > dt,
 dl.exception > dt
 {
-    background-color:#F0F0F0;
+    background-color: #EFEFEF;
     margin:25px -10px 10px 10px;
     padding: 0px 10px;
 }
 
+
 dl.glossary > dt {
   font-weight:bold;
   font-size:1.1em;