From 915a34be3c3a3872700763eb97ac811ef1109ef4 Mon Sep 17 00:00:00 2001 From: Sebastian Meric de Bellefon Date: Wed, 11 May 2016 00:16:34 -0400 Subject: Fix #303. Hide footer when printing The "Produced by Haddock" footer was overlapping the page's body when printing. This patch hides the footer with a css media rule. --- haddock-api/resources/html/Classic.theme/xhaddock.css | 4 ++++ haddock-api/resources/html/Ocean.std-theme/ocean.css | 3 +++ html-test/ref/ocean.css | 3 +++ 3 files changed, 10 insertions(+) diff --git a/haddock-api/resources/html/Classic.theme/xhaddock.css b/haddock-api/resources/html/Classic.theme/xhaddock.css index ed231b5a..19dc28ec 100644 --- a/haddock-api/resources/html/Classic.theme/xhaddock.css +++ b/haddock-api/resources/html/Classic.theme/xhaddock.css @@ -116,6 +116,10 @@ ul.links li { cursor: pointer; } +@media print { + #footer { display: none; } +} + #package-header { color: #ffffff; padding: 5px 5px 5px 31px; diff --git a/haddock-api/resources/html/Ocean.std-theme/ocean.css b/haddock-api/resources/html/Ocean.std-theme/ocean.css index fcf23810..3ebb14de 100644 --- a/haddock-api/resources/html/Ocean.std-theme/ocean.css +++ b/haddock-api/resources/html/Ocean.std-theme/ocean.css @@ -183,6 +183,9 @@ pre { .keyword { font-weight: normal; } .def { font-weight: bold; } +@media print { + #footer { display: none; } +} /* @end */ diff --git a/html-test/ref/ocean.css b/html-test/ref/ocean.css index fcf23810..3ebb14de 100644 --- a/html-test/ref/ocean.css +++ b/html-test/ref/ocean.css @@ -183,6 +183,9 @@ pre { .keyword { font-weight: normal; } .def { font-weight: bold; } +@media print { + #footer { display: none; } +} /* @end */ -- cgit v1.2.3 From 2c603c39a2b1c40431f8f6d9b7b12976311913db Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 16 May 2016 18:59:08 +0200 Subject: Revert "doc: Vendorize alabaster Sphinx theme" This ended up causes far too many issues to be worthwhile. We'll just have to live with inconsistent haddock documentation. This reverts commit cec21957001143794e71bcd9420283df18e7de40. --- .gitmodules | 3 --- doc/alabaster | 1 - doc/conf.py | 1 - 3 files changed, 5 deletions(-) delete mode 100644 .gitmodules delete mode 160000 doc/alabaster diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index ac3559da..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "doc/alabaster"] - path = doc/alabaster - url = git://github.com/bitprophet/alabaster.git diff --git a/doc/alabaster b/doc/alabaster deleted file mode 160000 index aabda118..00000000 --- a/doc/alabaster +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aabda1182083d21b6d9bafb53ea8a99eb4be4cf0 diff --git a/doc/conf.py b/doc/conf.py index 6e73eb5c..d6b8bda8 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -29,7 +29,6 @@ pygments_style = 'tango' # -- Options for HTML output ---------------------------------------------- -html_theme_path = ['./alabaster'] html_theme = 'alabaster' htmlhelp_basename = 'Haddockdoc' -- cgit v1.2.3 From d100c8f38e8ee6c7e6ba291afbf2c9eaf4f7743d Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 16 May 2016 18:14:18 +0200 Subject: cabal: Fix README path --- haddock.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haddock.cabal b/haddock.cabal index 5f6e2719..27f2d604 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -17,7 +17,7 @@ stability: experimental extra-source-files: CHANGES - README + README.md doc/Makefile doc/README.md doc/*.rst -- cgit v1.2.3