From f1f94f2f634fb065f69ca2cc87a4a54f4e3a39ed Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 30 Aug 2013 06:05:51 +0100 Subject: Per-module extension flags and language listing. Any extensions that are not enabled by a used language (Haskell2010 &c) will be shown. Furthermore, any implicitly enabled are also going to be shown. While we could eliminate this either by using the GHC API or a dirty hack, I opted not to: if a user doesn't want the implied flags to show, they are recommended to use enable extensions more carefully or individually. Perhaps this will encourage users to not enable the most powerful flags needlessly. Enabled with show-extensions. Conflicts: src/Haddock/InterfaceFile.hs --- resources/html/Classic.theme/xhaddock.css | 20 +++++++++++++------- resources/html/Ocean.std-theme/ocean.css | 16 +++++++++++----- 2 files changed, 24 insertions(+), 12 deletions(-) (limited to 'resources/html') diff --git a/resources/html/Classic.theme/xhaddock.css b/resources/html/Classic.theme/xhaddock.css index 40ea0d06..ed231b5a 100644 --- a/resources/html/Classic.theme/xhaddock.css +++ b/resources/html/Classic.theme/xhaddock.css @@ -3,7 +3,13 @@ padding: 0; } -body { +.extension-list { + list-style-type: none; + margin-left: 0; + padding-left: 0; +} + +body { background-color: #ffffff; color: #000000; font-size: 100%; @@ -53,7 +59,7 @@ h1, h2, h3, h4, h5 { margin-bottom: 0.5em; } -p { +p { padding-top: 2px; padding-left: 10px; } @@ -64,7 +70,7 @@ ul, ol, dl { margin-left: 2.5em; } -pre { +pre { padding-top: 2px; padding-left: 20px; } @@ -209,7 +215,7 @@ table.info { #index .caption { padding-top: 15px; font-weight: bold; - font-size: 150% + font-size: 150% } #synopsis { @@ -357,7 +363,7 @@ p.arg { margin-bottom: 0; } p.arg span { - background-color: #f0f0f0; + background-color: #f0f0f0; font-family: monospace; white-space: nowrap; float: none; @@ -365,7 +371,7 @@ p.arg span { img.coll { - width : 0.75em; height: 0.75em; margin-bottom: 0; margin-right: 0.5em + width : 0.75em; height: 0.75em; margin-bottom: 0; margin-right: 0.5em } @@ -387,7 +393,7 @@ td.rdoc p { color: #ffffff; padding: 4px } - + #footer p { padding: 1px; margin: 0; diff --git a/resources/html/Ocean.std-theme/ocean.css b/resources/html/Ocean.std-theme/ocean.css index 42238709..b9ad560e 100644 --- a/resources/html/Ocean.std-theme/ocean.css +++ b/resources/html/Ocean.std-theme/ocean.css @@ -49,14 +49,14 @@ a[href]:hover { text-decoration:underline; } For reasons, see: http://yui.yahooapis.com/3.1.1/build/cssfonts/fonts.css */ - + body { font:13px/1.4 sans-serif; *font-size:small; /* for IE */ *font:x-small; /* for IE in quirks mode */ } -h1 { font-size: 146.5%; /* 19pt */ } +h1 { font-size: 146.5%; /* 19pt */ } h2 { font-size: 131%; /* 17pt */ } h3 { font-size: 116%; /* 15pt */ } h4 { font-size: 100%; /* 13pt */ } @@ -98,7 +98,7 @@ pre, code, kbd, samp, tt, .src { /* @group Common */ -.caption, h1, h2, h3, h4, h5, h6 { +.caption, h1, h2, h3, h4, h5, h6 { font-weight: bold; color: rgb(78,98,114); margin: 0.8em 0 0.4em; @@ -122,7 +122,7 @@ ul.links { ul.links li { display: inline; - border-left: 1px solid #d5d5d5; + border-left: 1px solid #d5d5d5; white-space: nowrap; padding: 0; } @@ -457,13 +457,19 @@ div#style-menu-holder { /* @group Auxillary Pages */ + +.extension-list { + list-style-type: none; + margin-left: 0; +} + #mini { margin: 0 auto; padding: 0 1em 1em; } #mini > * { - font-size: 93%; /* 12pt */ + font-size: 93%; /* 12pt */ } #mini #module-list .caption, -- cgit v1.2.3