diff --git a/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html b/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html index 19e56a5de..f569f1da0 100644 --- a/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html +++ b/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html @@ -7,27 +7,29 @@ - -

- {{ speaker.user.get_full_name() }} -

- - -

- {{ speaker.user.get_full_name() }} -

- - -
    -
  1. +
    + +

    {{ speaker.user.get_full_name() }} -

  2. -
+

+ + +

+ {{ speaker.user.get_full_name() }} +

+ + +
    +
  1. + {{ speaker.user.get_full_name() }} +
  2. +
+ diff --git a/openslides/agenda/static/templates/agenda/slide-item-list.html b/openslides/agenda/static/templates/agenda/slide-item-list.html index 85281ff69..77c66810d 100644 --- a/openslides/agenda/static/templates/agenda/slide-item-list.html +++ b/openslides/agenda/static/templates/agenda/slide-item-list.html @@ -2,7 +2,7 @@

Agenda

{{ rootItem.getTitle() }}

-
+
diff --git a/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html b/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html index 65a37338e..07cf282b1 100644 --- a/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html +++ b/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html @@ -11,19 +11,21 @@
- -

- {{ speaker.user.get_full_name() }} +

+ +

+ {{ speaker.user.get_full_name() }} - -

- {{ speaker.user.get_full_name() }} + +

+ {{ speaker.user.get_full_name() }} - -

    -
  1. - {{ speaker.user.get_full_name() }} -
+ +
    +
  1. + {{ speaker.user.get_full_name() }} +
+
diff --git a/openslides/assignments/static/templates/assignments/slide_assignment.html b/openslides/assignments/static/templates/assignments/slide_assignment.html index 082afbe32..628436781 100644 --- a/openslides/assignments/static/templates/assignments/slide_assignment.html +++ b/openslides/assignments/static/templates/assignments/slide_assignment.html @@ -9,12 +9,12 @@ -
+
{{ assignment.description }}
-
+

Candidates

  • @@ -24,7 +24,7 @@
-
+
Waiting for results ...
diff --git a/openslides/core/static/css/projector.css b/openslides/core/static/css/projector.css index 9cc6b2db6..0c188c377 100644 --- a/openslides/core/static/css/projector.css +++ b/openslides/core/static/css/projector.css @@ -24,6 +24,9 @@ body { font-family: "Roboto", sans-serif; } +h1, h2, h3, h4, h5, h6 { + font-size: inherit; +} h1, h2, h3, h4, h5, h6, .countdown, .message { font-family: "Roboto Condensed", sans-serif; font-weight: normal; @@ -166,14 +169,18 @@ body { left: 50px; right: 50px; z-index: -1; - line-height: 1.3em; + line-height: 1.5em; } .content img { max-width: 65%; height: auto; } .scrollcontent { - transition-property: margin, font-size; + transition-property: margin; + transition-duration: 1s; +} +.zoomcontent { + transition-property: font-size; transition-duration: 1s; } .fullscreen { diff --git a/openslides/core/static/templates/projector.html b/openslides/core/static/templates/projector.html index 5b799b01d..e01555716 100644 --- a/openslides/core/static/templates/projector.html +++ b/openslides/core/static/templates/projector.html @@ -51,6 +51,8 @@