diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-03 23:29:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 23:29:41 +0200 |
| commit | 75b0fa8b760b8829b933b249ac48965abdab15ae (patch) | |
| tree | 4b2e5293f15972012c4dc876bb66870d692490d0 /app/views/statuses/_poll.html.haml | |
| parent | 9c61dadc0db7009853c6b2345a02c3b219022929 (diff) | |
| parent | 89fcd68b7501f81a3e33f6b1abff6fc66f78e04b (diff) | |
Merge pull request #1324 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/statuses/_poll.html.haml')
| -rw-r--r-- | app/views/statuses/_poll.html.haml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml index de5357e6d..64e62e97c 100644 --- a/app/views/statuses/_poll.html.haml +++ b/app/views/statuses/_poll.html.haml @@ -10,13 +10,15 @@ - percent = total_votes_count > 0 ? 100 * option.votes_count / total_votes_count : 0 %label.poll__option>< %span.poll__number>< - - if own_votes.include?(index) - %i.poll__voted__mark.fa.fa-check = "#{percent.round}%" %span.poll__option__text = Formatter.instance.format_poll_option(status, option, autoplay: autoplay) + - if own_votes.include?(index) + %span.poll__voted + %i.poll__voted__mark.fa.fa-check - %span.poll__chart{ style: "width: #{percent}%" } + %progress{ max: 100, value: percent < 1 ? 1 : percent, 'aria-hidden': 'true' } + %span.poll__chart - else %label.poll__option>< %span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}>< |