diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2016-05-16 19:58:51 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-05-16 19:58:51 +0200 |
| commit | e82d093a9b3fb68486920896a3d67d84a822cbc5 (patch) | |
| tree | e077d4952029c647e73ea51d481c4d7cc29feb34 | |
| parent | 1bfcca3f2212e1f8e527ad3a2c4bb48aef082ff9 (diff) | |
| parent | d100c8f38e8ee6c7e6ba291afbf2c9eaf4f7743d (diff) | |
Merge remote-tracking branch 'origin/master' into ghc-head
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | doc/alabaster | 0 | ||||
| -rw-r--r-- | doc/conf.py | 1 | ||||
| -rw-r--r-- | haddock-api/resources/html/Classic.theme/xhaddock.css | 4 | ||||
| -rw-r--r-- | haddock-api/resources/html/Ocean.std-theme/ocean.css | 3 | ||||
| -rw-r--r-- | haddock.cabal | 2 | ||||
| -rw-r--r-- | html-test/ref/ocean.css | 3 |
7 files changed, 11 insertions, 5 deletions
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 -Subproject aabda1182083d21b6d9bafb53ea8a99eb4be4cf 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' 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/haddock.cabal b/haddock.cabal index 7a2e0a04..8a3bb9ff 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 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 */ |