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

Merge branch 'develop' into 'fix/autocomplete-fixes'

Browse source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
Shpuld Shpludson 2020-08-31 13:58:02 +00:00
commit 5b7decea3d
2 changed files with 9 additions and 1 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>