diff options
| author | ThibG <thib@sitedethib.com> | 2020-04-12 17:58:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 17:58:25 +0200 |
| commit | 615073df33b9a4317ac5c93fdef83c9cd34567fa (patch) | |
| tree | 8bf82214f7e10e6fdff6c331f20b621e35650d60 /app/views | |
| parent | 51bbf0b68dc504c441cb929e4fbf8d8c6e04df42 (diff) | |
| parent | a08a2130f0adec653be22b09140f8b502785a13e (diff) | |
Merge pull request #1316 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/public.html.haml | 2 | ||||
| -rw-r--r-- | app/views/statuses/_poll.html.haml | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index fb9ac5cec..eaa0437c2 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -38,7 +38,7 @@ %h4= t 'footer.developers' %ul %li= link_to t('about.documentation'), 'https://docs.joinmastodon.org/' - %li= link_to t('about.api'), 'https://docs.joinmastodon.org/api/guidelines/' + %li= link_to t('about.api'), 'https://docs.joinmastodon.org/client/intro/' .column-2 %h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/' = link_to svg_logo, root_url, class: 'brand' diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml index c17476657..de5357e6d 100644 --- a/app/views/statuses/_poll.html.haml +++ b/app/views/statuses/_poll.html.haml @@ -12,14 +12,16 @@ %span.poll__number>< - if own_votes.include?(index) %i.poll__voted__mark.fa.fa-check - = percent.round - = Formatter.instance.format_poll_option(status, option, autoplay: autoplay) + = "#{percent.round}%" + %span.poll__option__text + = Formatter.instance.format_poll_option(status, option, autoplay: autoplay) - %span.poll__chart{ style: "width: #{percent}%" } + %span.poll__chart{ style: "width: #{percent}%" } - else %label.poll__option>< %span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}>< - = Formatter.instance.format_poll_option(status, option, autoplay: autoplay) + %span.poll__option__text + = Formatter.instance.format_poll_option(status, option, autoplay: autoplay) .poll__footer - unless show_results %button.button.button-secondary{ disabled: true } |