diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-12-08 19:03:16 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-12-08 19:03:16 +0000 |
| commit | 9937ff39be5663536691abf010101e1d88f53622 (patch) | |
| tree | 81d0a37681685610fb99bf287fee109896f9a93c /packages/frontend-embed/src | |
| parent | Merge branch 'develop' into feature/2024.10 (diff) | |
| parent | merge: Feat: Flash playback using Ruffle (!687) (diff) | |
| download | sharkey-9937ff39be5663536691abf010101e1d88f53622.tar.gz sharkey-9937ff39be5663536691abf010101e1d88f53622.tar.bz2 sharkey-9937ff39be5663536691abf010101e1d88f53622.zip | |
Merge branch 'develop' into feature/2024.10
Diffstat (limited to 'packages/frontend-embed/src')
| -rw-r--r-- | packages/frontend-embed/src/components/EmAvatar.vue | 5 | ||||
| -rw-r--r-- | packages/frontend-embed/src/components/EmMediaBanner.vue | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/packages/frontend-embed/src/components/EmAvatar.vue b/packages/frontend-embed/src/components/EmAvatar.vue index 58c35c8ef0..50d46781d9 100644 --- a/packages/frontend-embed/src/components/EmAvatar.vue +++ b/packages/frontend-embed/src/components/EmAvatar.vue @@ -30,6 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only rotate: getDecorationAngle(decoration), scale: getDecorationScale(decoration), translate: getDecorationOffset(decoration), + zIndex: getDecorationZIndex(decoration), }" alt="" > @@ -86,6 +87,10 @@ function getDecorationOffset(decoration: Omit<Misskey.entities.UserDetailed['ava const offsetY = decoration.offsetY ?? 0; return offsetX === 0 && offsetY === 0 ? undefined : `${offsetX * 100}% ${offsetY * 100}%`; } + +function getDecorationZIndex(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) { + return decoration.showBelow ? '-1' : undefined; +} </script> <style lang="scss" module> diff --git a/packages/frontend-embed/src/components/EmMediaBanner.vue b/packages/frontend-embed/src/components/EmMediaBanner.vue index cf4a4c53b5..24874940f3 100644 --- a/packages/frontend-embed/src/components/EmMediaBanner.vue +++ b/packages/frontend-embed/src/components/EmMediaBanner.vue @@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only <a :href="href" target="_blank" :class="$style.root"> <div :class="$style.label"> <template v-if="media.type.startsWith('audio')"><i class="ti ti-music"></i> {{ i18n.ts.audio }}</template> + <template v-else-if="media.type.startsWith('application') && media.type.includes('flash')"><i class="ti ti-bolt"></i> {{ i18n.ts.flash }}</template> <template v-else><i class="ti ti-file"></i> {{ i18n.ts.file }}</template> </div> <div :class="$style.go"> |