summaryrefslogtreecommitdiff
path: root/sphinx/themes
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-01-11 21:00:31 +0100
committerGeorg Brandl <georg@python.org>2014-01-11 21:00:31 +0100
commit8feb9cd3c44ebb79ce8c1fdf195e036b7a4348cb (patch)
tree7775a10b946f709e60983b03b3a84f4200be03be /sphinx/themes
parent5dd1a720e5b94031a6c08446c1fb115bb205bf1b (diff)
downloadsphinx-8feb9cd3c44ebb79ce8c1fdf195e036b7a4348cb.tar.gz
Closes #1095: Fix print-media stylesheet being included always in the "scrolls" theme.
Also fixes wrong additions of stylesheets and scripts in haiku theme (probably copy-paste error from scrolls).
Diffstat (limited to 'sphinx/themes')
-rw-r--r--sphinx/themes/haiku/layout.html2
-rw-r--r--sphinx/themes/scrolls/static/print.css12
2 files changed, 7 insertions, 7 deletions
diff --git a/sphinx/themes/haiku/layout.html b/sphinx/themes/haiku/layout.html
index 337d0ca2..0c6b41e7 100644
--- a/sphinx/themes/haiku/layout.html
+++ b/sphinx/themes/haiku/layout.html
@@ -8,8 +8,6 @@
:license: BSD, see LICENSE for details.
#}
{%- extends "basic/layout.html" %}
-{% set script_files = script_files + ['_static/theme_extras.js'] %}
-{% set css_files = css_files + ['_static/print.css'] %}
{# do not display relbars #}
{% block relbar1 %}{% endblock %}
diff --git a/sphinx/themes/scrolls/static/print.css b/sphinx/themes/scrolls/static/print.css
index fb633d87..715d90ab 100644
--- a/sphinx/themes/scrolls/static/print.css
+++ b/sphinx/themes/scrolls/static/print.css
@@ -1,5 +1,7 @@
-div.header, div.relnav, #toc { display: none; }
-#contentwrapper { padding: 0; margin: 0; border: none; }
-body { color: black; background-color: white; }
-div.footer { border-top: 1px solid #888; color: #888; margin-top: 1cm; }
-div.footer a { text-decoration: none; }
+@media print {
+ div.header, div.relnav, #toc { display: none; }
+ #contentwrapper { padding: 0; margin: 0; border: none; }
+ body { color: black; background-color: white; }
+ div.footer { border-top: 1px solid #888; color: #888; margin-top: 1cm; }
+ div.footer a { text-decoration: none; }
+}