diff --git a/CHANGES b/CHANGES index fbac5db68..0f966d763 100644 --- a/CHANGES +++ b/CHANGES @@ -17,6 +17,9 @@ Release 1.0 (in development) Release 0.6.2 (in development) ============================== +* #150: Fix display of the "sphinxdoc" theme on Internet Explorer + versions 6 and 7. + * #146: Don't fail to generate LaTeX when the user has an active ``.docutils`` configuration. diff --git a/Makefile b/Makefile index 108ed96dc..dbe7c36e2 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ all: clean-pyc check test check: @$(PYTHON) utils/check_sources.py -i sphinx/style/jquery.js \ -i sphinx/pycode/pgen2 -i sphinx/util/smartypants.py \ - -i doc/_build -i ez_setup.py -i tests/path.py . + -i doc/_build -i ez_setup.py -i tests/path.py -i tests/coverage.py . clean: clean-pyc clean-patchfiles diff --git a/sphinx/themes/basic/static/basic.css b/sphinx/themes/basic/static/basic.css index b57a783ab..faebf3129 100644 --- a/sphinx/themes/basic/static/basic.css +++ b/sphinx/themes/basic/static/basic.css @@ -5,15 +5,6 @@ /* -- main layout ----------------------------------------------------------- */ -div.documentwrapper { - float: left; - width: 100%; -} - -div.bodywrapper { - margin: 0 0 0 230px; -} - div.clearer { clear: both; } diff --git a/sphinx/themes/default/static/default.css_t b/sphinx/themes/default/static/default.css_t index cbfa36e94..cefb308b0 100644 --- a/sphinx/themes/default/static/default.css_t +++ b/sphinx/themes/default/static/default.css_t @@ -20,6 +20,15 @@ div.document { background-color: {{ theme_sidebarbgcolor }}; } +div.documentwrapper { + float: left; + width: 100%; +} + +div.bodywrapper { + margin: 0 0 0 230px; +} + div.body { background-color: {{ theme_bgcolor }}; color: {{ theme_textcolor }}; diff --git a/sphinx/themes/sphinxdoc/static/sphinxdoc.css b/sphinx/themes/sphinxdoc/static/sphinxdoc.css index 1d11e8b9a..75b2ae0f9 100644 --- a/sphinx/themes/sphinxdoc/static/sphinxdoc.css +++ b/sphinx/themes/sphinxdoc/static/sphinxdoc.css @@ -25,10 +25,6 @@ body { min-width: 740px; } -div.documentwrapper { - float: none; -} - div.document { background-color: white; text-align: left; diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py index 79b2fcc55..81df395bd 100644 --- a/sphinx/writers/html.py +++ b/sphinx/writers/html.py @@ -472,10 +472,11 @@ class HTMLTranslator(BaseTranslator): u'title="%s">\u00B6' % _('Permalink to this headline')) elif close_tag.startswith('\u00B6' % _('Permalink to this headline')) - + BaseTranslator.depart_title(self, node) def unknown_visit(self, node): diff --git a/tests/test_markup.py b/tests/test_markup.py index 45beb4565..0c5e74680 100644 --- a/tests/test_markup.py +++ b/tests/test_markup.py @@ -111,8 +111,8 @@ def test_inline(): def test_latex_escaping(): # correct escaping in normal mode - yield verify, u'Γ\\\\∞$', None, \ - ur'\(\Gamma\)\textbackslash{}\(\infty\)\$' + yield (verify, u'Γ\\\\∞$', None, + ur'\(\Gamma\)\textbackslash{}\(\infty\)\$') # in verbatim code fragments yield (verify, u'::\n\n @Γ\\∞$[]', None, u'\\begin{Verbatim}[commandchars=@\\[\\]]\n'