diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-10-23 02:46:44 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-10-23 02:46:44 +0900 |
| commit | a1af83c0ab30c01fa3a0990b1486987e536d46fb (patch) | |
| tree | 6e5cc9741bbe6fbbaba36d7f529c47c9adb531e1 /src/client/components | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.93.1 (diff) | |
| download | misskey-a1af83c0ab30c01fa3a0990b1486987e536d46fb.tar.gz misskey-a1af83c0ab30c01fa3a0990b1486987e536d46fb.tar.bz2 misskey-a1af83c0ab30c01fa3a0990b1486987e536d46fb.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client/components')
| -rw-r--r-- | src/client/components/notification.vue | 3 | ||||
| -rw-r--r-- | src/client/components/updated.vue | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/client/components/notification.vue b/src/client/components/notification.vue index bce6333d98..8c2787cf31 100644 --- a/src/client/components/notification.vue +++ b/src/client/components/notification.vue @@ -13,7 +13,8 @@ <i v-else-if="notification.type === 'mention'" class="fas fa-at"></i> <i v-else-if="notification.type === 'quote'" class="fas fa-quote-left"></i> <i v-else-if="notification.type === 'pollVote'" class="fas fa-poll-h"></i> - <XReactionIcon v-else-if="notification.type === 'reaction'" :reaction="notification.reaction" :custom-emojis="notification.note.emojis" :no-style="true"/> + <!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 --> + <XReactionIcon v-else-if="notification.type === 'reaction'" :reaction="notification.reaction ? notification.reaction.replace(/^:(\w+):$/, ':$1@.:') : notification.reaction" :custom-emojis="notification.note.emojis" :no-style="true"/> </div> </div> <div class="tail"> diff --git a/src/client/components/updated.vue b/src/client/components/updated.vue index 5033d866fb..2f92f743e6 100644 --- a/src/client/components/updated.vue +++ b/src/client/components/updated.vue @@ -4,7 +4,7 @@ <div class="title">{{ $ts.misskeyUpdated }}</div> <div class="version">✨{{ version }}🚀</div> <MkButton full @click="whatIsNew">{{ $ts.whatIsNew }}</MkButton> - <MkButton primary full @click="$refs.modal.close()">{{ $ts.gotIt }}</MkButton> + <MkButton class="gotIt" primary full @click="$refs.modal.close()">{{ $ts.gotIt }}</MkButton> </div> </MkModal> </template> @@ -54,5 +54,9 @@ export default defineComponent({ > .version { margin: 1em 0; } + + > .gotIt { + margin: 8px 0 0 0; + } } </style> |