Revert previous ("Sphinx doc: consolidate...")

This reverts commit 87634ed. That commit is not neutral with respect to the rendering of the HTML, and causes the version built with the logo to look unacceptably disordered.
krb5 · Jan 16, 2013 · 774f0bf · 774f0bf
1 parent 87634ed
commit 774f0bf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/doc/_static/kerb.css b/doc/_static/kerb.css
@@ -31,13 +31,12 @@ div.header-wrapper {
 
 div.header {
   padding-top: 10px;
-  padding-bottom: 0px;
+  padding-bottom: 10px;
 }
 
-div.header  h1 a {
-  color: #5d1509;
-  font-size: 120%;
-  padding-top: 10px;
+div.header h1 {
+  font-family: "Georgia", "Times New Roman", serif,  black;
+  font-weight: normal;
 }
 
 div.header div.right a {
@@ -47,11 +46,6 @@ div.header div.right a {
   float: right;
 }
 
-div.header div.rel{
-  font-size: 50%;
-  padding-bottom: 0px;
-}
-
 /* Content */
 
 div.document {
@@ -84,7 +78,7 @@ div.sidebar {
   width: 20%;
   margin: 0;
   padding: 0;
-  background: #F9F9F9;
+  background-color: white;
 }
 
 div.sidebar ul {

diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -36,16 +36,20 @@
 
 {% block header %}
     <div class="header-wrapper">
-        <div class="header">
-            <h1><a href="{{pathto(master_doc)}}">{{shorttitle|e}}</a></h1>
+        <div class="header" style="padding-bottom: 0px;">
             {% if logo %}
                 <p class="logo">
                     {# Link logo to kerberos.org #}
                     <a href="http://kerberos.org"> <img class="logo"
                     src="{{ pathto('_static/' + logo, 1) }}" alt="Logo" /></a>
                 </p>
             {% endif %}
-            <div class="rel">
+            {% block headertitle %}
+                <h1><a href="{{ pathto (master_doc) }}"
+                style="color: {{ theme_bgcolor }}; font-size: 120%;
+                padding-top: 10px;">{{ shorttitle|e }}</a><h1>
+            {% endblock %}
+            <div class="rel" style="font-size: 50%; padding-bottom: 0px;" >
                 {%- for rellink in rellinks|reverse %}
                     <a href="{{ pathto(rellink[0]) }}"
                     title="{{ rellink[1]|striptags }}"
@@ -64,6 +68,7 @@ <h1><a href="{{pathto(master_doc)}}">{{shorttitle|e}}</a></h1>
             {%- block sidebar2 %} {%- endblock %}
             {%- block sidebar1 %}
                 <div class="sidebar"
+                    style="float: right; background: #F9F9F9">
                     <h2>{{ _('On this page') }} </h2>
                     {{ toc }}
                     <br/>