- correct the size on side elements

2 files changed, 60 insertions, 25 deletions

diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css
index 14aa86bab..b0a9f4212 100644
--- a/doc/build/static/docs.css
+++ b/doc/build/static/docs.css
@@ -92,10 +92,14 @@ a.headerlink:hover {
   font-family: Verdana, sans-serif;
   background-color: #FBFBEE;
   border: solid 1px #CCC;
-  padding:10px;
   font-size:.8em;
 }
 
+#docs-bottom-navigation,
+#index-nav {
+  padding:10px;
+}
+
 #docs-sidebar-popout {
   font-size:.75em;
 }
@@ -225,28 +229,50 @@ a.headerlink:hover {
 }
 
 #index-nav {
+  position: relative;
   margin-top:10px;
   padding:0 10px;
 }
 
 #index-nav form {
-  float:right;
   padding-top:10px;
+  float:right;
 }
 
-#docs-sidebar {
-  padding: 0px 0 0 15px;
+#sidebar-paginate {
+  position: absolute;
+  bottom: 4.5em;
+  left: 10px;
+}
 
-  top: 140px;
+#sidebar-topnav {
+  position: absolute;
+  bottom: 3em;
+  left: 10px;
+}
+
+#sidebar-search {
+  position: absolute;
+  bottom: 1em;
+  left: 10px;
+}
+
+#docs-sidebar {
+  top: 132px;
   bottom: 0;
   min-height: 0;
   overflow-y: auto;
-  margin-top:10px;
+  margin-top:5px;
+  width:212px;
+  padding-left:10px;
 }
 
 #docs-sidebar-popout {
   height:120px;
   max-height: 120px;
+  width:212px;
+  padding-left:10px;
+  padding-top:10px;
 }
 
 
@@ -281,7 +307,7 @@ a.headerlink:hover {
     font-size: 1.1em;
     font-weight: normal;
     margin: 10px 0 0 -15px;
-    padding: 5px 10px 5px 10px;
+    padding: 5px 10px 5px 15px;
     text-shadow: 1px 1px 0 white;
     /*width:210px;*/
 }
diff --git a/doc/build/templates/layout.mako b/doc/build/templates/layout.mako
index d86ecf074..db4da8399 100644
--- a/doc/build/templates/layout.mako
+++ b/doc/build/templates/layout.mako
@@ -130,28 +130,37 @@ withsidebar = bool(toc) and current_page_name != 'index'
         <div id="docs-sidebar-popout">
             <h3><a href="${pathto('index')}">${docstitle|h}</a></h3>
 
-            <p>
-            % if prevtopic:
-                <a href="${prevtopic['link']|h}" title="${prevtopic['title']}">Prev</a> |
-            % endif
-            % if nexttopic:
-                <a href="${nexttopic['link']|h}" title="${nexttopic['title']}">Next</a>
-            % endif
+            <p id="sidebar-paginate">
+                % if parents:
+                    <a href="${parents[-1]['link']|h}" title="${parents[-1]['title']}">Up</a> |
+                % else:
+                    <a href="${pathto('index')}" title="${docstitle|h}">Up</a> |
+                % endif
+
+                % if prevtopic:
+                    <a href="${prevtopic['link']|h}" title="${prevtopic['title']}">Prev</a> |
+                % endif
+                % if nexttopic:
+                    <a href="${nexttopic['link']|h}" title="${nexttopic['title']}">Next</a>
+                % endif
             </p>
 
-            <p>
-            <a href="${pathto('index')}">Contents</a> |
-            <a href="${pathto('genindex')}">Index</a>
-            % if pdf_url:
-            | <a href="${pdf_url}">PDF</a>
-            % endif
+            <p id="sidebar-topnav">
+                <a href="${pathto('index')}">Contents</a> |
+                <a href="${pathto('genindex')}">Index</a>
+                % if pdf_url:
+                | <a href="${pdf_url}">PDF</a>
+                % endif
             </p>
 
-            <form class="search" action="${pathto('search')}" method="get">
-              <input type="text" name="q" size="12" /> <input type="submit" value="${_('Search')}" />
-              <input type="hidden" name="check_keywords" value="yes" />
-              <input type="hidden" name="area" value="default" />
-            </form>
+            <div id="sidebar-search">
+                <form class="search" action="${pathto('search')}" method="get">
+                  <input type="text" name="q" size="12" /> <input type="submit" value="${_('Search')}" />
+                  <input type="hidden" name="check_keywords" value="yes" />
+                  <input type="hidden" name="area" value="default" />
+                </form>
+            </div>
+
         </div>
 
         <div id="docs-sidebar">