diff --git a/docs/_static/basic.css b/docs/_static/basic.css deleted file mode 100644 index d94f190c7..000000000 --- a/docs/_static/basic.css +++ /dev/null @@ -1,460 +0,0 @@ -/* - * basic.css - * ~~~~~~~~~ - * - * Sphinx stylesheet -- basic theme. - * - * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. - * :license: BSD, see LICENSE for details. - * - */ - -/* -- relbar ---------------------------------------------------------------- */ - -div.related { - width: 100%; - font-size: 90%; -} - -div.related h3 { - display: none; -} - -div.related ul { - margin: 0; - padding: 0 0 0 10px; - list-style: none; -} - -div.related li { - display: inline; -} - -div.related li.right { - float: right; - margin-right: 5px; -} - -/* -- search page ----------------------------------------------------------- */ - -ul.search { - margin: 10px 0 0 20px; - padding: 0; -} - -ul.search li { - padding: 5px 0 5px 20px; - background-image: url(file.png); - background-repeat: no-repeat; - background-position: 0 7px; -} - -ul.search li a { - font-weight: bold; -} - -ul.search li div.context { - color: #888; - margin: 2px 0 0 30px; - text-align: left; -} - -ul.keywordmatches li.goodmatch a { - font-weight: bold; -} - -/* -- general index --------------------------------------------------------- */ - -table.indextable { - width: 100%; -} - -table.indextable td { - text-align: left; - vertical-align: top; -} - -table.indextable dl, table.indextable dd { - margin-top: 0; - margin-bottom: 0; -} - -table.indextable tr.pcap { - height: 10px; -} - -table.indextable tr.cap { - margin-top: 10px; - background-color: #f2f2f2; -} - -img.toggler { - margin-right: 3px; - margin-top: 3px; - cursor: pointer; -} - -div.modindex-jumpbox { - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - margin: 1em 0 1em 0; - padding: 0.4em; -} - -div.genindex-jumpbox { - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - margin: 1em 0 1em 0; - padding: 0.4em; -} - -/* -- general body styles --------------------------------------------------- */ - -a.headerlink { - visibility: hidden; -} - -h1:hover > a.headerlink, -h2:hover > a.headerlink, -h3:hover > a.headerlink, -h4:hover > a.headerlink, -h5:hover > a.headerlink, -h6:hover > a.headerlink, -dt:hover > a.headerlink { - visibility: hidden; -} - -div.body p.caption { - text-align: inherit; -} - -div.body td { - text-align: left; -} - -.field-list ul { - padding-left: 1em; -} - -.first { - margin-top: 0 !important; -} - -p.rubric { - margin-top: 30px; - font-weight: bold; -} - -img.align-left, .figure.align-left, object.align-left { - clear: left; - float: left; - margin-right: 1em; -} - -img.align-right, .figure.align-right, object.align-right { - clear: right; - float: right; - margin-left: 1em; -} - -img.align-center, .figure.align-center, object.align-center { - display: block; - margin-left: auto; - margin-right: auto; -} - -.align-left { - text-align: left; -} - -.align-center { - clear: both; - text-align: center; -} - -.align-right { - text-align: right; -} - -/* -- sidebars -------------------------------------------------------------- */ - -div.sidebar { - margin: 0 0 0.5em 1em; - border: 1px solid #ddb; - padding: 7px 7px 0 7px; - background-color: #ffe; - width: 40%; - float: right; -} - -p.sidebar-title { - font-weight: bold; -} - -/* -- topics ---------------------------------------------------------------- */ - -div.topic { - border: 1px solid #ccc; - padding: 7px 7px 0 7px; - margin: 10px 0 10px 0; -} - -p.topic-title { - font-size: 1.1em; - font-weight: bold; - margin-top: 10px; -} - -/* -- admonitions ----------------------------------------------------------- */ - -div.admonition { - margin-top: 10px; - margin-bottom: 10px; - padding: 7px; -} - -div.admonition dt { - font-weight: bold; -} - -div.admonition dl { - margin-bottom: 0; -} - -p.admonition-title { - margin: 0px 10px 5px 0px; - font-weight: bold; -} - -div.body p.centered { - text-align: center; - margin-top: 25px; -} - -/* -- tables ---------------------------------------------------------------- */ - -table.docutils { - border: 0; - border-collapse: collapse; -} - -table.docutils td, table.docutils th { - padding: 1px 8px 1px 5px; - border-top: 0; - border-left: 0; - border-right: 0; - border-bottom: 1px solid #aaa; -} - -table.field-list td, table.field-list th { - border: 0 !important; -} - -table.footnote td, table.footnote th { - border: 0 !important; -} - -th { - text-align: left; - padding-right: 5px; -} - -table.citation { - border-left: solid 1px gray; - margin-left: 1px; -} - -table.citation td { - border-bottom: none; -} - -/* -- other body styles ----------------------------------------------------- */ - -ol.arabic { - list-style: decimal; -} - -ol.loweralpha { - list-style: lower-alpha; -} - -ol.upperalpha { - list-style: upper-alpha; -} - -ol.lowerroman { - list-style: lower-roman; -} - -ol.upperroman { - list-style: upper-roman; -} - -dl { - margin-bottom: 15px; -} - -dd p { - margin-top: 0px; -} - -dd ul, dd table { - margin-bottom: 10px; -} - -dd { - margin-top: 3px; - margin-bottom: 10px; - margin-left: 30px; -} - -dt:target, .highlighted { - background-color: #fbe54e; -} - -dl.glossary dt { - font-weight: bold; - font-size: 1.1em; -} - -.field-list ul { - margin: 0; - padding-left: 1em; -} - -.field-list p { - margin: 0; -} - -.refcount { - color: #060; -} - -.optional { - font-size: 1.3em; -} - -.versionmodified { - font-style: italic; -} - -.system-message { - background-color: #fda; - padding: 5px; - border: 3px solid red; -} - -.footnote:target { - background-color: #ffa; -} - -.line-block { - display: block; - margin-top: 1em; - margin-bottom: 1em; -} - -.line-block .line-block { - margin-top: 0; - margin-bottom: 0; - margin-left: 1.5em; -} - -.guilabel, .menuselection { - font-family: sans-serif; -} - -.accelerator { - text-decoration: underline; -} - -.classifier { - font-style: oblique; -} - -/* -- code displays --------------------------------------------------------- */ - -pre { - overflow: auto; - overflow-y: hidden; /* fixes display issues on Chrome browsers */ -} - -td.linenos pre { - padding: 5px 0px; - border: 0; - background-color: transparent; - color: #aaa; -} - -table.highlighttable { - margin-left: 0.5em; -} - -table.highlighttable td { - padding: 0 0.5em 0 0.5em; -} - -tt.descname { - background-color: transparent; - font-weight: bold; - font-size: 1.2em; -} - -tt.descclassname { - background-color: transparent; -} - -tt.xref, a tt { - background-color: transparent; - font-weight: bold; -} - -h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt { - background-color: transparent; -} - -.viewcode-link { - float: right; -} - -.viewcode-back { - float: right; - font-family: sans-serif; -} - -div.viewcode-block:target { - margin: -1px -10px; - padding: 0 10px; -} - -/* -- math display ---------------------------------------------------------- */ - -img.math { - vertical-align: middle; -} - -div.body div.math p { - text-align: center; -} - -span.eqno { - float: right; -} - -/* -- printout stylesheet --------------------------------------------------- */ - -@media print { - div.document, - div.documentwrapper, - div.bodywrapper { - margin: 0 !important; - width: 100%; - } - - div.sphinxsidebar, - div.related, - div.footer, - #top-link { - display: none; - } -} diff --git a/docs/_static/default.css b/docs/_static/default.css index 4471244a4..82ba55fb7 100644 --- a/docs/_static/default.css +++ b/docs/_static/default.css @@ -4,10 +4,6 @@ @import url("basic.css"); */ - - -/*@import url(http://fonts.googleapis.com/css?family=Ubuntu);*/ - @font-face { font-family: 'Ubuntu'; font-style: normal; @@ -22,9 +18,6 @@ a:hover { color: #2794AA; border-bottom: 1px solid #2794AA; } .box { width: 800px; margin: 20px auto; } h1, h2, h3 { font-family: 'Ubuntu', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana', sans-serif; font-weight: normal; } -.header { height: 100px; } -.header h1 { margin: 0 0 30px 0; font-size: 50px; font-weight: bold; padding-top: 50px; height: 120px; } -.header p { font-size: 15px; margin: -90px 0 0 0; } h1 { font-size: 34px; margin: 25px 0 5px 0; } h2 { font-size: 18px; margin: 25px 0 5px 0; } h3 { font-size: 19px; margin: 25px 0 5px 0; } @@ -40,7 +33,7 @@ ol { line-height: 1.4; margin: 15px 0 15px 30px; padding: 0; } blockquote { margin: 15px 0; font-style: italic; color: #444; } .footer { font-size: 10px; color: #888; text-align: right; margin-top: 25px; } .more { text-align: right; margin-top: 0; font-size: 0.9em; font-style: italic; } -.nav { text-align: left; margin: 20px 0 0 0; } +.nav { text-align: left; margin: 55px 0 0 0; } table { border: 1px solid black; border-collapse: collapse; margin: 15px 0; } td, th { border: 1px solid black; padding: 4px 10px; @@ -50,9 +43,9 @@ th { background: #eee; font-weight: normal; } td input { border: none; padding: 0; } /* Header */ -#logo { - position:relative; - left: 42px; +#header { + margin-left: 150px; + padding: 20px; } #header_title { font-family: 'Ubuntu', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', sans-serif; @@ -65,38 +58,36 @@ td input { border: none; padding: 0; } color:#444444; font-size:14px; } -/* Wrapper */ +/* Sidebar */ +#sidebar { + float: left; + width: 150px; + margin-left: -100%; +} +#logo { + position:relative; + left: 42px; +} +#language { + position: relative; + left: 30px; + top: 35px +} + #wrapper { float:left; line-height:140%; width: 100%; } -/* Header */ -#header { - margin-left: 150px; - padding: 20px; -} -/* Content */ #content { margin-left: 150px; padding: 3px 20px; } -/* Sub Menu */ -#submenu { - float: left; - width: 150px; - margin-left: -100%; -} -#language { - position: relative; - left:10px; - top: 10px -} -/* latest version button */ -.latestver { margin: 20px 0 0 0; float: right; font-style: italic; } -.latestver strong { font-weight: normal; } + +/* Default sphinx style */ + div.document { width: 940px; margin: 30px auto 0 auto; diff --git a/docs/_static/images/en.png b/docs/_static/images/en.png old mode 100755 new mode 100644 index 10f451fe8..ff701e19f Binary files a/docs/_static/images/en.png and b/docs/_static/images/en.png differ diff --git a/docs/_static/images/favicon.ico b/docs/_static/images/favicon.ico new file mode 100644 index 000000000..633232173 Binary files /dev/null and b/docs/_static/images/favicon.ico differ diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index cfda42685..e0e397e57 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -1,19 +1,18 @@ {% extends '!layout.html' %} {%- block content %} - +
{% block body %} {% endblock %} @@ -23,16 +22,22 @@
-
{%- endblock %} diff --git a/docs/conf.py b/docs/conf.py index cf0020e3b..8deecc81f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -116,7 +116,7 @@ html_theme = 'default' # 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 # pixels large. -#html_favicon = None +html_favicon = '_static/images/favicon.ico' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, @@ -133,20 +133,10 @@ html_static_path = ['_static'] # Custom sidebar templates, maps document names to template names. #html_sidebars = {} -#html_sidebars = { -# 'index': ['sidebarlogo.html', 'sidebarintro.html', 'searchbox.html'], -# '**': ['sidebarlogo.html', 'localtoc.html', 'relations.html', -# 'searchbox.html'] -#} -html_sidebars = { - '**': ['menu_en.html'], - 'de/about': ['menu_de.html'], -} # Additional templates that should be rendered to pages, maps page names to # template names. #html_additional_pages = {} -#html_additional_pages = {'de/about': 'about_de.html'} # If false, no module index is generated. #html_domain_indices = True @@ -175,13 +165,13 @@ html_sidebars = { #html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'OpenSlidesdoc' +htmlhelp_basename = 'OpenSlides' # -- Options for LaTeX output -------------------------------------------------- # The paper size ('letter' or 'a4'). -#latex_paper_size = 'letter' +#latex_paper_size = 'a4' # The font size ('10pt', '11pt' or '12pt'). #latex_font_size = '10pt' @@ -189,7 +179,7 @@ htmlhelp_basename = 'OpenSlidesdoc' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'OpenSlides.tex', u'OpenSlides Documentation', + ('index', 'OpenSlides.tex', u'OpenSlides', u'OpenSlides Team', 'manual'), ] @@ -222,10 +212,6 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'openslides', u'OpenSlides Documentation', + ('index', 'openslides', u'OpenSlides', [u'OpenSlides Team'], 1) ] - - -# Example configuration for intersphinx: refer to the Python standard library. -intersphinx_mapping = {'http://docs.python.org/': None} diff --git a/docs/de/about.rst b/docs/de/about.rst index 4e40b07f2..66c1fb188 100644 --- a/docs/de/about.rst +++ b/docs/de/about.rst @@ -3,7 +3,7 @@ Was ist OpenSlides? ------------------- +------------------- OpenSlides ist ein freies, webbasiertes Präsentationssystem für Tagesordnung, Anträge, Abtimmungen und Wahlen.