diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-08-31 13:58:02 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-08-31 13:58:02 +0000 |
| commit | 5b7decea3dcee8b6f36656ac16fa796563cadfb0 (patch) | |
| tree | 2b373d48e9ffd3be2a7390dad17fd8239eae20c2 | |
| parent | 4da248f8bc592fc1b7d24fbc1e2021bab2663f29 (diff) | |
| parent | acc45b49a55a5c173abdeac8c89d16395f92bc01 (diff) | |
Merge branch 'develop' into 'fix/autocomplete-fixes'
# Conflicts:
# CHANGELOG.md
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | src/components/status_content/status_content.vue | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 66abfa65..18dafa8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ 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. + ### Fixed - Autocomplete won't stop at the second @, so it'll still work with "@lain@l" and not start over. - Fixed weird autocomplete behavior when you write ":custom_emoji: ?" 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> |