Merge 39efd2f4ee into 7d7a12d7d6

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Unreleased
 
+### Note
+- MFM `$[tada ]` をネストしても、文字列は１段階しか大きくならないようになりました
+
 ### General
 -
 

packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts

@@ -128,8 +128,11 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 					case 'tada': {
 						const speed = validTime(token.props.args.speed) ?? '1s';
 						const delay = validTime(token.props.args.delay) ?? '0s';
-						style = 'font-size: 150%;' + (useAnim ? `animation: global-tada ${speed} linear infinite both; animation-delay: ${delay};` : '');
+						style = (useAnim ? `animation: global-tada ${speed} linear infinite both; animation-delay: ${delay};` : '');
-						break;
+						return h('span', {
+							style: 'display: inline-block; ' + style,
+							class: 'mfm-tada',
+						}, genEl(token.children, scale));
 					}
 					case 'jelly': {
 						const speed = validTime(token.props.args.speed) ?? '1s';

packages/frontend/src/style.scss

@@ -553,6 +553,14 @@ html[data-color-mode=dark] ._woodenFrame {
 	}
 }
 
+.mfm-tada {
+	font-size: 150%;
+}
+
+.mfm-tada:has(.mfm-tada) {
+	font-size: 100%;
+}
+
 .mfm-x2 {
 	--mfm-zoom-size: 200%;
 }