Layout improvements for agenda and motions

- Use more compact agenda on projector (reduce line height)
- Fixed sorting of motions and limit motion title lenght in recommendation dropdown menu.
- Improved CSS for using tables in topic text (site and projector).
This commit is contained in:
Emanuel Schütze 2018-03-13 17:31:06 +01:00
parent a9e0f36ab9
commit bee73d3a28
6 changed files with 23 additions and 28 deletions

View File

@ -1,30 +1,22 @@
@import 'list_of_speakers'; @import 'list_of_speakers';
/* Agenda list */ /* Agenda list */
.agendalist {
line-height: 1.5em;
p {
font-size: 140%;
}
.mainitem {
margin-top: 25px;
}
.subitem {
font-size: 100%;
margin-bottom: 4px;
}
}
.agendalist-table { .agendalist-table {
td { td {
vertical-align: top; vertical-align: top;
padding-left: 5px; padding-left: 15px;
} }
.number { td.number {
padding: 0; padding-left: 0;
white-space: nowrap; white-space: nowrap;
} }
p.mainitem {
font-size: 140%;
}
p.subitem {
font-size: 100%;
}
} }

View File

@ -16,11 +16,6 @@
{{ node.item.item_number }} {{ node.item.item_number }}
</p> </p>
</td> </td>
<td ng-if="!node.item.closed">
<p ng-class="{mainitem: node.item.parent_id === null}" ng-if="node.item.item_number">
&middot;
</p>
</td>
<td ng-if="!node.item.closed"> <td ng-if="!node.item.closed">
<p ng-class="{mainitem: node.item.parent_id === null, subitem: node.item.parent_id !== null}"> <p ng-class="{mainitem: node.item.parent_id === null, subitem: node.item.parent_id !== null}">
{{ node.item.title }} {{ node.item.title }}

View File

@ -10,6 +10,8 @@
.dropdown-menu { .dropdown-menu {
margin-left: 0px !important; margin-left: 0px !important;
max-height: 300px;
overflow-y: auto;
} }
.slimDropDown { .slimDropDown {
@ -162,6 +164,11 @@
} }
/* tables */ /* tables */
.topictext table {
border-spacing: 10px 0;
border-collapse: separate;
}
.minimum { .minimum {
width: 1px; width: 1px;
} }

View File

@ -251,9 +251,10 @@
<translate>Motion</translate> <translate>Motion</translate>
</span> </span>
<ul uib-dropdown-menu class="dropdown-menu" aria-labelledby="motion-dropdown"> <ul uib-dropdown-menu class="dropdown-menu" aria-labelledby="motion-dropdown">
<li ng-repeat="m in motions | orderBy: identifier"> <li ng-repeat="m in motions | orderBy: 'identifier'">
<a href ng-click="addMotionToRecommendationField(m)"> <a href ng-click="addMotionToRecommendationField(m)">
{{ m.identifier ? m.identifier + ':' : '' }} {{ m.getTitle() }} {{ m.identifier ? m.identifier + ':' : '' }}
{{ m.getTitle() | limitTo: 35 }}{{ m.getTitle().length > 35 ? '...' : '' }}
</a> </a>
</li> </li>
</ul> </ul>

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" class="zoomcontent"></div> <div ng-bind-html="topic.text | trusted" class="zoomcontent topictext"></div>
</div> </div>

View File

@ -26,7 +26,7 @@
</div> </div>
<div class="details"> <div class="details">
<div ng-bind-html="topic.text | trusted"></div> <div ng-bind-html="topic.text | trusted" class="topictext"></div>
<h3 ng-if="topic.attachments.length > 0" translate>Attachments</h3> <h3 ng-if="topic.attachments.length > 0" translate>Attachments</h3>
<ul> <ul>
<li ng-repeat="attachment in topic.attachments"> <li ng-repeat="attachment in topic.attachments">