diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-03-02 17:06:46 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-02 17:06:46 +0900 |
| commit | 78ff90f2cc3bdb3b4119f51617614d1a32afd960 (patch) | |
| tree | a1ea2398514425edef242fad247effb81f65d229 /packages/frontend/src/pages | |
| parent | Merge pull request #13447 from misskey-dev/develop (diff) | |
| parent | 2024.3.1 (diff) | |
| download | misskey-78ff90f2cc3bdb3b4119f51617614d1a32afd960.tar.gz misskey-78ff90f2cc3bdb3b4119f51617614d1a32afd960.tar.bz2 misskey-78ff90f2cc3bdb3b4119f51617614d1a32afd960.zip | |
Merge pull request #13493 from misskey-dev/develop
Release: 2024.3.1
Diffstat (limited to 'packages/frontend/src/pages')
| -rw-r--r-- | packages/frontend/src/pages/about-misskey.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/pages/settings/emoji-picker.vue | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue index fd97ab97b9..1a49dbf1d5 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-misskey.vue @@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only <div class="misskey">Misskey</div> <div class="version">v{{ version }}</div> <span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"> - <MkCustomEmoji v-if="emoji.emoji[0] === ':'" class="emoji" :name="emoji.emoji" :normal="true" :noStyle="true"/> + <MkCustomEmoji v-if="emoji.emoji[0] === ':'" class="emoji" :name="emoji.emoji" :normal="true" :noStyle="true" :fallbackToImage="true"/> <MkEmoji v-else class="emoji" :emoji="emoji.emoji" :normal="true" :noStyle="true"/> </span> </div> diff --git a/packages/frontend/src/pages/settings/emoji-picker.vue b/packages/frontend/src/pages/settings/emoji-picker.vue index ce296ec183..dc3e3ee503 100644 --- a/packages/frontend/src/pages/settings/emoji-picker.vue +++ b/packages/frontend/src/pages/settings/emoji-picker.vue @@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only > <template #item="{element}"> <button class="_button" :class="$style.emojisItem" @click="removeReaction(element, $event)"> - <MkCustomEmoji v-if="element[0] === ':'" :name="element" :normal="true"/> + <MkCustomEmoji v-if="element[0] === ':'" :name="element" :normal="true" :fallbackToImage="true"/> <MkEmoji v-else :emoji="element" :normal="true"/> </button> </template> @@ -63,7 +63,7 @@ SPDX-License-Identifier: AGPL-3.0-only > <template #item="{element}"> <button class="_button" :class="$style.emojisItem" @click="removeEmoji(element, $event)"> - <MkCustomEmoji v-if="element[0] === ':'" :name="element" :normal="true"/> + <MkCustomEmoji v-if="element[0] === ':'" :name="element" :normal="true" :fallbackToImage="true"/> <MkEmoji v-else :emoji="element" :normal="true"/> </button> </template> |