traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge with 3.2

This commit is contained in:
Georg Brandl 2012-03-25 20:32:35 +02:00
parent 1ab27c6fde ab7121430e
commit 288b9bf1ea
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Doc/conf.py
View File

@ -65,9 +65,12 @@ highlight_language = 'python3'
# Options for HTML output # Options for HTML output
# ----------------------- # -----------------------
html_theme = 'default' html_theme = 'pydoctheme'
html_theme_path = ['tools/sphinxext']
html_theme_options = {'collapsiblesidebar': True} html_theme_options = {'collapsiblesidebar': True}
html_short_title = '%s Documentation' % release
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format. # using the given strftime format.
html_last_updated_fmt = '%b %d, %Y' html_last_updated_fmt = '%b %d, %Y'

1
Doc/tools/sphinxext/layout.html
View File

@ -2,6 +2,7 @@
{% block rootrellink %} {% block rootrellink %}
<li><img src="{{ pathto('_static/py.png', 1) }}" alt="" <li><img src="{{ pathto('_static/py.png', 1) }}" alt=""
style="vertical-align: middle; margin-top: -1px"/></li> style="vertical-align: middle; margin-top: -1px"/></li>
<li><a href="http://www.python.org/">Python</a>{{ reldelim1 }}</li>
<li><a href="{{ pathto('index') }}">{{ shorttitle }}</a>{{ reldelim1 }}</li> <li><a href="{{ pathto('index') }}">{{ shorttitle }}</a>{{ reldelim1 }}</li>
{% endblock %} {% endblock %}
{% block extrahead %} {% block extrahead %}

4
Doc/tools/sphinxext/pyspecific.py
View File

@ -27,10 +27,10 @@ def new_visit_versionmodified(self, node):
self.body.append(self.starttag(node, 'p', CLASS=node['type'])) self.body.append(self.starttag(node, 'p', CLASS=node['type']))
text = versionlabels[node['type']] % node['version'] text = versionlabels[node['type']] % node['version']
if len(node): if len(node):
text += ': ' text += ':'
else: else:
text += '.' text += '.'
self.body.append('<span class="versionmodified">%s</span>' % text) self.body.append('<span class="versionmodified">%s</span> ' % text)
from sphinx.writers.html import HTMLTranslator from sphinx.writers.html import HTMLTranslator
from sphinx.locale import versionlabels from sphinx.locale import versionlabels

3
Doc/tools/sphinxext/static/copybutton.js
View File

@ -17,7 +17,8 @@ $(document).ready(function() {
'cursor':'pointer', 'position': 'absolute', 'top': '0', 'right': '0', 'cursor':'pointer', 'position': 'absolute', 'top': '0', 'right': '0',
'border-color': border_color, 'border-style': border_style, 'border-color': border_color, 'border-style': border_style,
'border-width': border_width, 'color': border_color, 'text-size': '75%', 'border-width': border_width, 'color': border_color, 'text-size': '75%',
'font-family': 'monospace', 'padding-left': '0.2em', 'padding-right': '0.2em' 'font-family': 'monospace', 'padding-left': '0.2em', 'padding-right': '0.2em',
'border-radius': '0 3px 0 0'
} }
// create and add the button to all the code blocks that contain >>> // create and add the button to all the code blocks that contain >>>