diff options
| author | Marie <github@yuugi.dev> | 2025-06-14 16:16:53 +0000 |
|---|---|---|
| committer | Marie <github@yuugi.dev> | 2025-06-14 16:16:53 +0000 |
| commit | b5198b4a669643a77429730d3339eab7a6a7ef36 (patch) | |
| tree | e56e7b2810a14c1953bedc3439889076323d9942 /packages/frontend/src/components/MkSubNoteContent.vue | |
| parent | merge: Set X-Robots-Tag to disable indexing API endpoints (resolves #756) (!1... (diff) | |
| parent | copy changes to MkSubNoteContent and welcome.timeline.note (diff) | |
| download | sharkey-b5198b4a669643a77429730d3339eab7a6a7ef36.tar.gz sharkey-b5198b4a669643a77429730d3339eab7a6a7ef36.tar.bz2 sharkey-b5198b4a669643a77429730d3339eab7a6a7ef36.zip | |
merge: Fix "reply" indicator showing on a separate line in Misskey note styles (resolves #1100) (!1117)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1117
Closes #1100
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/frontend/src/components/MkSubNoteContent.vue')
| -rw-r--r-- | packages/frontend/src/components/MkSubNoteContent.vue | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue index b7eddb9536..60d303f937 100644 --- a/packages/frontend/src/components/MkSubNoteContent.vue +++ b/packages/frontend/src/components/MkSubNoteContent.vue @@ -8,8 +8,10 @@ SPDX-License-Identifier: AGPL-3.0-only <div :class="{ [$style.clickToOpen]: prefer.s.clickToOpen }" @click.stop="prefer.s.clickToOpen ? noteclick(note.id) : undefined"> <span v-if="note.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span> <span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deletedNote }})</span> - <MkA v-if="note.replyId" :class="$style.reply" :to="`/notes/${note.replyId}`" @click.stop><i class="ph-arrow-bend-left-up ph-bold ph-lg"></i></MkA> - <Mfm v-if="note.text" :text="note.text" :isBlock="true" :author="note.user" :nyaize="'respect'" :isAnim="allowAnim" :emojiUrls="note.emojis"/> + <div> + <MkA v-if="note.replyId" :class="$style.reply" :to="`/notes/${note.replyId}`" @click.stop><i class="ph-arrow-bend-left-up ph-bold ph-lg"></i></MkA> + <Mfm v-if="note.text" :text="note.text" :author="note.user" :nyaize="'respect'" :isAnim="allowAnim" :emojiUrls="note.emojis"/> + </div> <MkButton v-if="!allowAnim && animated && !hideFiles" :class="$style.playMFMButton" :small="true" @click="animatedMFM()" @click.stop><i class="ph-play ph-bold ph-lg "></i> {{ i18n.ts._animatedMFM.play }}</MkButton> <MkButton v-else-if="!prefer.s.animatedMfm && allowAnim && animated && !hideFiles" :class="$style.playMFMButton" :small="true" @click="animatedMFM()" @click.stop><i class="ph-stop ph-bold ph-lg "></i> {{ i18n.ts._animatedMFM.stop }}</MkButton> <SkNoteTranslation :note="note" :translation="translation" :translating="translating"></SkNoteTranslation> |