ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3515 from emanuelschuetze/speakers-overlay-fix

Browse Source 
Fix linebreak after microphone icon in speakers overlay.
This commit is contained in:
Emanuel Schütze 2017-12-15 10:42:16 +01:00 committed by GitHub
commit cf95c64f88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers-overlay.html
View File

@ -13,7 +13,7 @@
<div ng-repeat="speaker in agendaItem.speakers | filter: {end_time: null, begin_time: '!!'} " <div ng-repeat="speaker in agendaItem.speakers | filter: {end_time: null, begin_time: '!!'} "
class="currentSpeaker"> class="currentSpeaker">
<i class="fa fa-microphone fa-lg"></i> <i class="fa fa-microphone fa-lg"></i>
<span class="pull-right" style="width:calc(100% - 25px);"> <span class="pull-right" style="width:calc(100% - 30px);">
{{ speaker.user.get_full_name() }} {{ speaker.user.get_full_name() }}
</span> </span>
</div> </div>

2
openslides/core/static/css/projector.css
View File

@ -459,7 +459,7 @@ tr.elected td {
padding-right: 5px; padding-right: 5px;
} }
.nextSpeakers { .nextSpeakers {
margin-left: 8px; margin-left: 13px;
} }
.nextSpeakers li { .nextSpeakers li {
line-height: 150%; line-height: 150%;