Mastodon
/
Sengi-Windows-MacOS-Linux
mirror of https://github.com/NicolasConstant/sengi
1
0
Fork 0
Code Issues Releases Wiki Activity

better display of poll button #93

This commit is contained in:
Nicolas Constant 2019-06-06 19:01:04 -04:00
parent f72141a794
commit b8311371f9
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/components/stream/status/poll/poll.component.html
View File

@ -22,7 +22,7 @@
<div class="poll__voting"> <div class="poll__voting">
<button href *ngIf="!poll.voted && !poll.expired" class="btn btn-sm btn-custom-primary poll__btn-vote" <button href *ngIf="!poll.voted && !poll.expired" class="btn btn-sm btn-custom-primary poll__btn-vote"
title="don't boo, vote!" (click)="vote()">Vote</button> title="don't boo, vote!" (click)="vote()">Vote</button>
<a href class="poll__refresh" *ngIf="poll.voted && !poll.expired">refresh </a> <a href class="poll__refresh" *ngIf="poll.voted || poll.expired" title="refresh poll">refresh</a>
<div class="poll__statistics"><span *ngIf="poll.voted"> · </span>{{poll.votes_count}} votes · X days left</div> <div class="poll__statistics"><span *ngIf="poll.voted || poll.expired" class="poll__separator">·</span>{{poll.votes_count}} votes<span *ngIf="!poll.expired" class="poll__separator">· X days left</span></div>
</div> </div>
</div> </div>

12
src/app/components/stream/status/poll/poll.component.scss
View File

@ -120,7 +120,7 @@
margin: 0 0 5px 5px; margin: 0 0 5px 5px;
padding: 0 5px 0 5px; padding: 0 5px 0 5px;
position: relative; position: relative;
height: 26px; height: 27px;
&--data { &--data {
position: absolute; position: absolute;
@ -142,7 +142,7 @@
top:0; top:0;
left:0; left:0;
width: calc(100%); width: calc(100%);
height: 21px; height: 22px;
z-index: 1; z-index: 1;
float: left; float: left;
border-radius: 2px; border-radius: 2px;
@ -152,6 +152,11 @@
} }
} }
} }
&__separator {
display: inline-block;
margin: 0 5px;
}
} }
.noselect { .noselect {
@ -166,6 +171,5 @@
-ms-user-select: none; -ms-user-select: none;
/* Internet Explorer/Edge */ /* Internet Explorer/Edge */
user-select: none; user-select: none;
/* Non-prefixed version, currently /* Non-prefixed version, currently supported by Chrome and Opera */
supported by Chrome and Opera */
} }

1
src/app/components/stream/status/poll/poll.component.ts
View File

@ -82,7 +82,6 @@ class PollOptionWrapper implements PollOption {
this.percentage = ((this.votes_count / totalVotes) * 100).toFixed(0); this.percentage = ((this.votes_count / totalVotes) * 100).toFixed(0);
} }
this.isMax = isMax; this.isMax = isMax;
console.warn(this.isMax);
} }
id: number; id: number;