Merge branch 'develop' of codeberg.org:calckey/calckey into develop

packages/client/src/components/MkCheatSheetDialog.vue

@@ -6,12 +6,7 @@
 		@closed="$emit('closed')"
 	>
 		<template #header>{{ i18n.ts._mfm.cheatSheet }}</template>
-
+		<XCheatSheet :popup="true" style="background: var(--bg)"/>
-		<div class="_monolithic_">
-			<div class="_section">
-				<XCheatSheet />
-			</div>
-		</div>
 	</XModalWindow>
 </template>
 
@@ -41,4 +36,5 @@ function close(res) {
 .fade-leave-to {
 	opacity: 0;
 }
+
 </style>

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>
+<style lang="scss" scoped>
-.root {
+.mfm-cheat-sheet {
-	background: var(--bg);
-
 	> .section {
 		> .title {
 			position: sticky;
@@ -534,6 +536,7 @@ definePageMetadata({
 			> p {
 				margin: 0;
 				padding: 16px;
+				padding-top: 0;
 			}
 
 			> .preview {

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>