diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-12-10 12:03:23 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-12-10 12:03:23 +0000 |
| commit | 98b632307662c488c6ec4ac2bc49da0039b38eba (patch) | |
| tree | cb6295838448723226190e7a463143175bd76f13 | |
| parent | merge: user profile: only default to "pinned notes" if they exist (!808) (diff) | |
| parent | Make collapsed notes subscribe to stream (diff) | |
| download | sharkey-98b632307662c488c6ec4ac2bc49da0039b38eba.tar.gz sharkey-98b632307662c488c6ec4ac2bc49da0039b38eba.tar.bz2 sharkey-98b632307662c488c6ec4ac2bc49da0039b38eba.zip | |
merge: Make collapsed notes subscribe to stream (!805)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/805
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
| -rw-r--r-- | packages/frontend/src/components/MkNote.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/SkNote.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 7ba4f0b9d9..323f6e994e 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only </MkA>: <Mfm :text="getNoteSummary(appearNote.reply)" :plain="true" :nowrap="true" :author="appearNote.reply.user" :nyaize="'respect'" :class="$style.collapsedInReplyToText" @click="inReplyToCollapsed = false"/> </div> - <MkNoteSub v-if="appearNote.reply && !renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo"/> + <MkNoteSub v-if="appearNote.reply" v-show="!renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo"/> <div v-if="pinned" :class="$style.tip"><i class="ti ti-pin"></i> {{ i18n.ts.pinnedNote }}</div> <!--<div v-if="appearNote._prId_" class="tip"><i class="ti ti-speakerphone"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ti ti-x"></i></button></div>--> <!--<div v-if="appearNote._featuredId_" class="tip"><i class="ti ti-bolt"></i> {{ i18n.ts.featured }}</div>--> diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue index bda5282144..dc8c32a7d9 100644 --- a/packages/frontend/src/components/SkNote.vue +++ b/packages/frontend/src/components/SkNote.vue @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only :class="[$style.root, { [$style.showActionsOnlyHover]: defaultStore.state.showNoteActionsOnlyHover }]" :tabindex="isDeleted ? '-1' : '0'" > - <SkNoteSub v-if="appearNote.reply && !renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo"/> + <SkNoteSub v-if="appearNote.reply" v-show="!renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo"/> <div v-if="appearNote.reply && inReplyToCollapsed && !renoteCollapsed" :class="$style.collapsedInReplyTo"> <div :class="$style.collapsedInReplyToLine"></div> <MkAvatar :class="$style.collapsedInReplyToAvatar" :user="appearNote.reply.user" link preview/> |