diff --git a/sphinx/themes/bizstyle/layout.html b/sphinx/themes/bizstyle/layout.html index 126bb59e9..c946f8435 100644 --- a/sphinx/themes/bizstyle/layout.html +++ b/sphinx/themes/bizstyle/layout.html @@ -14,10 +14,6 @@ {%- endblock %} -{# put the sidebar before the body #} -{% block sidebar1 %}{{ sidebar() }}{% endblock %} -{% block sidebar2 %}{% endblock %} - {# doctype override #} {%- block doctype %} diff --git a/sphinx/themes/bizstyle/static/bizstyle.css_t b/sphinx/themes/bizstyle/static/bizstyle.css_t index b13395b4f..465734646 100644 --- a/sphinx/themes/bizstyle/static/bizstyle.css_t +++ b/sphinx/themes/bizstyle/static/bizstyle.css_t @@ -39,6 +39,11 @@ div.document { -webkit-box-shadow: 2px 2px 5px #000; } +div.documentwrapper { + float: left; + width: 100%; +} + div.bodywrapper { margin: 0 0 0 240px; border-left: 1px solid #ccc; @@ -105,7 +110,6 @@ div.sphinxsidebarwrapper { } div.sphinxsidebar { - margin: 0; padding: 0.5em 12px 12px 12px; width: {{ theme_sidebarwidth|todim }}; {%- if theme_rightsidebar|tobool %} diff --git a/sphinx/themes/sphinxdoc/layout.html b/sphinx/themes/sphinxdoc/layout.html deleted file mode 100644 index bdae9a441..000000000 --- a/sphinx/themes/sphinxdoc/layout.html +++ /dev/null @@ -1,14 +0,0 @@ -{# - sphinxdoc/layout.html - ~~~~~~~~~~~~~~~~~~~~~ - - Sphinx layout template for the sphinxdoc theme. - - :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. - :license: BSD, see LICENSE for details. -#} -{%- extends "basic/layout.html" %} - -{# put the sidebar before the body #} -{% block sidebar1 %}{{ sidebar() }}{% endblock %} -{% block sidebar2 %}{% endblock %} diff --git a/sphinx/themes/sphinxdoc/static/sphinxdoc.css_t b/sphinx/themes/sphinxdoc/static/sphinxdoc.css_t index 4034c617d..626d8c3f2 100644 --- a/sphinx/themes/sphinxdoc/static/sphinxdoc.css_t +++ b/sphinx/themes/sphinxdoc/static/sphinxdoc.css_t @@ -37,6 +37,11 @@ div.document { background-repeat: repeat-x; } +div.documentwrapper { + float: left; + width: 100%; +} + div.bodywrapper { margin: 0 calc({{ theme_sidebarwidth|todim }} + 10px) 0 0; border-right: 1px solid #ccc; @@ -86,7 +91,6 @@ div.sphinxsidebarwrapper { } div.sphinxsidebar { - margin: 0; padding: 0.5em 15px 15px 0; width: calc({{ theme_sidebarwidth|todim }} - 20px); float: right;