diff --git a/doc/sources/.static/default.css b/doc/sources/.static/default.css index 3964fa7a9..3d944f1ef 100644 --- a/doc/sources/.static/default.css +++ b/doc/sources/.static/default.css @@ -13,17 +13,18 @@ body { /* :::: LAYOUT :::: */ +div.related, +div.header, div.documentwrapper { - float: left; - width: 100%; + width: 800px; + margin: 0px auto; } div.bodywrapper { - margin: 0 0 0 310px; + margin-top: 20px; } div.body { - background-color: white; padding: 0 20px 30px 20px; } @@ -31,13 +32,6 @@ div.sphinxsidebarwrapper { padding: 10px 5px 0 10px; } -div.sphinxsidebar { - float: left; - width: 310px; - margin-left: -100%; - font-size: 90%; -} - div.clearer { clear: both; } @@ -51,14 +45,10 @@ div.footer { } div.footer a { - color: #fff; text-decoration: underline; } div.related { - background-color: #133f52; - color: #fff; - width: 100%; line-height: 30px; font-size: 90%; } @@ -82,8 +72,24 @@ div.related li.right { margin-right: 5px; } -div.related a { - color: white; +div.header { + margin-top: 20px; + height: 80px; + line-height: 80px; +} + +div.logo { + float: left; + height: 80px; + width: 75px; +} + +#searchbox { + float: right; +} + +div.related { + clear: left; } /* ::: TOC :::: */ @@ -306,16 +312,16 @@ div.body h6 { background-color: #f2f2f2; font-weight: normal; color: #20435c; - border-bottom: 1px solid #ccc; + --border-bottom: 1px solid #ccc; margin: 20px -20px 10px -20px; padding: 3px 0 3px 10px; } -div.body h1 { margin-top: 0; font-size: 200%; } -div.body h2 { font-size: 160%; } -div.body h3 { font-size: 140%; } -div.body h4 { font-size: 120%; } -div.body h5 { font-size: 110%; } +div.body h1 { margin-top: 0; font-size: 160%; } +div.body h2 { font-size: 140%; } +div.body h3 { font-size: 120%; } +div.body h4 { font-size: 110%; } +div.body h5 { font-size: 105%; } div.body h6 { font-size: 100%; } a.headerlink { @@ -720,3 +726,4 @@ table.field-list td.field-body dd { display: none; } } + diff --git a/doc/sources/.templates/layout.html b/doc/sources/.templates/layout.html index 9bdb4a9eb..502e3dd17 100644 --- a/doc/sources/.templates/layout.html +++ b/doc/sources/.templates/layout.html @@ -1,5 +1,239 @@ -{% extends "!layout.html" %} -{% block rootrellink %} -
  • Project Homepage »
    • - {{ super() }} -{% endblock %} +{%- block doctype -%} + +{%- endblock %} +{%- set reldelim1 = reldelim1 is not defined and ' »' or reldelim1 %} +{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %} +{%- set url_root = pathto('', 1) %} +{%- if url_root == '#' %}{% set url_root = '' %}{% endif %} + +{%- macro relbar_old() %} +
    +

    {{ _('Navigation') }}

    + +
    +{%- endmacro %} + +{%- macro relbar() %} +
    + +
    +{%- endmacro %} + +{%- macro header() %} + {%- if not embedded %}{% if not theme_nosidebar|tobool %} +
    +
    + + {%- if pagename != "search" %} + + + {%- endif %} +
    +
    + {%- endif %}{% endif %} +{%- endmacro %} + +{%- macro sidebar() %} + {%- if not embedded %}{% if not theme_nosidebar|tobool %} +
    +
    + {%- block sidebarlogo %} + {%- if logo %} + + {%- endif %} + {%- endblock %} + {%- block sidebartoc %} + {%- if display_toc %} +

    {{ _('Table Of Contents') }}

    + {{ toc }} + {%- endif %} + {%- endblock %} + {%- block sidebarrel %} + {%- if prev %} +

    {{ _('Previous topic') }}

    +

    {{ prev.title }}

    + {%- endif %} + {%- if next %} +

    {{ _('Next topic') }}

    +

    {{ next.title }}

    + {%- endif %} + {%- endblock %} + {%- block sidebarsourcelink %} + {%- if show_source and has_source and sourcename %} +

    {{ _('This Page') }}

    + + {%- endif %} + {%- endblock %} + {%- if customsidebar %} + {% include customsidebar %} + {%- endif %} + {%- block sidebarsearch %} + {%- if pagename != "search" %} + + + {%- endif %} + {%- endblock %} +
    +
    + {%- endif %}{% endif %} +{%- endmacro %} + + + + + {{ metatags }} + {%- if not embedded and docstitle %} + {%- set titlesuffix = " — "|safe + docstitle|e %} + {%- else %} + {%- set titlesuffix = "" %} + {%- endif %} + {{ title|striptags }}{{ titlesuffix }} + + + {%- if not embedded %} + + {%- for scriptfile in script_files %} + + {%- endfor %} + {%- if use_opensearch %} + + {%- endif %} + {%- if favicon %} + + {%- endif %} + {%- endif %} +{%- block linktags %} + {%- if hasdoc('about') %} + + {%- endif %} + {%- if hasdoc('genindex') %} + + {%- endif %} + {%- if hasdoc('search') %} + + {%- endif %} + {%- if hasdoc('copyright') %} + + {%- endif %} + + {%- if parents %} + + {%- endif %} + {%- if next %} + + {%- endif %} + {%- if prev %} + + {%- endif %} +{%- endblock %} +{%- block extrahead %} {% endblock %} + + +{%- block header %}{{ header() }}{% endblock %} + +{%- block relbar1 %}{{ relbar() }}{% endblock %} + +{%- block sidebar1 %}{% endblock %} + +
    +{%- block document %} +
    + {%- if not embedded %}{% if not theme_nosidebar|tobool %} +
    + {%- endif %}{% endif %} +
    + {% block body %} {% endblock %} +
    + {%- if not embedded %}{% if not theme_nosidebar|tobool %} +
    + {%- endif %}{% endif %} +
    +{%- endblock %} + +{%- block sidebar2 %}{% endblock %} +
    +
    + +{%- block relbar2 %}{% endblock %} + +{%- block footer %} + +{%- endblock %} + + diff --git a/doc/sources/conf.py b/doc/sources/conf.py index f28eb325f..458569f14 100644 --- a/doc/sources/conf.py +++ b/doc/sources/conf.py @@ -36,7 +36,7 @@ master_doc = 'index' # General substitutions. project = 'Kivy' -copyright = '2009, kivy-dev' +copyright = '2010, kivy-dev' # The default replacements for |version| and |release|, also used in various # other places throughout the built documents. @@ -97,7 +97,7 @@ html_style = 'default.css' # The name of an image file (within the static path) to place at the top of # the sidebar. -html_logo = 'kivy-logo.png' +html_logo = 'kivy-logo-mini.png' # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 diff --git a/doc/sources/kivy-logo-mini.png b/doc/sources/kivy-logo-mini.png new file mode 100644 index 000000000..9f00baddf Binary files /dev/null and b/doc/sources/kivy-logo-mini.png differ