From: Tom Yu <tlyu@mit.edu>
Date: Wed, 16 Jan 2013 22:45:41 +0000 (-0500)
Subject: Revert previous ("Sphinx doc: consolidate...")
X-Git-Tag: krb5-1.12-alpha1~335
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=774f0bf84e815591fc2b11d55d5dfa21e1fd63b3;p=thirdparty%2Fkrb5.git

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

This reverts commit 87634edc472cebde4a37d002b7006ed38a1b25c2.

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.
---

diff --git a/doc/_static/kerb.css b/doc/_static/kerb.css
index 4a17f8fda2..1eeebb71dc 100644
--- 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
index 6f3b944ce8..4ec97c2ff5 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -36,8 +36,7 @@
 
 {% 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 #}
@@ -45,7 +44,12 @@
                     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 @@
             {%- block sidebar2 %} {%- endblock %}
             {%- block sidebar1 %}
                 <div class="sidebar"
+                    style="float: right; background: #F9F9F9">
                     <h2>{{ _('On this page') }} </h2>
                     {{ toc }}
                     <br/>