aboutsummaryrefslogtreecommitdiff
path: root/src/components/poll/poll.vue
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2020-12-22 16:00:12 +0000
committerShpuld Shpludson <shp@cock.li>2020-12-22 16:00:12 +0000
commita39866308cd7c8cb0d30a04a5215d1fae8bf8d47 (patch)
tree59230ab336bf3bd13f0d046c6f45842a7fbdd02c /src/components/poll/poll.vue
parenta7567ce6d01781b4b1ff47f805b4a9a5109e960b (diff)
parent00cb8d9dcee9a403fedb2800a0cdc4b0f77a0429 (diff)
Merge branch 'rc/2.2.2' into 'master'
prepare master for 2.2.2 See merge request pleroma/pleroma-fe!1315
Diffstat (limited to 'src/components/poll/poll.vue')
-rw-r--r--src/components/poll/poll.vue5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 5f54b416..42819c19 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -42,14 +42,15 @@
:value="index"
>
<label class="option-vote">
- <div>{{ option.title }}</div>
+ <!-- eslint-disable-next-line vue/no-v-html -->
+ <div v-html="option.title_html" />
</label>
</div>
</div>
<div class="footer faint">
<button
v-if="!showResults"
- class="btn btn-default poll-vote-button"
+ class="btn button-default poll-vote-button"
type="button"
:disabled="isDisabled"
@click="vote"