diff --git a/openslides/projector/templates/base-projector.html b/openslides/projector/templates/base-projector.html index e86cd52d6..b291d2419 100644 --- a/openslides/projector/templates/base-projector.html +++ b/openslides/projector/templates/base-projector.html @@ -10,7 +10,7 @@ - XX{% block title %} {% get_config 'event_name' %} {% endblock %} + {% block title %} {% get_config 'event_name' %} {% endblock %} {% block header %} {% endblock %} diff --git a/openslides/projector/templates/projector/overlay_widget.html b/openslides/projector/templates/projector/overlay_widget.html index 415590221..d904021f7 100644 --- a/openslides/projector/templates/projector/overlay_widget.html +++ b/openslides/projector/templates/projector/overlay_widget.html @@ -6,15 +6,15 @@
  • - + - + {# TODO: Call the html via overlay.html #} diff --git a/openslides/static/img/glyphicons_041_charts.png b/openslides/static/img/glyphicons_041_charts.png new file mode 100644 index 000000000..556b7cce5 Binary files /dev/null and b/openslides/static/img/glyphicons_041_charts.png differ diff --git a/openslides/static/img/glyphicons_041_charts_white.png b/openslides/static/img/glyphicons_041_charts_white.png new file mode 100644 index 000000000..83cd93b8c Binary files /dev/null and b/openslides/static/img/glyphicons_041_charts_white.png differ diff --git a/openslides/static/img/glyphicons_056_projector.png b/openslides/static/img/glyphicons_056_projector.png deleted file mode 100644 index 4d644db30..000000000 Binary files a/openslides/static/img/glyphicons_056_projector.png and /dev/null differ diff --git a/openslides/static/img/glyphicons_056_projector_small.png b/openslides/static/img/glyphicons_056_projector_small.png deleted file mode 100644 index ba0ec4282..000000000 Binary files a/openslides/static/img/glyphicons_056_projector_small.png and /dev/null differ diff --git a/openslides/static/img/glyphicons_152_check_white.png b/openslides/static/img/glyphicons_152_check_white.png new file mode 100644 index 000000000..0c4f5fd1a Binary files /dev/null and b/openslides/static/img/glyphicons_152_check_white.png differ diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index c0b3d3cc5..c40f7dc8b 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -233,14 +233,17 @@ legend + .control-group { background-image: url("../img/glyphicons_045_calendar.png"); } .leftmenu ul li.active a span.ico i.icon-agenda { - background-position: 0; background-image: url("../img/glyphicons_045_calendar_white.png"); } .icon-motion, .icon-motions { background-position: -24px -24px; } .icon-assignment, .icon-assignments { - background-position: -144px -72px; + background-image: url("../img/glyphicons_041_charts.png"); + background-position: 0; +} +.leftmenu ul li.active a span.ico i.icon-assignment { + background-image: url("../img/glyphicons_041_charts_white.png"); } .icon-participant, .icon-participants { background-position: -168px 0; @@ -260,14 +263,19 @@ legend + .control-group { .icon-custom_slide { background-position: -120px 0px; } - - +.icon-personal_info { + background-position: -312px -24px; +} /** More glyphicons free icons **/ .status_link .icon-on, .icon-checked-new { background-image: url("../img/glyphicons_152_check.png"); background-position: 0; } +.icon-checked-new_white { + background-image: url("../img/glyphicons_152_check_white.png"); + background-position: 0; +} .status_link .icon-off, .icon-unchecked-new { background-image: url("../img/glyphicons_153_unchecked.png"); background-position: 0;