ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #786 from emanuelschuetze/1.4-fixes

Browse Source 
Some template and doc fixes
This commit is contained in:
Oskar Hahn 2013-06-26 10:11:28 -07:00
commit bf8482fc03
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/_static/openslides_docs_style.css vendored
View File

@ -4,5 +4,15 @@
.screenshot { .screenshot {
width: 30%; width: 30%;
border: 2px solid; border: 1px solid;
margin-bottom: 10px;} margin-bottom: 10px;
}
.screenshot:hover{
width: 80%;
}
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: visible;
}

5
docs/conf.py
View File

@ -48,9 +48,9 @@ copyright = u'2012–2013, OpenSlides Team'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = 'v1.4' version = '1.4'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = 'v1.4' release = '1.4'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
@ -103,6 +103,7 @@ html_theme_options = {
'globaltoc_depth': 2, 'globaltoc_depth': 2,
'navbar_class': "navbar navbar-inverse", 'navbar_class': "navbar navbar-inverse",
'source_link_position': "", 'source_link_position': "",
'navbar_fixed_top': "false",
} }
# Add any paths that contain custom themes here, relative to this directory. # Add any paths that contain custom themes here, relative to this directory.

2
openslides/agenda/static/styles/agenda_sort.css
View File

@ -58,7 +58,7 @@ ol.agenda_list {
.agenda_list .manage { width: 200px; float: right; min-height: 1px; padding-left: 5px; } .agenda_list .manage { width: 200px; float: right; min-height: 1px; padding-left: 5px; }
.agenda_list .title { float: left; padding-left: 5px;} .agenda_list .title { float: left; padding-left: 5px;}
.agenda_list .optional { float: left; } .agenda_list .optional { float: left; }
.agenda_list .opener_closer { float: left; margin-right: 10px; margin-left:-6px;} .agenda_list .opener_closer { float: left; margin-right: 8px; margin-left:-4px;}
.agenda_list .opener_closer .btn { padding: 0 2px; } .agenda_list .opener_closer .btn { padding: 0 2px; }
.agenda_list .optional { float: right; width: 208px; padding-left: 8px;} .agenda_list .optional { float: right; width: 208px; padding-left: 8px;}

2
openslides/agenda/templates/agenda/item_row.html
View File

@ -46,7 +46,7 @@
{% if node.duration %} {% if node.duration %}
{{ node.duration }} h {{ node.duration }} h
{% if start and end %} {% if start and end %}
<a rel="tooltip" data-original-title="{% trans 'End' %}: <a class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'End' %}:
{{ end|date:"DATETIME_FORMAT" }}"><i class="icon-clock"></i> {{ end|date:"DATETIME_FORMAT" }}"><i class="icon-clock"></i>
</a> </a>
{% endif %} {% endif %}

2
requirements.txt
View File

@ -9,7 +9,7 @@ pep8==1.4.5
# Requirements for OpenSlides handbook/documentation # Requirements for OpenSlides handbook/documentation
Sphinx==1.2b1 Sphinx==1.2b1
sphinx-bootstrap-theme==0.2.3 sphinx-bootstrap-theme==0.2.4
# For Python 2.6 support # For Python 2.6 support
argparse==1.2.1 argparse==1.2.1