diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-09-08 09:46:19 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-09-08 09:46:19 +0000 |
| commit | 938887ef91a12dcaaaaa0884af4e76abd1c6c679 (patch) | |
| tree | 14d913a145a4e7bcb9221a38aea70410293ce69f /src/components/status_content/status_content.vue | |
| parent | e768ec1fca2f7580d111b0878a9695b0c8b9dbb1 (diff) | |
| parent | f31bc5310e544cd6f960471659c5a83e1f1721be (diff) | |
Merge branch 'rc/2.1.1' into 'master'
Update master with 2.1.1
See merge request pleroma/pleroma-fe!1231
Diffstat (limited to 'src/components/status_content/status_content.vue')
| -rw-r--r-- | src/components/status_content/status_content.vue | 6 |
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> |