diff options
author | Didier Raboud <odyx@debian.org> | 2011-08-08 13:32:35 +0200 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:17:10 -0300 |
commit | 9eee51f91bb72735e8d4bb5b9ecca9e4aa00a740 (patch) | |
tree | ad7f717ca1244a7990da9692b7e43683bf0bb193 | |
parent | 6a12afd5cb3e0b7deec82147263e8f57bd18124a (diff) |
Update pysidedocs theme to rely more on sphinx's base theme:
- Drop files that are redundant with sphinx.
- Add _templates/layout.html to add the needed customisation.
- Update theme.conf to ensure theme inheritance.
- Update pysidedocs.css to fit the theme with sphinx's basic theme.
Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>
Renato Araújo <renato.filho@openbossa.org>
-rw-r--r-- | doc/_templates/layout.html | 31 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/defindex.html | 26 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/genindex-single.html | 46 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/genindex-split.html | 30 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/genindex.html | 57 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/layout.html | 147 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/modindex.html | 42 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/opensearch.xml | 10 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/page.html | 4 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/search.html | 26 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/searchbox.html | 12 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/static/pysidedocs.css | 46 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/static/underscore.js | 16 | ||||
-rw-r--r-- | doc/_themes/pysidedocs/theme.conf | 4 |
14 files changed, 72 insertions, 425 deletions
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html new file mode 100644 index 000000000..b07c9f7d3 --- /dev/null +++ b/doc/_templates/layout.html @@ -0,0 +1,31 @@ +{% extends "!layout.html" %} + +# Invert sidebars +{%- block sidebar1 %}{{ sidebar() }}{%- endblock %} +{%- block sidebar2 %}{%- endblock %} + +{%- block header %} +<div id="container"> +<div class="header"> + <div class="header_container"> + <div class="logo"><a href="http://www.pyside.org"><img alt="PySide" src="{{ pathto('_static/pysidelogo.png', 1) }}" width="199" height="102" /></a></div> + {{ relbar() }} + </div> +</div> +{%- endblock -%} + +{%- block footer %} + <div class="footer"> + <a href="http://www.indt.org.br"><img src="{{ pathto('_static/logo_indt.jpg', 1) }}" alt="Indt" border="0" /></a> + <a href="http://www.openbossa.org"><img src="{{ pathto('_static/logo_openbossa.png', 1) }}" alt="Openbossa" border="0" /></a> + <a href="http://qt.nokia.com/"><img src="{{ pathto('_static/logo_qt.png', 1) }}" alt="Qt" border="0" /></a> + <a href="http://www.python.org"><img src="{{ pathto('_static/logo_python.jpg', 1) }}" alt="Python" border="0" /></a> + </div> +</div> +{%- endblock %} + +# No top relbar. +{%- block relbar1 %}{%- endblock %} + +# No bottom relbar. +{%- block relbar2 %}{%- endblock %} diff --git a/doc/_themes/pysidedocs/defindex.html b/doc/_themes/pysidedocs/defindex.html deleted file mode 100644 index 40f4f4c90..000000000 --- a/doc/_themes/pysidedocs/defindex.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "layout.html" %} -{% set title = _('Overview') %} -{% block body %} - <h1>{{ docstitle|e }}</h1> - <p> - Welcome! This is - {% block description %}the documentation for {{ project|e }} - {{ release|e }}{% if last_updated %}, last updated {{ last_updated|e }}{% endif %}{% endblock %}. - </p> - {% block tables %} - <p><strong>{{ _('Indices and tables:') }}</strong></p> - <table class="contentstable" align="center"><tr> - <td width="50%"> - <p class="biglink"><a class="biglink" href="{{ pathto("contents") }}">{{ _('Complete Table of Contents') }}</a><br> - <span class="linkdescr">{{ _('lists all sections and subsections') }}</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("search") }}">{{ _('Search Page') }}</a><br> - <span class="linkdescr">{{ _('search this documentation') }}</span></p> - </td><td width="50%"> - <p class="biglink"><a class="biglink" href="{{ pathto("modindex") }}">{{ _('Global Module Index') }}</a><br> - <span class="linkdescr">{{ _('quick access to all modules') }}</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("genindex") }}">{{ _('General Index') }}</a><br> - <span class="linkdescr">{{ _('all functions, classes, terms') }}</span></p> - </td></tr> - </table> - {% endblock %} -{% endblock %} diff --git a/doc/_themes/pysidedocs/genindex-single.html b/doc/_themes/pysidedocs/genindex-single.html deleted file mode 100644 index 9aaaeb0ca..000000000 --- a/doc/_themes/pysidedocs/genindex-single.html +++ /dev/null @@ -1,46 +0,0 @@ -{% extends "layout.html" %} -{% set title = _('Index') %} -{% block body %} - - <h1 id="index">{% trans key=key %}Index – {{ key }}{% endtrans %}</h1> - -<table width="100%" class="indextable"><tr><td width="33%" valign="top"> -<dl> -{%- set breakat = count // 2 %} -{%- set numcols = 1 %} -{%- set numitems = 0 %} -{% for entryname, (links, subitems) in entries %} -<dt>{%- if links -%}<a href="{{ links[0] }}">{{ entryname|e }}</a> - {%- for link in links[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor -%} - {%- else -%} -{{ entryname|e }} - {%- endif -%}</dt> - {%- if subitems %} - <dd><dl> - {%- for subentryname, subentrylinks in subitems %} - <dt><a href="{{ subentrylinks[0] }}">{{ subentryname|e }}</a> - {%- for link in subentrylinks[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor -%} - </dt> - {%- endfor %} - </dl></dd> - {%- endif -%} -{%- set numitems = numitems + 1 + (subitems|length) -%} -{%- if numcols < 2 and numitems > breakat -%} -{%- set numcols = numcols+1 -%} -</dl></td><td width="33%" valign="top"><dl> -{%- endif -%} -{%- endfor %} -</dl></td></tr></table> - -{% endblock %} - -{% block sidebarrel %} - <h4>Index</h4> - <p>{% for key, dummy in genindexentries -%} - <a href="{{ pathto('genindex-' + key) }}"><strong>{{ key }}</strong></a> - {% if not loop.last %}| {% endif %} - {%- endfor %}</p> - - <p><a href="{{ pathto('genindex-all') }}"><strong>{{ _('Full index on one page') }}</strong></a></p> - {{ super() }} -{% endblock %} diff --git a/doc/_themes/pysidedocs/genindex-split.html b/doc/_themes/pysidedocs/genindex-split.html deleted file mode 100644 index ab099e5bd..000000000 --- a/doc/_themes/pysidedocs/genindex-split.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "layout.html" %} -{% set title = _('Index') %} -{% block body %} - - <h1 id="index">{{ _('Index') }}</h1> - - <p>{{ _('Index pages by letter') }}:</p> - - <p>{% for key, dummy in genindexentries -%} - <a href="{{ pathto('genindex-' + key) }}"><strong>{{ key }}</strong></a> - {% if not loop.last %}| {% endif %} - {%- endfor %}</p> - - <p><a href="{{ pathto('genindex-all') }}"><strong>{{ _('Full index on one page') }}</strong> - ({{ _('can be huge') }})</a></p> - -{% endblock %} - -{% block sidebarrel %} -{% if split_index %} - <h4>Index</h4> - <p>{% for key, dummy in genindexentries -%} - <a href="{{ pathto('genindex-' + key) }}"><strong>{{ key }}</strong></a> - {% if not loop.last %}| {% endif %} - {%- endfor %}</p> - - <p><a href="{{ pathto('genindex-all') }}"><strong>{{ _('Full index on one page') }}</strong></a></p> -{% endif %} - {{ super() }} -{% endblock %} diff --git a/doc/_themes/pysidedocs/genindex.html b/doc/_themes/pysidedocs/genindex.html deleted file mode 100644 index a19aa80f4..000000000 --- a/doc/_themes/pysidedocs/genindex.html +++ /dev/null @@ -1,57 +0,0 @@ -{% extends "layout.html" %} -{% set title = _('Index') %} -{% block body %} - - <h1 id="index">{{ _('Index') }}</h1> - - {% for key, dummy in genindexentries -%} - <a href="#{{ key }}"><strong>{{ key }}</strong></a> {% if not loop.last %}| {% endif %} - {%- endfor %} - - <hr /> - - {% for key, entries in genindexentries %} -<h2 id="{{ key }}">{{ key }}</h2> -<table width="100%" class="indextable"><tr><td width="33%" valign="top"> -<dl> -{%- set breakat = genindexcounts[loop.index0] // 2 %} -{%- set numcols = 1 %} -{%- set numitems = 0 %} -{% for entryname, (links, subitems) in entries %} -<dt>{%- if links -%}<a href="{{ links[0] }}">{{ entryname|e }}</a> - {%- for link in links[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor -%} - {%- else -%} -{{ entryname|e }} - {%- endif -%}</dt> - {%- if subitems %} - <dd><dl> - {%- for subentryname, subentrylinks in subitems %} - <dt><a href="{{ subentrylinks[0] }}">{{ subentryname|e }}</a> - {%- for link in subentrylinks[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor -%} - </dt> - {%- endfor %} - </dl></dd> - {%- endif -%} -{%- set numitems = numitems + 1 + (subitems|length) -%} -{%- if numcols < 2 and numitems > breakat -%} -{%- set numcols = numcols+1 -%} -</dl></td><td width="33%" valign="top"><dl> -{%- endif -%} -{%- endfor %} -</dl></td></tr></table> -{% endfor %} - -{% endblock %} - -{% block sidebarrel %} -{% if split_index %} - <h4>{{ _('Index') }}</h4> - <p>{% for key, dummy in genindexentries -%} - <a href="{{ pathto('genindex-' + key) }}"><strong>{{ key }}</strong></a> - {% if not loop.last %}| {% endif %} - {%- endfor %}</p> - - <p><a href="{{ pathto('genindex-all') }}"><strong>{{ _('Full index on one page') }}</strong></a></p> -{% endif %} - {{ super() }} -{% endblock %} diff --git a/doc/_themes/pysidedocs/layout.html b/doc/_themes/pysidedocs/layout.html deleted file mode 100644 index 3115aa72b..000000000 --- a/doc/_themes/pysidedocs/layout.html +++ /dev/null @@ -1,147 +0,0 @@ -{%- block doctype -%} -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -{%- endblock %} -{%- set reldelim1 = reldelim1 is not defined and ' »' or reldelim1 %} -{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %} - -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - {{ metatags }} - <title>{{ project }} — {{ title }}</title> - <link rel="stylesheet" href="{{ pathto('_static/pysidedocs.css', 1) }}" type="text/css" /> - <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" /> - - {%- if not embedded %} - <script type="text/javascript"> - var DOCUMENTATION_OPTIONS = { - URL_ROOT: '{{ pathto("", 1) }}', - VERSION: '{{ release|e }}', - COLLAPSE_MODINDEX: false, - FILE_SUFFIX: '{{ file_suffix }}', - HAS_SOURCE: {{ has_source|lower }} - }; - </script> - {%- for scriptfile in script_files %} - <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script> - {%- endfor %} - {%- if pagename == "screenshots" %} - {%- endif %} - <!--[if lt IE 7]> - <style media="screen" type="text/css"> - #container { - height:100%; - } - </style> - <![endif]--> - - {%- if use_opensearch %} - <link rel="search" type="application/opensearchdescription+xml" - title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" - href="{{ pathto('_static/opensearch.xml', 1) }}"/> - {%- endif %} - {%- if favicon %} - <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/> - {%- endif %} - {%- endif %} -{%- block linktags %} - {%- if hasdoc('about') %} - <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" /> - {%- endif %} - {%- if hasdoc('genindex') %} - <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" /> - {%- endif %} - {%- if hasdoc('search') %} - <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" /> - {%- endif %} - {%- if hasdoc('copyright') %} - <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" /> - {%- endif %} - <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" /> - {%- if parents %} - <link rel="up" title="{{ parents[-1].title|striptags }}" href="{{ parents[-1].link|e }}" /> - {%- endif %} - {%- if next %} - <link rel="next" title="{{ next.title|striptags }}" href="{{ next.link|e }}" /> - {%- endif %} - {%- if prev %} - <link rel="prev" title="{{ prev.title|striptags }}" href="{{ prev.link|e }}" /> - {%- endif %} -{%- endblock %} -{%- block extrahead %} {% endblock %} - </head> - <body id="{{ pagename }}"> -{%- block header %}{% endblock %} - -<div id="container"> -<div id="header"> - <div id="header_container"> - <div id="logo"><a href="http://www.pyside.org"><img alt="PySide" src="{{ pathto('_static/pysidelogo.png', 1) }}" width="199" height="102" /></a></div> - <ul id="relbar"> - {%- for rellink in rellinks %} - <li class="right"> - <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags }}" - {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a> - {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li> - {%- endfor %} - {%- block rootrellink %} - <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}</li> - {%- endblock %} - {%- for parent in parents %} - <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li> - {%- endfor %} - {%- block relbaritems %} {% endblock %} - </ul> - </div> -</div> - -<div id="body" > - <div id="sidebar"> - {%- block sidebartoc %} - {%- if display_toc %} - <h3><a href="{{ pathto(master_doc) }}">{{ _('Table Of Contents') }}</a></h3> - {{ toc }} - {%- endif %} - {%- endblock %} - {%- block sidebarrel %} - {%- if prev %} - <h3>{{ _('Previous topic') }}</h3> - <p class="topless"><a href="{{ prev.link|e }}" - title="{{ _('previous chapter') }}">{{ prev.title }}</a></p> - {%- endif %} - {%- if next %} - <h3>{{ _('Next topic') }}</h3> - <p class="topless"><a href="{{ next.link|e }}" - title="{{ _('next chapter') }}">{{ next.title }}</a></p> - {%- endif %} - {%- endblock %} - - <div id="search_box"> - <h3>Quick search</h3> - <form action="{{ pathto('search') }}" method="get"> - <input type="text" name="q" id="q" /> - <input type="submit" value="Go" id="search_button" /> - <input type="hidden" name="check_keywords" value="yes" /> - <input type="hidden" name="area" value="default" /> - </form> - </div> - - </div> - - {%- block document %} - {% block body %} {% endblock %} - {%- endblock %} -</div> <!-- container --> - -{%- block footer %} -<div id="footer"> - <a href="http://www.indt.org.br"><img src="{{ pathto('_static/logo_indt.jpg', 1) }}" alt="Indt" border="0" /></a> - <a href="http://www.openbossa.org"><img src="{{ pathto('_static/logo_openbossa.png', 1) }}" alt="Openbossa" border="0" /></a> - <a href="http://qt.nokia.com/"><img src="{{ pathto('_static/logo_qt.png', 1) }}" alt="Qt" border="0" /></a> - <a href="http://www.python.org"><img src="{{ pathto('_static/logo_python.jpg', 1) }}" alt="Python" border="0" /></a> -</div> -{%- endblock %} -</div> -</body> -</html> diff --git a/doc/_themes/pysidedocs/modindex.html b/doc/_themes/pysidedocs/modindex.html deleted file mode 100644 index 0392edc80..000000000 --- a/doc/_themes/pysidedocs/modindex.html +++ /dev/null @@ -1,42 +0,0 @@ -{% extends "layout.html" %} -{% set title = _('Global Module Index') %} -{% block extrahead %} -{{ super() }} -{% if not embedded and collapse_modindex %} - <script type="text/javascript"> - DOCUMENTATION_OPTIONS.COLLAPSE_MODINDEX = true; - </script> -{% endif %} -{% endblock %} -{% block body %} - - <h1 id="global-module-index">{{ _('Global Module Index') }}</h1> - - {%- for letter in letters %} - <a href="#cap-{{ letter }}"><strong>{{ letter }}</strong></a> {% if not loop.last %}| {% endif %} - {%- endfor %} - <hr/> - - <table width="100%" class="indextable" cellspacing="0" cellpadding="2"> - {%- for modname, collapse, cgroup, indent, fname, synops, pform, dep, stripped in modindexentries %} - {%- if not modname -%} - <tr class="pcap"><td></td><td> </td><td></td></tr> - <tr class="cap"><td></td><td><a name="cap-{{ fname }}"><strong>{{ fname }}</strong></a></td><td></td></tr> - {%- else -%} - <tr{% if indent %} class="cg-{{ cgroup }}"{% endif %}> - <td>{% if collapse -%} - <img src="{{ pathto('_static/minus.png', 1) }}" id="toggle-{{ cgroup }}" - class="toggler" style="display: none" alt="-" /> - {%- endif %}</td> - <td>{% if indent %} {% endif %} - {% if fname %}<a href="{{ fname }}">{% endif -%} - <tt class="xref">{{ stripped|e }}{{ modname|e }}</tt> - {%- if fname %}</a>{% endif %} - {%- if pform and pform[0] %} <em>({{ pform|join(', ') }})</em>{% endif -%} - </td><td>{% if dep %}<strong>{{ _('Deprecated')}}:</strong>{% endif %} - <em>{{ synops|e }}</em></td></tr> - {%- endif -%} - {% endfor %} - </table> - -{% endblock %} diff --git a/doc/_themes/pysidedocs/opensearch.xml b/doc/_themes/pysidedocs/opensearch.xml deleted file mode 100644 index 03875be49..000000000 --- a/doc/_themes/pysidedocs/opensearch.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>{{ project|e }}</ShortName> - <Description>{% trans docstitle=docstitle|e %}Search {{ docstitle }}{% endtrans %}</Description> - <InputEncoding>utf-8</InputEncoding> - <Url type="text/html" method="get" - template="{{ use_opensearch }}/{{ pathto('search') }}?q={searchTerms}&check_keywords=yes&area=default"/> - <LongName>{{ docstitle|e }}</LongName> -{% block extra %} {# Put e.g. an <Image> element here. #} {% endblock %} -</OpenSearchDescription> diff --git a/doc/_themes/pysidedocs/page.html b/doc/_themes/pysidedocs/page.html deleted file mode 100644 index 17a930165..000000000 --- a/doc/_themes/pysidedocs/page.html +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "layout.html" %} -{% block body %} - {{ body }} -{% endblock %} diff --git a/doc/_themes/pysidedocs/search.html b/doc/_themes/pysidedocs/search.html deleted file mode 100644 index d7455327a..000000000 --- a/doc/_themes/pysidedocs/search.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "layout.html" %} -{% set title = _('Search') %} -{% set script_files = script_files + ['_static/searchtools.js'] %} -{% block body %} -<div class="section"> - <h1 id="search-documentation">Search Results</h1> - <div id="fallback" class="admonition warning"> - <script type="text/javascript">$('#fallback').hide();</script> - <p> - {% trans %}Please activate JavaScript to enable the search - functionality.{% endtrans %} - </p> - </div> - {% if search_performed %} - {% if not search_results %} - <p>{{ _('Your search did not match any results.') }}</p> - {% endif %} - {% endif %} - <div id="search-results"> - </div> -</div> -{% endblock %} -{% block footer %} - {{ super() }} - <script type="text/javascript" src="searchindex.js"></script> -{% endblock %} diff --git a/doc/_themes/pysidedocs/searchbox.html b/doc/_themes/pysidedocs/searchbox.html new file mode 100644 index 000000000..55a972156 --- /dev/null +++ b/doc/_themes/pysidedocs/searchbox.html @@ -0,0 +1,12 @@ +{%- if pagename != "search" %} +<div id="searchbox" style="display: none"> + <h3>{{ _('Quick search') }}</h3> + <form class="search" action="{{ pathto('search') }}" method="get"> + <input type="text" name="q" id="q" size="18" /> + <input type="submit" value="{{ _('Go') }}" id="search_button" /> + <input type="hidden" name="check_keywords" value="yes" /> + <input type="hidden" name="area" value="default" /> + </form> +</div> +<script type="text/javascript">$('#searchbox').show(0);</script> +{%- endif %} diff --git a/doc/_themes/pysidedocs/static/pysidedocs.css b/doc/_themes/pysidedocs/static/pysidedocs.css index 39d8a4280..fd81f4379 100644 --- a/doc/_themes/pysidedocs/static/pysidedocs.css +++ b/doc/_themes/pysidedocs/static/pysidedocs.css @@ -20,7 +20,7 @@ strong { font-weight:bold; } -#body { +.document { padding-bottom: 90px; } @@ -32,8 +32,8 @@ strong { background-color: white; } -#footer { - position:absolute; +.footer { + position: absolute; bottom: 0px; margin-top: 50px; text-align:center; @@ -44,40 +44,40 @@ strong { width: 100%; } -#footer img { +.footer img { margin-left: 8px; margin-right: 8px; } -#sidebar { +.sphinxsidebar { float: left; width: 250px; padding: 0px 10px 0px 10px; text-align: left; } -#sidebar ul { +.sphinxsidebar ul { padding: 0px; margin: 0px; list-style-position: inside; } -#sidebar > ul { +.sphinxsidebar > ul { padding: 0px; margin: 0px; } -#sidebar ul li { +.sphinxsidebar ul li { margin-left: 10px; padding: 0px; } -#sidebar h3, #sidebar h3 a { +.sphinxsidebar h3, .sphinxsidebar h3 a { font-weight: bold; color: #333; } -#body > div.section { +.documentwrapper { margin-left: 270px; text-align: left; background-color: #ffffff; @@ -257,24 +257,24 @@ hr { } /******************* TOPO *****************************/ -#header { +.header { background-image: url(bg_topo.jpg); background-repeat: repeat-x; height: 147px; } -#header_container { +.header_container { background-image: url(bg_header.png); background-repeat: no-repeat; background-position: 100px 0px; } -#logo { +.logo { text-align: left; margin-bottom: 10px; } -#search_box { +#searchbox { border-top: 1px solid #989898; padding-top: 10px; margin-left: -10px; @@ -342,31 +342,39 @@ em { /******** REL bar *********/ -#relbar { - padding: 0px 10px 0px 10px; +.related { + display: inline; +} + +.related ul { + padding: 0px 0px 0px 10px; margin: 0px; text-align: left; background-image: url(relbar_bg.png); } -#relbar li { +.related li { display: inline; color: white; font-weight: bold; } -#relbar li a { +.related li a { color: inherit; line-height: 35px; font-weight: bold; vertical-align: middle; } -#relbar li.right { +.related li.right { float: right; margin-right: 5px; } +.related h3 { + display: none; +} + .align-center { text-align: center; } diff --git a/doc/_themes/pysidedocs/static/underscore.js b/doc/_themes/pysidedocs/static/underscore.js deleted file mode 100644 index 9146e0860..000000000 --- a/doc/_themes/pysidedocs/static/underscore.js +++ /dev/null @@ -1,16 +0,0 @@ -(function(){var j=this,n=j._,i=function(a){this._wrapped=a},m=typeof StopIteration!=="undefined"?StopIteration:"__break__",b=j._=function(a){return new i(a)};if(typeof exports!=="undefined")exports._=b;var k=Array.prototype.slice,o=Array.prototype.unshift,p=Object.prototype.toString,q=Object.prototype.hasOwnProperty,r=Object.prototype.propertyIsEnumerable;b.VERSION="0.5.5";b.each=function(a,c,d){try{if(a.forEach)a.forEach(c,d);else if(b.isArray(a)||b.isArguments(a))for(var e=0,f=a.length;e<f;e++)c.call(d, -a[e],e,a);else{var g=b.keys(a);f=g.length;for(e=0;e<f;e++)c.call(d,a[g[e]],g[e],a)}}catch(h){if(h!=m)throw h;}return a};b.map=function(a,c,d){if(a&&b.isFunction(a.map))return a.map(c,d);var e=[];b.each(a,function(f,g,h){e.push(c.call(d,f,g,h))});return e};b.reduce=function(a,c,d,e){if(a&&b.isFunction(a.reduce))return a.reduce(b.bind(d,e),c);b.each(a,function(f,g,h){c=d.call(e,c,f,g,h)});return c};b.reduceRight=function(a,c,d,e){if(a&&b.isFunction(a.reduceRight))return a.reduceRight(b.bind(d,e),c); -var f=b.clone(b.toArray(a)).reverse();b.each(f,function(g,h){c=d.call(e,c,g,h,a)});return c};b.detect=function(a,c,d){var e;b.each(a,function(f,g,h){if(c.call(d,f,g,h)){e=f;b.breakLoop()}});return e};b.select=function(a,c,d){if(a&&b.isFunction(a.filter))return a.filter(c,d);var e=[];b.each(a,function(f,g,h){c.call(d,f,g,h)&&e.push(f)});return e};b.reject=function(a,c,d){var e=[];b.each(a,function(f,g,h){!c.call(d,f,g,h)&&e.push(f)});return e};b.all=function(a,c,d){c=c||b.identity;if(a&&b.isFunction(a.every))return a.every(c, -d);var e=true;b.each(a,function(f,g,h){(e=e&&c.call(d,f,g,h))||b.breakLoop()});return e};b.any=function(a,c,d){c=c||b.identity;if(a&&b.isFunction(a.some))return a.some(c,d);var e=false;b.each(a,function(f,g,h){if(e=c.call(d,f,g,h))b.breakLoop()});return e};b.include=function(a,c){if(b.isArray(a))return b.indexOf(a,c)!=-1;var d=false;b.each(a,function(e){if(d=e===c)b.breakLoop()});return d};b.invoke=function(a,c){var d=b.rest(arguments,2);return b.map(a,function(e){return(c?e[c]:e).apply(e,d)})};b.pluck= -function(a,c){return b.map(a,function(d){return d[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);var e={computed:-Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g>=e.computed&&(e={value:f,computed:g})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g<e.computed&&(e={value:f,computed:g})});return e.value};b.sortBy=function(a,c,d){return b.pluck(b.map(a, -function(e,f,g){return{value:e,criteria:c.call(d,e,f,g)}}).sort(function(e,f){e=e.criteria;f=f.criteria;return e<f?-1:e>f?1:0}),"value")};b.sortedIndex=function(a,c,d){d=d||b.identity;for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?(e=g+1):(f=g)}return e};b.toArray=function(a){if(!a)return[];if(a.toArray)return a.toArray();if(b.isArray(a))return a;if(b.isArguments(a))return k.call(a);return b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=function(a,c,d){return c&&!d?k.call(a, -0,c):a[0]};b.rest=function(a,c,d){return k.call(a,b.isUndefined(c)||d?1:c)};b.last=function(a){return a[a.length-1]};b.compact=function(a){return b.select(a,function(c){return!!c})};b.flatten=function(a){return b.reduce(a,[],function(c,d){if(b.isArray(d))return c.concat(b.flatten(d));c.push(d);return c})};b.without=function(a){var c=b.rest(arguments);return b.select(a,function(d){return!b.include(c,d)})};b.uniq=function(a,c){return b.reduce(a,[],function(d,e,f){if(0==f||(c===true?b.last(d)!=e:!b.include(d, -e)))d.push(e);return d})};b.intersect=function(a){var c=b.rest(arguments);return b.select(b.uniq(a),function(d){return b.all(c,function(e){return b.indexOf(e,d)>=0})})};b.zip=function(){for(var a=b.toArray(arguments),c=b.max(b.pluck(a,"length")),d=new Array(c),e=0;e<c;e++)d[e]=b.pluck(a,String(e));return d};b.indexOf=function(a,c){if(a.indexOf)return a.indexOf(c);for(var d=0,e=a.length;d<e;d++)if(a[d]===c)return d;return-1};b.lastIndexOf=function(a,c){if(a.lastIndexOf)return a.lastIndexOf(c);for(var d= -a.length;d--;)if(a[d]===c)return d;return-1};b.range=function(a,c,d){var e=b.toArray(arguments),f=e.length<=1;a=f?0:e[0];c=f?e[0]:e[1];d=e[2]||1;e=Math.ceil((c-a)/d);if(e<=0)return[];e=new Array(e);f=a;for(var g=0;1;f+=d){if((d>0?f-c:c-f)>=0)return e;e[g++]=f}};b.bind=function(a,c){var d=b.rest(arguments,2);return function(){return a.apply(c||j,d.concat(b.toArray(arguments)))}};b.bindAll=function(a){var c=b.rest(arguments);if(c.length==0)c=b.functions(a);b.each(c,function(d){a[d]=b.bind(a[d],a)}); -return a};b.delay=function(a,c){var d=b.rest(arguments,2);return setTimeout(function(){return a.apply(a,d)},c)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(b.rest(arguments)))};b.wrap=function(a,c){return function(){var d=[a].concat(b.toArray(arguments));return c.apply(c,d)}};b.compose=function(){var a=b.toArray(arguments);return function(){for(var c=b.toArray(arguments),d=a.length-1;d>=0;d--)c=[a[d].apply(this,c)];return c[0]}};b.keys=function(a){if(b.isArray(a))return b.range(0,a.length); -var c=[];for(var d in a)q.call(a,d)&&c.push(d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=function(a){return b.select(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a,c){for(var d in c)a[d]=c[d];return a};b.clone=function(a){if(b.isArray(a))return a.slice(0);return b.extend({},a)};b.tap=function(a,c){c(a);return a};b.isEqual=function(a,c){if(a===c)return true;var d=typeof a;if(d!=typeof c)return false;if(a==c)return true;if(!a&&c||a&&!c)return false; -if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return true;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return false;if(a.length&&a.length!==c.length)return false;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return false;for(var f in a)if(!b.isEqual(a[f],c[f]))return false;return true};b.isEmpty=function(a){return b.keys(a).length== -0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=function(a){return!!(a&&a.concat&&a.unshift)};b.isArguments=function(a){return a&&b.isNumber(a.length)&&!b.isArray(a)&&!r.call(a,"length")};b.isFunction=function(a){return!!(a&&a.constructor&&a.call&&a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};b.isNumber=function(a){return p.call(a)==="[object Number]"};b.isDate=function(a){return!!(a&&a.getTimezoneOffset&&a.setUTCFullYear)};b.isRegExp=function(a){return!!(a&& -a.test&&a.exec&&(a.ignoreCase||a.ignoreCase===false))};b.isNaN=function(a){return b.isNumber(a)&&isNaN(a)};b.isNull=function(a){return a===null};b.isUndefined=function(a){return typeof a=="undefined"};b.noConflict=function(){j._=n;return this};b.identity=function(a){return a};b.breakLoop=function(){throw m;};var s=0;b.uniqueId=function(a){var c=s++;return a?a+c:c};b.template=function(a,c){a=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+a.replace(/[\r\t\n]/g, -" ").replace(/'(?=[^%]*%>)/g,"\t").split("'").join("\\'").split("\t").join("'").replace(/<%=(.+?)%>/g,"',$1,'").split("<%").join("');").split("%>").join("p.push('")+"');}return p.join('');");return c?a(c):a};b.forEach=b.each;b.foldl=b.inject=b.reduce;b.foldr=b.reduceRight;b.filter=b.select;b.every=b.all;b.some=b.any;b.head=b.first;b.tail=b.rest;b.methods=b.functions;var l=function(a,c){return c?b(a).chain():a};b.each(b.functions(b),function(a){var c=b[a];i.prototype[a]=function(){var d=b.toArray(arguments); -o.call(d,this._wrapped);return l(c.apply(b,d),this._chain)}});b.each(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){c.apply(this._wrapped,arguments);return l(this._wrapped,this._chain)}});b.each(["concat","join","slice"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){return l(c.apply(this._wrapped,arguments),this._chain)}});i.prototype.chain=function(){this._chain=true;return this};i.prototype.value=function(){return this._wrapped}})(); diff --git a/doc/_themes/pysidedocs/theme.conf b/doc/_themes/pysidedocs/theme.conf index d1fe6d1f9..e0a652a5d 100644 --- a/doc/_themes/pysidedocs/theme.conf +++ b/doc/_themes/pysidedocs/theme.conf @@ -1,6 +1,6 @@ [theme] -inherit = none -stylesheet = basic.css +inherit = default +stylesheet = pysidedocs.css pygments_style = none [options] |