From 824ffde8ed06ad4f22c765a342aa322d2f27baf0 Mon Sep 17 00:00:00 2001
From: Mark Lentczner <markl@glyphic.com>
Date: Wed, 28 Jul 2010 00:03:12 +0000
Subject: make info block and package bar links be floatable by placing them
 first in the dom tree

---
 html/Ocean.std-theme/ocean.css | 16 ++++++++--------
 src/Haddock/Backends/Xhtml.hs  |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/html/Ocean.std-theme/ocean.css b/html/Ocean.std-theme/ocean.css
index 5276a419..061506ee 100644
--- a/html/Ocean.std-theme/ocean.css
+++ b/html/Ocean.std-theme/ocean.css
@@ -52,10 +52,9 @@ h1 + h2, h2 + h3, h3 + h4, h4 + h5, h5 + h6 {
 ul.links {
   list-style: none;
   text-align: left;
-  position: absolute;
-  right: 5px;
-  top: 5px;
+  float: right;
   display: inline-table;
+  margin-left: 1em;
 }
 
 ul.links li {
@@ -65,7 +64,9 @@ ul.links li {
   padding: 0;
 }
 
-ul.links li a { padding: 5px 10px; }
+ul.links li a {
+  padding: 0.2em 0.5em;
+}
 
 .hide { display: none; }
 .show { display: inherit; }
@@ -138,7 +139,7 @@ img.coll {
   background: rgb(41,56,69);
   border-top: 5px solid rgb(78,98,114);
   color: #ddd;
-  padding: 5px;
+  padding: 0.2em;
   position: relative;
   text-align: left;
 }
@@ -170,9 +171,8 @@ dl.info {
   font-size: 75%;
   color: rgb(78,98,114);
   background-color: #fff;
-  max-width: 20em;
-  margin-top: -6em;
-  margin-bottom: 1em;
+  max-width: 40%;
+  margin: -1em 0 1em 1em;
 }
 
 dl.info dt {
diff --git a/src/Haddock/Backends/Xhtml.hs b/src/Haddock/Backends/Xhtml.hs
index c9eaf71b..6fc0ffeb 100644
--- a/src/Haddock/Backends/Xhtml.hs
+++ b/src/Haddock/Backends/Xhtml.hs
@@ -167,13 +167,13 @@ bodyHtml doctitle iface themes
            pageContent =
   body << [
     divPackageHeader << [
-      nonEmpty sectionName << doctitle,
       unordList (catMaybes [
         srcButton maybe_source_url iface,
         wikiButton maybe_wiki_url (ifaceMod `fmap` iface),
         contentsButton maybe_contents_url,
         indexButton maybe_index_url
-        ] ++ [styleMenu themes]) ! [theclass "links"]
+        ] ++ [styleMenu themes]) ! [theclass "links"],
+      nonEmpty sectionName << doctitle
       ],
     divContent << pageContent,
     divFooter << paragraph << (
@@ -453,7 +453,7 @@ ppHtmlModule odir doctitle themes
         bodyHtml doctitle (Just iface) themes
           maybe_source_url maybe_wiki_url
           maybe_contents_url maybe_index_url << [
-            divModuleHeader << (sectionName << mdl_str +++ moduleInfo iface),
+            divModuleHeader << (moduleInfo iface +++ (sectionName << mdl_str)),
             ifaceToHtml maybe_source_url maybe_wiki_url iface unicode
           ]
 
-- 
cgit v1.2.3