From 389ca3f332748bce2f11048796ee16112eb0ff05 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Fri, 2 Jun 2023 21:04:51 -0400
Subject: [PATCH 1/3] aria to acc menu button

---
 packages/client/src/pages/user/home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index a7da75dc64..2ea4bc9711 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -134,7 +134,7 @@
 						</div>
 						<div class="follow-container">
 							<div class="actions">
-								<button class="menu _button" @click="menu">
+								<button class="menu _button" @click="menu" v-tooltip="i18n.ts.menu">
 									<i
 										class="ph-dots-three-outline ph-bold ph-lg"
 									></i>

From bf21b8412909cae4c49d27cbec9c040ed9213067 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Fri, 2 Jun 2023 22:54:23 -0400
Subject: [PATCH 2/3] fix mfm-cheat-sheet styling

---
 .../client/src/components/MkCheatSheetDialog.vue   |  8 ++------
 packages/client/src/pages/mfm-cheat-sheet.vue      | 14 ++++++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/components/MkCheatSheetDialog.vue b/packages/client/src/components/MkCheatSheetDialog.vue
index 04b8cec6e2..519955d484 100644
--- a/packages/client/src/components/MkCheatSheetDialog.vue
+++ b/packages/client/src/components/MkCheatSheetDialog.vue
@@ -6,12 +6,7 @@
 		@closed="$emit('closed')"
 	>
 		<template #header>{{ i18n.ts._mfm.cheatSheet }}</template>
-
-		<div class="_monolithic_">
-			<div class="_section">
-				<XCheatSheet />
-			</div>
-		</div>
+		<XCheatSheet :popup="true" style="background: var(--bg)"/>
 	</XModalWindow>
 </template>
 
@@ -41,4 +36,5 @@ function close(res) {
 .fade-leave-to {
 	opacity: 0;
 }
+
 </style>
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index a22d7ce1ec..e9fb213b7e 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -1,8 +1,8 @@
 <template>
 	<MkStickyContainer>
-		<template #header><MkPageHeader /></template>
+		<template #header><MkPageHeader v-if="!popup" /></template>
 		<MkSpacer :content-max="800">
-			<div :class="$style.root">
+			<div class="mfm-cheat-sheet">
 				<div>{{ i18n.ts._mfm.intro }}</div>
 				<br />
 				<div class="section _block">
@@ -449,6 +449,10 @@ import { definePageMetadata } from "@/scripts/page-metadata";
 import { i18n } from "@/i18n";
 import { instance } from "@/instance";
 
+defineProps<{
+	popup?: boolean
+}>();
+
 let preview_mention = $ref("@example");
 let preview_hashtag = $ref("#test");
 let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://calckey.org)`);
@@ -514,10 +518,8 @@ definePageMetadata({
 });
 </script>
 
-<style lang="scss" module>
-.root {
-	background: var(--bg);
-
+<style lang="scss" scoped>
+.mfm-cheat-sheet {
 	> .section {
 		> .title {
 			position: sticky;

From 217b389a7b1045b5af97ed061bdbcb3cec2c1301 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Fri, 2 Jun 2023 22:57:04 -0400
Subject: [PATCH 3/3] tweak

---
 packages/client/src/pages/mfm-cheat-sheet.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index e9fb213b7e..1bbe36915a 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -536,6 +536,7 @@ definePageMetadata({
 			> p {
 				margin: 0;
 				padding: 16px;
+				padding-top: 0;
 			}
 
 			> .preview {