Do not zoom slideheaders

This commit is contained in:
FinnStutzenstein 2017-11-03 12:09:37 +01:00
parent e774e2127d
commit 323534700c
10 changed files with 112 additions and 98 deletions

View File

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

View File

@ -2,7 +2,7 @@
<h1 ng-if="!element.id" translate>Agenda</h1> <h1 ng-if="!element.id" translate>Agenda</h1>
<h1 ng-if="element.id">{{ rootItem.getTitle() }}</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"> <table class="agendalist-table">
<tr ng-repeat="node in tree" ng-include="'projector_agenda_renderer.html'"></tr> <tr ng-repeat="node in tree" ng-include="'projector_agenda_renderer.html'"></tr>
</table> </table>

View File

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

View File

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

View File

@ -24,6 +24,9 @@
body { body {
font-family: "Roboto", sans-serif; font-family: "Roboto", sans-serif;
} }
h1, h2, h3, h4, h5, h6 {
font-size: inherit;
}
h1, h2, h3, h4, h5, h6, .countdown, .message { h1, h2, h3, h4, h5, h6, .countdown, .message {
font-family: "Roboto Condensed", sans-serif; font-family: "Roboto Condensed", sans-serif;
font-weight: normal; font-weight: normal;
@ -166,14 +169,18 @@ body {
left: 50px; left: 50px;
right: 50px; right: 50px;
z-index: -1; z-index: -1;
line-height: 1.3em; line-height: 1.5em;
} }
.content img { .content img {
max-width: 65%; max-width: 65%;
height: auto; height: auto;
} }
.scrollcontent { .scrollcontent {
transition-property: margin, font-size; transition-property: margin;
transition-duration: 1s;
}
.zoomcontent {
transition-property: font-size;
transition-duration: 1s; transition-duration: 1s;
} }
.fullscreen { .fullscreen {

View File

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

View File

@ -1,5 +1,4 @@
<div ng-controller="SlideMotionCtrl" class="content scrollcontent"> <div ng-controller="SlideMotionCtrl" class="content scrollcontent">
<div id="sidebox"> <div id="sidebox">
<!-- State --> <!-- State -->
<h3 translate>State</h3> <h3 translate>State</h3>
@ -76,6 +75,7 @@
</h2> </h2>
</div> </div>
<div class="zoomcontent">
<!-- Preamble --> <!-- Preamble -->
<div><p>{{ config('motions_preamble') | translate }}</p></div><br> <div><p>{{ config('motions_preamble') | translate }}</p></div><br>
@ -126,3 +126,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>

View File

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

View File

@ -1,4 +1,4 @@
<div ng-controller="SlideTopicCtrl" class="content scrollcontent"> <div ng-controller="SlideTopicCtrl" class="content scrollcontent">
<h1>{{ topic.agenda_item.getTitle() }}</h1> <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> </div>

View File

@ -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> <h1>{{ user.get_full_name() }}</h1>
</div> </div>