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

Merge pull request #3690 from emanuelschuetze/issue3593

Browse Source 
Linebreak protection for motion sidebox (Fixed #3593).
This commit is contained in:
Emanuel Schütze 2018-04-10 15:26:57 +02:00 committed by GitHub
commit 8094bc5855
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openslides/motions/static/css/motions/_sidebox.scss
View File

@ -4,7 +4,7 @@
margin-top: 75px; margin-top: 75px;
background: #d3d3d3; background: #d3d3d3;
border-radius: 7px 0 0 7px; border-radius: 7px 0 0 7px;
padding: 3px 7px 10px 19px; padding: 3px 7px 10px 10px;
position: fixed; position: fixed;
z-index: 5; z-index: 5;
@ -13,3 +13,7 @@
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
#sidebox .pollresults td {
white-space: nowrap;
font-size: 19px;
}

4
openslides/motions/static/templates/motions/slide_motion.html
View File

@ -27,7 +27,7 @@
<!-- yes --> <!-- yes -->
<tr> <tr>
<td class="icon"> <td class="icon">
<i class="fa fa-thumbs-up fa-2x"></i> <i class="fa fa-thumbs-up fa-lg"></i>
<td ng-init="voteYes = poll.getVote(poll.yes, 'yes')"> <td ng-init="voteYes = poll.getVote(poll.yes, 'yes')">
<span class="result_label"><translate>Yes</translate>:</span> <span class="result_label"><translate>Yes</translate>:</span>
<span class="result_value"> <span class="result_value">
@ -39,7 +39,7 @@
<!-- no --> <!-- no -->
<tr> <tr>
<td class="icon"> <td class="icon">
<i class="fa fa-thumbs-down fa-2x"></i> <i class="fa fa-thumbs-down fa-lg"></i>
<td ng-init="voteNo = poll.getVote(poll.no, 'no')"> <td ng-init="voteNo = poll.getVote(poll.no, 'no')">
<span class="result_label"><translate>No</translate>:</span> <span class="result_label"><translate>No</translate>:</span>
<span class="result_value" > <span class="result_value" >