From 3a4db9c73c9914952bdea520f640e4be3695cbfe Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 28 Apr 2024 14:22:01 +0900
Subject: [PATCH 1/4] =?UTF-8?q?change(mfm):=20`$[tada=20]`=20=E3=81=AE?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88=E3=82=B5=E3=82=A4=E3=82=BA?=
 =?UTF-8?q?=E3=81=AF1=E6=AE=B5=E9=9A=8E=E3=81=97=E3=81=8B=E5=A4=A7?=
 =?UTF-8?q?=E3=81=8D=E3=81=8F=E3=81=AA=E3=82=89=E3=81=AA=E3=81=84=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/global/MkMisskeyFlavoredMarkdown.ts    | 7 +++++--
 packages/frontend/src/style.scss                          | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 6e880fc322..aecf599751 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -121,8 +121,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};` : '');
-						break;
+						style = (useAnim ? `animation: global-tada ${speed} linear infinite both; animation-delay: ${delay};` : '');
+						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';
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 250a2616a7..d30c4518f1 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -540,6 +540,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%;
 }

From 843d9c97bf7bb37bb7a4e66110f07ff7529eb779 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 28 Apr 2024 14:24:09 +0900
Subject: [PATCH 2/4] Update Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68015596bd..3ff87883d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Note
 - コントロールパネル内にあるサマリープロキシの設定個所がセキュリティから全般へ変更となります。
+- MFM `$[tada ]` をネストしても、文字列は１段階しか大きくならないようになりました
 
 ### General
 - Enhance: URLプレビューの有効化・無効化を設定できるように #13569

From c5e87bd9a85ca3d7b2015728fb0513cfaf022a95 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 28 Apr 2024 14:29:55 +0900
Subject: [PATCH 3/4] fix

---
 packages/frontend/src/style.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index d30c4518f1..d7871dfbab 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -544,7 +544,10 @@ html[data-color-mode=dark] ._woodenFrame {
 	font-size: 150%;
 }
 
-.mfm-tada:has(.mfm-tada)  {
+.mfm-tada:has(.mfm-tada),
+.mfm-tada:has(.mfm-x2),
+.mfm-tada:has(.mfm-x3),
+.mfm-tada:has(.mfm-x4) {
 	font-size: 100%;
 }
 

From 0ab421aef84f690a535af3d029ff075872eb2257 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 28 Apr 2024 14:30:24 +0900
Subject: [PATCH 4/4] :v:

---
 packages/frontend/src/style.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index d7871dfbab..49df05d571 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -544,10 +544,7 @@ html[data-color-mode=dark] ._woodenFrame {
 	font-size: 150%;
 }
 
-.mfm-tada:has(.mfm-tada),
-.mfm-tada:has(.mfm-x2),
-.mfm-tada:has(.mfm-x3),
-.mfm-tada:has(.mfm-x4) {
+.mfm-tada:has(.mfm-tada) {
 	font-size: 100%;
 }