From 85326d75f21b673956d5116cc9a8e39165771355 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Tue, 8 Mar 2016 21:06:56 +0100 Subject: [PATCH] New configs for font color in header and h1 on projector (Fixes #2020) --- openslides/core/signals.py | 21 ++++++++++++++++--- openslides/core/static/css/projector.css | 3 --- .../core/static/templates/projector.html | 7 +++++-- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/openslides/core/signals.py b/openslides/core/signals.py index e3193a5ce..2f8bc101d 100644 --- a/openslides/core/signals.py +++ b/openslides/core/signals.py @@ -152,14 +152,29 @@ def setup_general_config(sender, **kwargs): group=ugettext_lazy('Projector')) yield ConfigVariable( - name='projector_backgroundcolor', + name='projector_header_backgroundcolor', default_value='#317796', input_type='colorpicker', - label=ugettext_lazy('Background color of projector header'), - help_text=ugettext_lazy('Use web color names like "red" or hex numbers like "#ff0000".'), + label=ugettext_lazy('Background color of projector header and footer'), weight=160, group=ugettext_lazy('Projector')) + yield ConfigVariable( + name='projector_header_fontcolor', + default_value='#F5F5F5', + input_type='colorpicker', + label=ugettext_lazy('Font color of projector header and footer'), + weight=165, + group=ugettext_lazy('Projector')) + + yield ConfigVariable( + name='projector_h1_fontcolor', + default_value='#317796', + input_type='colorpicker', + label=ugettext_lazy('Font color of projector headline'), + weight=170, + group=ugettext_lazy('Projector')) + yield ConfigVariable( name='projector_default_countdown', default_value=60, diff --git a/openslides/core/static/css/projector.css b/openslides/core/static/css/projector.css index 4899a3d39..90e024707 100644 --- a/openslides/core/static/css/projector.css +++ b/openslides/core/static/css/projector.css @@ -32,7 +32,6 @@ body{ top: 12px; height: 50px; overflow: hidden; - color: #F5F5F5; } #eventdata .title { font-size: 26px; @@ -55,14 +54,12 @@ body{ top: 25px; right: 50px; padding-left: 30px; - color: #fff; } #footer { font-family: 'Roboto Condensed Light'; position: fixed; bottom: 0; height: 35px; - color: #F5F5F5; width: 100%; font-size: 16px; padding-left: 50px; diff --git a/openslides/core/static/templates/projector.html b/openslides/core/static/templates/projector.html index 323d6266c..50bd36add 100644 --- a/openslides/core/static/templates/projector.html +++ b/openslides/core/static/templates/projector.html @@ -10,10 +10,13 @@