From 477a62a9eb9e2e76c55219cc099fbce6c2fde5b4 Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Thu, 16 Dec 2010 20:18:30 +0100 Subject: [PATCH] update documentation generation --- doc/sources/.static/default.css | 53 ++++--- doc/sources/.templates/layout.html | 244 ++++++++++++++++++++++++++++- doc/sources/conf.py | 4 +- doc/sources/kivy-logo-mini.png | Bin 0 -> 3730 bytes 4 files changed, 271 insertions(+), 30 deletions(-) create mode 100644 doc/sources/kivy-logo-mini.png 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 0000000000000000000000000000000000000000..9f00baddff21c9e89e49032c625f4a3c8a58280b GIT binary patch literal 3730 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 SVlCho5;8NnY+Q-)i2omNDmUr? literal 0 HcmV?d00001