therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop

Browse source
This commit is contained in:
sadposter 2020-09-09 09:45:48 +01:00
commit 098991d767
30 changed files with 383 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/status_content/status_content.vue
View file

@ -71,6 +71,10 @@
v-if="attachmentTypes.includes('unknown')"
class="icon-doc"
/>
<span
v-if="status.poll && status.poll.options"
class="icon-chart-bar"
/>
<span
v-if="status.card"
class="icon-link"
@ -86,7 +90,7 @@
</a>
</div>
<div v-if="status.poll && status.poll.options">
<div v-if="status.poll && status.poll.options && !hideSubjectStatus">
<poll :base-poll="status.poll" />
</div>