aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2020-08-31 13:58:02 +0000
committerShpuld Shpludson <shp@cock.li>2020-08-31 13:58:02 +0000
commit5b7decea3dcee8b6f36656ac16fa796563cadfb0 (patch)
tree2b373d48e9ffd3be2a7390dad17fd8239eae20c2 /src
parent4da248f8bc592fc1b7d24fbc1e2021bab2663f29 (diff)
parentacc45b49a55a5c173abdeac8c89d16395f92bc01 (diff)
Merge branch 'develop' into 'fix/autocomplete-fixes'
# Conflicts: # CHANGELOG.md
Diffstat (limited to 'src')
-rw-r--r--src/components/status_content/status_content.vue6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index fb469a2f..76fe3278 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -72,6 +72,10 @@
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>