From e998ed04e53f295715251be764457ff4eec4ae9f Mon Sep 17 00:00:00 2001
From: Mark Lentczner <markl@glyphic.com>
Date: Thu, 29 Jul 2010 01:12:46 +0000
Subject: styling tweaks don't generate an empty li for absent style
menu in links area update css for Classic and Snappy to handle:
dl lists links in package header and in declarations
floating of links and info block in package and module headers
---
src/Haddock/Backends/Xhtml.hs | 4 ++--
src/Haddock/Backends/Xhtml/Themes.hs | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/Haddock/Backends/Xhtml.hs b/src/Haddock/Backends/Xhtml.hs
index 6fc0ffeb..eb06e499 100644
--- a/src/Haddock/Backends/Xhtml.hs
+++ b/src/Haddock/Backends/Xhtml.hs
@@ -171,8 +171,8 @@ bodyHtml doctitle iface themes
srcButton maybe_source_url iface,
wikiButton maybe_wiki_url (ifaceMod `fmap` iface),
contentsButton maybe_contents_url,
- indexButton maybe_index_url
- ] ++ [styleMenu themes]) ! [theclass "links"],
+ indexButton maybe_index_url,
+ styleMenu themes]) ! [theclass "links"],
nonEmpty sectionName << doctitle
],
divContent << pageContent,
diff --git a/src/Haddock/Backends/Xhtml/Themes.hs b/src/Haddock/Backends/Xhtml/Themes.hs
index 414feec0..512b597c 100644
--- a/src/Haddock/Backends/Xhtml/Themes.hs
+++ b/src/Haddock/Backends/Xhtml/Themes.hs
@@ -196,10 +196,10 @@ stylePickers ts = map mkPicker ts
anchor ! [href "#", onclick js] << themeName t
-styleMenu :: Themes -> Html
-styleMenu [] = noHtml
-styleMenu [_] = noHtml
-styleMenu ts = thediv ! [identifier "style-menu-holder"] << [
+styleMenu :: Themes -> Maybe Html
+styleMenu [] = Nothing
+styleMenu [_] = Nothing
+styleMenu ts = Just $ thediv ! [identifier "style-menu-holder"] << [
anchor ! [ href "#", onclick js ] << "Style \9662",
unordList (stylePickers ts) ! [ identifier "style-menu", theclass "hide" ]
]
--
cgit v1.2.3