merge: upstream (2)

This commit is contained in:
Marie 2024-01-21 13:15:39 +01:00
commit 9d3f34d88f
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
12 changed files with 50 additions and 21 deletions

View file

@ -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': {