diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-08-31 12:30:29 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-08-31 12:30:29 +0000 |
| commit | acc45b49a55a5c173abdeac8c89d16395f92bc01 (patch) | |
| tree | ccc735e2c4f1d0e44aa23d43e2690b72b77faa8e | |
| parent | 39f8587171d3a6974f5c51c829cb09c8c9dbc065 (diff) | |
| parent | ca0ce902ea1f0c3d82da65de18ba53a3350d64c2 (diff) | |
Merge branch 'fix/hide-polls-in-collapsed-posts' into 'develop'
hide poll when subject collapsed, fix #683
Closes #683
See merge request pleroma/pleroma-fe!1220
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/components/status_content/status_content.vue | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 43e53e60..675c4b5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ## [Unreleased patch] +### Changed +- Polls will be hidden with status content if "Collapse posts with subjects" is enabled and the post is collapsed. ## [2.1.0] - 2020-08-28 ### Added 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> |