diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-08-31 10:18:48 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-08-31 10:18:48 +0900 |
| commit | ebe029458e0ae4ef57b4d728f24ef5fdc19d834a (patch) | |
| tree | 752d2fb45f5c24fcb413405b1ab4012fb875b58a /packages/frontend | |
| parent | Update CHANGELOG.md (diff) | |
| download | misskey-ebe029458e0ae4ef57b4d728f24ef5fdc19d834a.tar.gz misskey-ebe029458e0ae4ef57b4d728f24ef5fdc19d834a.tar.bz2 misskey-ebe029458e0ae4ef57b4d728f24ef5fdc19d834a.zip | |
enhance(frontend): アイコンのスクロール追従を無効化する際の適用範囲を強化
Resolve #16485
Diffstat (limited to 'packages/frontend')
| -rw-r--r-- | packages/frontend/src/components/MkNoteSimple.vue | 12 | ||||
| -rw-r--r-- | packages/frontend/src/pages/chat/XMessage.vue | 9 |
2 files changed, 14 insertions, 7 deletions
diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue index f1107527b7..ed0b3ad555 100644 --- a/packages/frontend/src/components/MkNoteSimple.vue +++ b/packages/frontend/src/components/MkNoteSimple.vue @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only <template> <div v-if="note" :class="$style.root"> - <MkAvatar :class="$style.avatar" :user="note.user" link preview/> + <MkAvatar :class="[$style.avatar, prefer.s.useStickyIcons ? $style.useSticky : null]" :user="note.user" link preview/> <div :class="$style.main"> <MkNoteHeader :class="$style.header" :note="note" :mini="true"/> <div> @@ -31,6 +31,7 @@ import MkNoteHeader from '@/components/MkNoteHeader.vue'; import MkSubNoteContent from '@/components/MkSubNoteContent.vue'; import MkCwButton from '@/components/MkCwButton.vue'; import { i18n } from '@/i18n.js'; +import { prefer } from '@/preferences.js'; const props = defineProps<{ note: Misskey.entities.Note | null; @@ -54,9 +55,12 @@ const showContent = ref(false); width: 34px; height: 34px; border-radius: 8px; - position: sticky !important; - top: calc(16px + var(--MI-stickyTop, 0px)); - left: 0; + + &.useSticky { + position: sticky !important; + top: calc(16px + var(--MI-stickyTop, 0px)); + left: 0; + } } .main { diff --git a/packages/frontend/src/pages/chat/XMessage.vue b/packages/frontend/src/pages/chat/XMessage.vue index c5e8d0fdb6..613c4e4dcc 100644 --- a/packages/frontend/src/pages/chat/XMessage.vue +++ b/packages/frontend/src/pages/chat/XMessage.vue @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only <template> <div :class="[$style.root, { [$style.isMe]: isMe }]"> - <MkAvatar :class="$style.avatar" :user="message.fromUser!" :link="!isMe" :preview="false"/> + <MkAvatar :class="[$style.avatar, prefer.s.useStickyIcons ? $style.useSticky : null]" :user="message.fromUser!" :link="!isMe" :preview="false"/> <div :class="[$style.body, message.file != null ? $style.fullWidth : null]" @contextmenu.stop="onContextmenu"> <div :class="$style.header"><MkUserName v-if="!isMe && prefer.s['chat.showSenderName'] && message.fromUser != null" :user="message.fromUser"/></div> <MkFukidashi :class="$style.fukidashi" :tail="isMe ? 'right' : 'left'" :fullWidth="message.file != null" :accented="isMe"> @@ -231,11 +231,14 @@ function showMenu(ev: MouseEvent, contextmenu = false) { } .avatar { - position: sticky; - top: calc(16px + var(--MI-stickyTop, 0px)); display: block; width: 50px; height: 50px; + + &.useSticky { + position: sticky; + top: calc(16px + var(--MI-stickyTop, 0px)); + } } @container (max-width: 450px) { |