diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-02-11 23:09:15 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-02-11 23:09:15 +0000 |
| commit | 84ebae8ed36390f62ccda653d4fb9d8aad1482a2 (patch) | |
| tree | 70fb486e4b31b029c8dbcb89f87acf154275f905 /src/components/status/status.vue | |
| parent | 60446c56a5c8d4b4d669fbd4803e77ce686daac9 (diff) | |
| parent | 96dc297babd5797b9307af8676719c2eb8cd80e2 (diff) | |
Merge branch 'develop' into 'themes-accent'
# Conflicts:
# src/components/emoji_reactions/emoji_reactions.vue
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index a326874e..76b038d9 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -277,7 +277,21 @@ href="#" class="cw-status-hider" @click.prevent="toggleShowMore" - >{{ $t("general.show_more") }}</a> + > + {{ $t("general.show_more") }} + <span + v-if="hasImageAttachments" + class="icon-picture" + /> + <span + v-if="hasVideoAttachments" + class="icon-video" + /> + <span + v-if="status.card" + class="icon-link" + /> + </a> <a v-if="showingMore" href="#" @@ -355,6 +369,7 @@ </transition> <EmojiReactions + v-if="(mergedConfig.emojiReactionsOnTimeline || isFocused) && (!noHeading && !isPreview)" :status="status" /> |