diff options
| author | Marie <github@yuugi.dev> | 2024-12-17 21:53:19 +0000 |
|---|---|---|
| committer | Marie <github@yuugi.dev> | 2024-12-17 21:53:19 +0000 |
| commit | 38d7faffdb2db14729c27b1d65baf80926744c83 (patch) | |
| tree | 5c8afd0e1204c8ee18b0e75e4e2a8778324b2742 /packages/frontend/src | |
| parent | merge: fix(frontend): Ensure physics run consistently across different device... (diff) | |
| parent | make it harder to fumble opening a collapsed replied-to note (diff) | |
| download | sharkey-38d7faffdb2db14729c27b1d65baf80926744c83.tar.gz sharkey-38d7faffdb2db14729c27b1d65baf80926744c83.tar.bz2 sharkey-38d7faffdb2db14729c27b1d65baf80926744c83.zip | |
merge: make it harder to fumble opening a collapsed replied-to note (!811)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/811
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/frontend/src')
| -rw-r--r-- | packages/frontend/src/components/MkNote.vue | 4 | ||||
| -rw-r--r-- | packages/frontend/src/components/SkNote.vue | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 39f4806f0c..ffe60e480f 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -14,9 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only > <div v-if="appearNote.reply && inReplyToCollapsed" :class="$style.collapsedInReplyTo"> <MkAvatar :class="$style.collapsedInReplyToAvatar" :user="appearNote.reply.user" link preview/> - <MkA v-user-preview="appearNote.reply.userId" :class="$style.name" :to="userPage(appearNote.reply.user)"> - <MkAcct :user="appearNote.reply.user"/> - </MkA>: + <MkAcct :user="appearNote.reply.user" :class="$style.collapsedInReplyToText" @click="inReplyToCollapsed = false"/>: <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" v-show="!renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo"/> diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue index 528e86646b..17cabb4cef 100644 --- a/packages/frontend/src/components/SkNote.vue +++ b/packages/frontend/src/components/SkNote.vue @@ -16,9 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only <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/> - <MkA v-user-preview="appearNote.reply.userId" :class="$style.name" :to="userPage(appearNote.reply.user)"> - <MkAcct :user="appearNote.reply.user"/> - </MkA>: + <MkAcct :user="appearNote.reply.user" :class="$style.collapsedInReplyToText" @click="inReplyToCollapsed = false"/>: <Mfm :text="getNoteSummary(appearNote.reply)" :plain="true" :nowrap="true" :author="appearNote.reply.user" :nyaize="'respect'" :class="$style.collapsedInReplyToText" @click="inReplyToCollapsed = false"/> </div> <div v-if="pinned" :class="$style.tip"><i class="ti ti-pin"></i> {{ i18n.ts.pinnedNote }}</div> |