Merge pull request #3473 from FinnStutzenstein/zoomcontent

Do not zoom slideheaders

openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html

@@ -7,6 +7,7 @@
     </h2>
   </div>
 
+  <div class="zoomcontent">
     <!-- Last speakers -->
     <p ng-repeat="speaker in lastSpeakers = (agendaItem.speakers
       | filter: {end_time: '!!', begin_time: '!!'})
@@ -30,4 +31,5 @@
         {{ speaker.user.get_full_name() }}
       </li>
     </ol>
+  </div>
 </div>

openslides/agenda/static/templates/agenda/slide-item-list.html

@@ -2,7 +2,7 @@
   <h1 ng-if="!element.id" translate>Agenda</h1>
   <h1 ng-if="element.id">{{ rootItem.getTitle() }}</h1>
 
-  <div class="agendalist" ng-class="{'spacer-left-lg': element.id}">
+  <div class="agendalist zoomcontent" ng-class="{'spacer-left-lg': element.id}">
     <table class="agendalist-table">
       <tr ng-repeat="node in tree" ng-include="'projector_agenda_renderer.html'"></tr>
     </table>

openslides/agenda/static/templates/agenda/slide-list-of-speakers.html

@@ -11,6 +11,7 @@
     </h2>
   </div>
 
+  <div class="zoomcontent">
     <!-- Last speakers -->
     <p ng-repeat="speaker in lastSpeakers = (item.speakers | filter: {end_time: '!!', begin_time: '!!'}) |
         limitTo: config('agenda_show_last_speakers') : (lastSpeakers.length - config('agenda_show_last_speakers'))" class="lastSpeakers">
@@ -26,4 +27,5 @@
       <li ng-repeat="speaker in item.speakers | filter: {begin_time: null} | orderBy:'weight'">
         {{ speaker.user.get_full_name() }}
     </ol>
+  </div>
 </div>

openslides/assignments/static/templates/assignments/slide_assignment.html

@@ -9,12 +9,12 @@
   </div>
 
   <!-- Description -->
-  <div ng-if="!showResult && assignment.description !== ''" class="white-space-pre-line">
+  <div ng-if="!showResult && assignment.description !== ''" class="white-space-pre-line zoomcontent">
     {{ assignment.description }}
   </div>
 
   <!-- Candidates -->
-  <div ng-if="!showResult">
+  <div class="zoomcontent" ng-if="!showResult">
     <h3 translate>Candidates</h3>
     <ul>
       <li ng-repeat="related_user in assignment.assignment_related_users | orderBy:'weight'">
@@ -24,7 +24,7 @@
   </div>
 
   <!-- vote results -->
-  <div ng-show="showResult">
+  <div class="zoomcontent" ng-show="showResult">
     <div ng-if="(assignment.polls | filter: {id: element.poll}).length == 0" translate>
         Waiting for results ...
     </div>

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 {

openslides/core/static/templates/projector.html

@@ -51,6 +51,8 @@
   <style type="text/css">
     .scrollcontent {
       margin-top: {{ scroll }}px !important;
+    }
+    .zoomcontent {
       font-size: {{ 100 + 20 * projector.scale }}%;
     }
     .mediascrollcontent {

openslides/motions/static/templates/motions/slide_motion.html

@@ -1,5 +1,4 @@
 <div ng-controller="SlideMotionCtrl" class="content scrollcontent">
-
   <div id="sidebox">
     <!-- State -->
     <h3 translate>State</h3>
@@ -66,7 +65,7 @@
       </div>
   </div>
 
-<div id="motioncontent">
+  <div id="motioncontent">
     <!-- Title -->
     <div id="title">
       <h1>{{  motion.agenda_item.getTitle() || motion.getTitle() }}</h1>
@@ -76,6 +75,7 @@
       </h2>
     </div>
 
+    <div class="zoomcontent">
       <!-- Preamble -->
       <div><p>{{ config('motions_preamble') | translate }}</p></div><br>
 
@@ -124,5 +124,6 @@
         <h3 translate>Reason</h3>
         <div ng-bind-html="motion.getReason() | trusted"></div>
       </div>
-</div>
+    </div>
+  </div>
 </div>

openslides/motions/static/templates/motions/slide_motion_block.html

@@ -6,7 +6,7 @@
   </div>
 
   <!-- motion list -->
-  <div class="motion-block">
+  <div class="motion-block zoomcontent">
     <div ng-repeat="motion in motionBlock.motions">
       {{ motion.identifier }}
       <br>

openslides/topics/static/templates/topics/slide_topic.html

@@ -1,4 +1,4 @@
 <div ng-controller="SlideTopicCtrl" class="content scrollcontent">
   <h1>{{ topic.agenda_item.getTitle() }}</h1>
-  <div ng-bind-html="topic.text | trusted"></div>
+  <div ng-bind-html="topic.text | trusted" class="zoomcontent"></div>
 </div>

openslides/users/static/templates/users/slide_user.html

@@ -1,3 +1,3 @@
-<div ng-controller="SlideUserCtrl" class="content scrollcontent">
+<div ng-controller="SlideUserCtrl" class="content scrollcontent zoomcontent">
     <h1>{{ user.get_full_name() }}</h1>
 </div>