diff options
| author | Georg Brandl <georg@python.org> | 2012-03-25 18:31:57 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-03-25 18:31:57 (GMT) |
| commit | ab7121430e8ef7106582b1abe0d6a900f62f22ce (patch) | |
| tree | 21473497f8eaf980993377c5bae496c51dafe4f2 | |
| parent | 11ee31ab08841b9479fe92e34c64bb95c7e1e47c (diff) | |
| download | cpython-ab7121430e8ef7106582b1abe0d6a900f62f22ce.zip cpython-ab7121430e8ef7106582b1abe0d6a900f62f22ce.tar.gz cpython-ab7121430e8ef7106582b1abe0d6a900f62f22ce.tar.bz2 | |
Switch to new "lighter" doc design.
| -rw-r--r-- | Doc/conf.py | 5 | ||||
| -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 |
4 files changed, 9 insertions, 4 deletions
diff --git a/Doc/conf.py b/Doc/conf.py index 85eb9fa..f827840 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -65,9 +65,12 @@ highlight_language = 'python3' # Options for HTML output # ----------------------- -html_theme = 'default' +html_theme = 'pydoctheme' +html_theme_path = ['tools/sphinxext'] html_theme_options = {'collapsiblesidebar': True} +html_short_title = '%s Documentation' % release + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. html_last_updated_fmt = '%b %d, %Y' 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 4329281..89bb86f 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 >>> |