diff --git a/locales/index.d.ts b/locales/index.d.ts index ae27bd110..e0924eb02 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -4824,6 +4824,9 @@ export interface Locale extends ILocale { * タイトルへ */ "backToTitle": string; + /** + * お住まいの地域 + */ "hemisphere": string; /** * センシティブなファイルを含むノートを表示 @@ -9422,8 +9425,17 @@ export interface Locale extends ILocale { }; }; "_hemisphere": { + /** + * 北半球 + */ "N": string; + /** + * 南半球 + */ "S": string; + /** + * 一部のクライアント設定で、季節を判定するために使用します。 + */ "caption": string; }; "_reversi": { diff --git a/packages/frontend/src/components/MkLaunchPad.vue b/packages/frontend/src/components/MkLaunchPad.vue index 120ed7a86..6980192d0 100644 --- a/packages/frontend/src/components/MkLaunchPad.vue +++ b/packages/frontend/src/components/MkLaunchPad.vue @@ -138,7 +138,7 @@ function close() { left: 32px; color: var(--indicator); font-size: 8px; - animation: blink 1s infinite; + animation: global-blink 1s infinite; @media (max-width: 500px) { top: 16px; diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index 3026d4f01..17ace227f 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -450,7 +450,7 @@ onBeforeUnmount(() => { align-items: center; color: var(--indicator); font-size: 12px; - animation: blink 1s infinite; + animation: global-blink 1s infinite; } .divider { diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts index 9eab85500..b234144c1 100644 --- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts +++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts @@ -62,12 +62,12 @@ export default function(props: MfmProps, context: SetupContext) { if (t == null) return null; return t.match(/^[0-9.]+s$/) ? t : null; }; - + const validColor = (c: string | null | undefined): string | null => { if (c == null) return null; return c.match(/^[0-9a-f]{3,6}$/i) ? c : null; }; - + const useAnim = defaultStore.state.advancedMfm && defaultStore.state.animatedMfm; /** @@ -118,7 +118,7 @@ export default function(props: MfmProps, context: SetupContext) { case 'tada': { const speed = validTime(token.props.args.speed) ?? '1s'; const delay = validTime(token.props.args.delay) ?? '0s'; - style = 'font-size: 150%;' + (useAnim ? `animation: tada ${speed} linear infinite both; animation-delay: ${delay};` : ''); + style = 'font-size: 150%;' + (useAnim ? `animation: global-tada ${speed} linear infinite both; animation-delay: ${delay};` : ''); break; } case 'jelly': { diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue index 6ad779c60..4d4450ed7 100644 --- a/packages/frontend/src/pages/reversi/game.board.vue +++ b/packages/frontend/src/pages/reversi/game.board.vue @@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._reversi.opponentTurn }}({{ i18n.tsx.remainingN({ n: opTurnTimerRmain }) }})
-
{{ i18n.ts._reversi.myTurn }}({{ i18n.tsx.remainingN({ n: myTurnTimerRmain }) }})
+
{{ i18n.ts._reversi.myTurn }}({{ i18n.tsx.remainingN({ n: myTurnTimerRmain }) }})