diff options
| author | Georg Brandl <georg@python.org> | 2012-03-25 18:32:35 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-03-25 18:32:35 (GMT) |
| commit | 288b9bf1ea3ed68b3238fb2f2d579370ffdb634b (patch) | |
| tree | 9709e67e5e549550427f213d7e344a7562154bc4 /Doc/tools | |
| parent | 1ab27c6fde2a7a8f66bcc158ef74975e269c9389 (diff) | |
| parent | ab7121430e8ef7106582b1abe0d6a900f62f22ce (diff) | |
| download | cpython-288b9bf1ea3ed68b3238fb2f2d579370ffdb634b.zip cpython-288b9bf1ea3ed68b3238fb2f2d579370ffdb634b.tar.gz cpython-288b9bf1ea3ed68b3238fb2f2d579370ffdb634b.tar.bz2 | |
merge with 3.2
Diffstat (limited to 'Doc/tools')
| -rw-r--r-- | Doc/tools/sphinxext/layout.html | 1 | ||||
| -rw-r--r-- | Doc/tools/sphinxext/pyspecific.py | 4 | ||||
| -rw-r--r-- | Doc/tools/sphinxext/static/copybutton.js | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html index d4bb105..db4a386 100644 --- a/Doc/tools/sphinxext/layout.html +++ b/Doc/tools/sphinxext/layout.html @@ -2,6 +2,7 @@ {% block rootrellink %} <li><img src="{{ pathto('_static/py.png', 1) }}" alt="" 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> {% endblock %} {% block extrahead %} diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py index f359530..bff10ab 100644 --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -27,10 +27,10 @@ def new_visit_versionmodified(self, node): self.body.append(self.starttag(node, 'p', CLASS=node['type'])) text = versionlabels[node['type']] % node['version'] if len(node): - text += ': ' + text += ':' else: 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.locale import versionlabels diff --git a/Doc/tools/sphinxext/static/copybutton.js b/Doc/tools/sphinxext/static/copybutton.js index a3b1099..5d82c67 100644 --- a/Doc/tools/sphinxext/static/copybutton.js +++ b/Doc/tools/sphinxext/static/copybutton.js @@ -17,7 +17,8 @@ $(document).ready(function() { 'cursor':'pointer', 'position': 'absolute', 'top': '0', 'right': '0', 'border-color': border_color, 'border-style': border_style, '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 >>> |