diff options
| author | Marie <marie@kaifa.ch> | 2024-01-21 13:15:39 +0100 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-01-21 13:15:39 +0100 |
| commit | 9d3f34d88f49f841da2ed1922bdee80e1c76c42c (patch) | |
| tree | a033141703e650256de2863f04cf9ffdccdc88cf /packages/frontend/src/components | |
| parent | fix: streaming.js module not found (diff) | |
| parent | enhance(frontend): リファクタリングなど (diff) | |
| download | sharkey-9d3f34d88f49f841da2ed1922bdee80e1c76c42c.tar.gz sharkey-9d3f34d88f49f841da2ed1922bdee80e1c76c42c.tar.bz2 sharkey-9d3f34d88f49f841da2ed1922bdee80e1c76c42c.zip | |
merge: upstream (2)
Diffstat (limited to 'packages/frontend/src/components')
| -rw-r--r-- | packages/frontend/src/components/MkLaunchPad.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkMenu.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/frontend/src/components/MkLaunchPad.vue b/packages/frontend/src/components/MkLaunchPad.vue index 099082f539..0a2385ff25 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 5f48f43bfb..eb6e7935ed 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 748b4f476e..b5f122b44d 100644 --- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts +++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts @@ -121,7 +121,7 @@ export default function(props: MfmProps, context: SetupContext<MfmEvents>) { 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': { |