IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged in rolmei/sphinx-epub (pull request #103: Whitespace cleanup)

Browse Source
This commit is contained in:
Jonathan Waltman 2013-01-05 08:48:42 -06:00
commit e55c72218c
16 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/environment.py
View File

@ -1374,7 +1374,7 @@ class BuildEnvironment:
'iscurrent' not in subnode.parent): 'iscurrent' not in subnode.parent):
subnode.parent.remove(subnode) subnode.parent.remove(subnode)
else: else:
# recurse on visible children # recurse on visible children
_toctree_prune(subnode, depth+1, maxdepth) _toctree_prune(subnode, depth+1, maxdepth)
def _toctree_add_classes(node, depth): def _toctree_add_classes(node, depth):

2
sphinx/themes/agogo/layout.html
View File

@ -8,7 +8,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "basic/layout.html" %} {%- extends "basic/layout.html" %}
{% block header %} {% block header %}
<div class="header-wrapper"> <div class="header-wrapper">

2
sphinx/themes/basic/defindex.html
View File

@ -7,7 +7,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "layout.html" %} {%- extends "layout.html" %}
{% set title = _('Overview') %} {% set title = _('Overview') %}
{% block body %} {% block body %}
<h1>{{ docstitle|e }}</h1> <h1>{{ docstitle|e }}</h1>

2
sphinx/themes/basic/domainindex.html
View File

@ -7,7 +7,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "layout.html" %} {%- extends "layout.html" %}
{% set title = indextitle %} {% set title = indextitle %}
{% block extrahead %} {% block extrahead %}
{{ super() }} {{ super() }}

2
sphinx/themes/basic/genindex-single.html
View File

@ -28,7 +28,7 @@
</dt> </dt>
{% endmacro %} {% endmacro %}
{% extends "layout.html" %} {%- extends "layout.html" %}
{% set title = _('Index') %} {% set title = _('Index') %}
{% block body %} {% block body %}

2
sphinx/themes/basic/genindex-split.html
View File

@ -7,7 +7,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "layout.html" %} {%- extends "layout.html" %}
{% set title = _('Index') %} {% set title = _('Index') %}
{% block body %} {% block body %}

2
sphinx/themes/basic/genindex.html
View File

@ -28,7 +28,7 @@
</dt> </dt>
{% endmacro %} {% endmacro %}
{% extends "layout.html" %} {%- extends "layout.html" %}
{% set title = _('Index') %} {% set title = _('Index') %}
{% block body %} {% block body %}

2
sphinx/themes/basic/page.html
View File

@ -7,7 +7,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "layout.html" %} {%- extends "layout.html" %}
{% block body %} {% block body %}
{{ body }} {{ body }}
{% endblock %} {% endblock %}

2
sphinx/themes/basic/search.html
View File

@ -7,7 +7,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "layout.html" %} {%- extends "layout.html" %}
{% set title = _('Search') %} {% set title = _('Search') %}
{% set script_files = script_files + ['_static/searchtools.js'] %} {% set script_files = script_files + ['_static/searchtools.js'] %}
{% block extrahead %} {% block extrahead %}

2
sphinx/themes/default/layout.html
View File

@ -7,7 +7,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "basic/layout.html" %} {%- extends "basic/layout.html" %}
{% if theme_collapsiblesidebar|tobool %} {% if theme_collapsiblesidebar|tobool %}
{% set script_files = script_files + ['_static/sidebar.js'] %} {% set script_files = script_files + ['_static/sidebar.js'] %}

2
sphinx/themes/epub/epub-cover.html
View File

@ -7,7 +7,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "layout.html" %} {%- extends "layout.html" %}
{%- block header %}{% endblock %} {%- block header %}{% endblock %}
{%- block rootrellink %}{% endblock %} {%- block rootrellink %}{% endblock %}
{%- block relbaritems %}{% endblock %} {%- block relbaritems %}{% endblock %}

2
sphinx/themes/epub/layout.html
View File

@ -7,7 +7,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "basic/layout.html" %} {%- extends "basic/layout.html" %}
{# add only basic navigation links #} {# add only basic navigation links #}
{% block sidebar1 %}{% endblock %} {% block sidebar1 %}{% endblock %}

2
sphinx/themes/haiku/layout.html
View File

@ -7,7 +7,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "basic/layout.html" %} {%- extends "basic/layout.html" %}
{% set script_files = script_files + ['_static/theme_extras.js'] %} {% set script_files = script_files + ['_static/theme_extras.js'] %}
{% set css_files = css_files + ['_static/print.css'] %} {% set css_files = css_files + ['_static/print.css'] %}

2
sphinx/themes/pyramid/layout.html
View File

@ -1,4 +1,4 @@
{% extends "basic/layout.html" %} {%- extends "basic/layout.html" %}
{%- block extrahead %} {%- block extrahead %}
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" /> <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />

2
sphinx/themes/scrolls/layout.html
View File

@ -8,7 +8,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "basic/layout.html" %} {%- extends "basic/layout.html" %}
{% set script_files = script_files + ['_static/theme_extras.js'] %} {% set script_files = script_files + ['_static/theme_extras.js'] %}
{% set css_files = css_files + ['_static/print.css'] %} {% set css_files = css_files + ['_static/print.css'] %}
{# do not display relbars #} {# do not display relbars #}

2
sphinx/themes/sphinxdoc/layout.html
View File

@ -7,7 +7,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
#} #}
{% extends "basic/layout.html" %} {%- extends "basic/layout.html" %}
{# put the sidebar before the body #} {# put the sidebar before the body #}
{% block sidebar1 %}{{ sidebar() }}{% endblock %} {% block sidebar1 %}{{ sidebar() }}{% endblock %}