From 015eed31f83330ec70f46c4b8863aa352a50dee1 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 4 May 2023 08:16:51 -0400
Subject: [PATCH 01/18] center header

---
 .../src/components/global/MkPageHeader.vue    | 154 ++++++++++--------
 1 file changed, 84 insertions(+), 70 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index c78ef0c10b..e0664ce67a 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -7,24 +7,24 @@
 		:style="{ background: bg }"
 		@click="onClick"
 	>
-		<i
-			@click="goBack()"
-			v-if="props.displayBackButton"
-			v-tooltip.noDelay="i18n.ts.goBack"
-			class="icon backButton ph-caret-left ph-bold ph-lg"
-		></i>
-		<div v-if="narrow" class="buttons left" @click="openAccountMenu">
-			<MkAvatar
-				v-if="props.displayMyAvatar && $i"
-				class="avatar"
-				:user="$i"
-				:disable-preview="true"
-				disableLink
-			/>
-		</div>
-		<template v-if="metadata">
+		<div class="left">
+			<i
+				@click="goBack()"
+				v-if="props.displayBackButton"
+				v-tooltip.noDelay="i18n.ts.goBack"
+				class="icon backButton ph-caret-left ph-bold ph-lg"
+			></i>
+			<div v-if="narrow" class="buttons left" @click="openAccountMenu">
+				<MkAvatar
+					v-if="props.displayMyAvatar && $i"
+					class="avatar"
+					:user="$i"
+					:disable-preview="true"
+					disableLink
+				/>
+			</div>
 			<div
-				v-if="!hideTitle"
+				v-if="!hideTitle && metadata"
 				class="titleContainer"
 				@click="showTabsPopup"
 			>
@@ -63,7 +63,9 @@
 					</div>
 				</div>
 			</div>
-			<div ref="tabsEl" v-if="hasTabs" class="tabs">
+		</div>
+		<template v-if="metadata">
+			<div ref="tabsEl" v-if="hasTabs" class="tabs" :class="{collapse: hasTabs && tabs.length > 3}">
 				<button
 					v-for="tab in tabs"
 					:ref="(el) => (tabRefs[tab.key] = el)"
@@ -215,25 +217,9 @@ function goBack(): void {
 	window.history.back();
 }
 
-const calcBg = () => {
-	const rawBg = metadata?.bg || "var(--bg)";
-	const tinyBg = tinycolor(
-		rawBg.startsWith("var(")
-			? getComputedStyle(document.documentElement).getPropertyValue(
-					rawBg.slice(4, -1)
-			  )
-			: rawBg
-	);
-	tinyBg.setAlpha(0.85);
-	bg.value = tinyBg.toRgbString();
-};
-
 let ro: ResizeObserver | null;
 
 onMounted(() => {
-	calcBg();
-	globalEvents.on("themeChanged", calcBg);
-
 	watch(
 		() => [props.tab, props.tabs],
 		() => {
@@ -243,7 +229,9 @@ onMounted(() => {
 					// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
 					// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
 					const tabSizeX = tabEl.scrollWidth + 20; // + the tab's padding
-					tabEl.style = `--width: ${tabSizeX}px`;
+					if (props.tabs.length > 3) {
+						tabEl.style = `--width: ${tabSizeX}px`;
+					}
 					setTimeout(() => {
 						const parentRect = tabsEl.getBoundingClientRect();
 						const rect = tabEl.getBoundingClientRect();
@@ -278,7 +266,6 @@ onMounted(() => {
 });
 
 onUnmounted(() => {
-	globalEvents.off("themeChanged", calcBg);
 	if (ro) ro.disconnect();
 });
 </script>
@@ -288,15 +275,32 @@ onUnmounted(() => {
 	--height: 55px;
 	display: flex;
 	width: 100%;
-	-webkit-backdrop-filter: var(--blur, blur(15px));
-	backdrop-filter: var(--blur, blur(15px));
-	border-bottom: solid 0.5px var(--divider);
 	height: var(--height);
+	max-width: 850px;
+	margin: auto;
+
+	&::before {
+		content: "";
+		position: absolute;
+		inset: 0;
+		border-bottom: solid 0.5px var(--divider);
+		-webkit-backdrop-filter: var(--blur, blur(15px));
+		backdrop-filter: var(--blur, blur(15px));
+		z-index: -1;
+	}
+	&::after {
+		content: "";
+		position: absolute;
+		inset: 0;
+		background: var(--bg);
+		opacity: .85;
+		z-index: -2;
+	}
 
 	&.thin {
 		--height: 45px;
 
-		> .buttons {
+		.buttons {
 			> .button {
 				font-size: 0.9em;
 			}
@@ -304,7 +308,7 @@ onUnmounted(() => {
 	}
 
 	&.slim {
-		> .titleContainer {
+		> .left > .titleContainer {
 			flex: 1;
 			margin: 0 auto;
 
@@ -348,14 +352,9 @@ onUnmounted(() => {
 		}
 	}
 
-	> .buttons {
-		--margin: 8px;
+	> .left {
 		display: flex;
-		align-items: center;
-		height: var(--height);
-		margin: 0 var(--margin);
-
-		&.left {
+		> .buttons {
 			margin-right: auto;
 
 			> .avatar {
@@ -368,13 +367,17 @@ onUnmounted(() => {
 				pointer-events: none;
 			}
 		}
+	}
+
+	> .buttons {
+		--margin: 8px;
+		display: flex;
+		align-items: center;
+		height: var(--height);
+		margin: 0 var(--margin);
 
 		&.right {
-			margin-left: auto;
-		}
-
-		&:empty {
-			display: none;
+			justify-content: flex-end;
 		}
 
 		> .button {
@@ -410,7 +413,7 @@ onUnmounted(() => {
 		margin-left: 1rem;
 	}
 
-	> .titleContainer {
+	> .left > .titleContainer {
 		display: flex;
 		align-items: center;
 		max-width: 400px;
@@ -466,34 +469,49 @@ onUnmounted(() => {
 		}
 	}
 
+	> .buttons, > .left {
+		width: 20%;
+	}
+
 	> .tabs {
 		position: relative;
-		width: 100%;
 		font-size: 1em;
 		overflow-x: auto;
 		white-space: nowrap;
 		contain: strict;
-
-		&::before {
-			content: "";
-			display: inline-block;
-			height: 40%;
-			border-left: 1px solid var(--divider);
-			margin-right: 1em;
-			margin-left: 10px;
-			vertical-align: -1px;
+		display: flex;
+		flex-grow: 1;
+		justify-content: center;
+		&.collapse {
+			--width: 38px;
+			> .tab {
+				width: 38px;
+				min-width: unset !important;
+				&:not(.active) > .title {
+					opacity: 0;
+				}
+			}
 		}
 
+		// &::before {
+		// 	content: "";
+		// 	display: inline-block;
+		// 	height: 40%;
+		// 	border-left: 1px solid var(--divider);
+		// 	margin-right: 1em;
+		// 	margin-left: 10px;
+		// 	vertical-align: -1px;
+		// }
+
 		> .tab {
 			display: inline-flex;
 			align-items: center;
 			position: relative;
 			border-inline: 10px solid transparent;
 			height: 100%;
+			min-width: max-content;
 			font-weight: normal;
 			opacity: 0.7;
-			width: 38px;
-			--width: 38px;
 			overflow: hidden;
 			transition: color 0.2s, opacity 0.2s, width 0.2s;
 
@@ -507,9 +525,6 @@ onUnmounted(() => {
 				font-weight: 600;
 				width: var(--width);
 			}
-			&:not(.active) > .title {
-				opacity: 0;
-			}
 
 			> .icon + .title {
 				margin-left: 8px;
@@ -518,7 +533,6 @@ onUnmounted(() => {
 				transition: opacity 0.2s;
 			}
 		}
-
 		> .highlight {
 			position: absolute;
 			bottom: 0;

From 9f360606a0a7364fcf0c899e5d63ada94d426eac Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 15:20:05 -0400
Subject: [PATCH 02/18] fixes!!

---
 .../src/components/global/MkPageHeader.vue    | 278 ++++++++----------
 1 file changed, 129 insertions(+), 149 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 117da82f86..c96b620097 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -3,27 +3,28 @@
 		v-if="show"
 		ref="el"
 		class="fdidabkb"
-		:class="{ slim: narrow, thin: thin_ }"
+		:class="{ thin: thin_ }"
 		:style="{ background: bg }"
 		@click="onClick"
 	>
 		<div class="left">
-			<button
-				v-if="props.displayBackButton"
-				class="_button button icon backButton"
-				@click.stop="goBack()"
-				@touchstart="preventDrag"
-				v-tooltip.noDelay="i18n.ts.goBack"
-			>
-				<i class="ph-caret-left ph-bold ph-lg"></i>
-			</button>
-			<div v-if="narrow" class="buttons left" @click="openAccountMenu">
+			<div class="buttons">
+				<button
+					v-if="props.displayBackButton"
+					class="_button button icon backButton"
+					@click.stop="goBack()"
+					@touchstart="preventDrag"
+					v-tooltip.noDelay="i18n.ts.goBack"
+				>
+					<i class="ph-caret-left ph-bold ph-lg"></i>
+				</button>
 				<MkAvatar
-					v-if="props.displayMyAvatar && $i"
-					class="avatar"
+					v-if="narrow && props.displayMyAvatar && $i"
+					class="avatar button"
 					:user="$i"
 					:disable-preview="true"
 					disableLink
+					@click.stop="openAccountMenu"
 				/>
 			</div>
 			<div
@@ -92,11 +93,13 @@
 					v-if="narrow"
 					:user="metadata.avatar"
 					:full="false"
+					class="fullButton"
 				></MkFollowButton>
 				<MkFollowButton
 					v-else
 					:user="metadata.avatar"
 					:full="true"
+					class="fullButton"
 				></MkFollowButton>
 			</template>
 			<template v-for="action in actions">
@@ -295,10 +298,26 @@ onUnmounted(() => {
 .fdidabkb {
 	--height: 55px;
 	display: flex;
+	justify-content: space-between;
 	width: 100%;
 	height: var(--height);
-	max-width: 850px;
-	margin: auto;
+	padding-inline: 24px;
+	box-sizing: border-box;
+	overflow: hidden;
+	@media (max-width: 500px) {
+		padding-inline: 12px;
+		> .left {
+			// flex-basis: unset !important;
+			min-width: max-content !important;
+		}
+		.titleContainer {
+			min-width: 0;
+		}
+		.buttons:empty {
+			width: 0;
+			flex-basis: 0;
+		}
+	}
 
 	&::before {
 		content: "";
@@ -328,87 +347,33 @@ onUnmounted(() => {
 		}
 	}
 
-	&.slim {
-		> .left > .titleContainer {
-			flex: 1;
-			margin: 0 auto;
-
-			> *:first-child {
-				margin-left: auto;
-			}
-
-			> *:last-child {
-				margin-right: auto;
-			}
-		}
-		> .tabs {
-			padding-inline: 12px;
-			mask: linear-gradient(
-				to right,
-				transparent,
-				black 10px 80%,
-				transparent
-			);
-			-webkit-mask: linear-gradient(
-				to right,
-				transparent,
-				black 10px 80%,
-				transparent
-			);
-			margin-left: -10px;
-			padding-left: 22px;
-			scrollbar-width: none;
-			&::before {
-				content: unset;
-			}
-			&::-webkit-scrollbar {
-				display: none;
-			}
-			&::after {
-				// Force right padding
-				content: "";
-				display: inline-block;
-				min-width: 20%;
-			}
-		}
-	}
-
 	> .left {
 		display: flex;
 		> .buttons {
-			margin-right: auto;
-
+			&:not(:empty) {
+				margin-left: calc(0px - var(--margin));
+			}
 			> .avatar {
-				$size: 32px;
-				display: inline-block;
-				width: $size;
-				height: $size;
-				vertical-align: bottom;
-				margin: 0 8px;
-				pointer-events: none;
+				width: 32px;
+				height: 32px;
 			}
 		}
 	}
 
-	> .buttons {
+	.buttons {
 		--margin: 8px;
 		display: flex;
 		align-items: center;
 		height: var(--height);
-		margin: 0 var(--margin);
-
 		&.right {
 			justify-content: flex-end;
-			margin-left: auto;
-			:deep(.follow-button) {
-				margin-right: 6px;
+			// margin-right: calc(0px - var(--margin));
+			// margin-left: var(--margin);
+			> .button:last-child {
+				margin-right: calc(0px - var(--margin));
 			}
 		}
 
-		&:empty {
-			display: none;
-		}
-
 		> .button/*, @at-root .backButton*/ {
 			/* I don't know how to get this to work */
 			display: flex;
@@ -436,71 +401,81 @@ onUnmounted(() => {
 		}
 	}
 
-	> .backButton {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin-left: 1rem;
-	}
-
-	> .left > .titleContainer {
-		display: flex;
-		align-items: center;
-		max-width: 400px;
-		overflow: auto;
-		white-space: nowrap;
-		text-align: left;
-		font-weight: bold;
-		flex-shrink: 0;
-		margin-left: 24px;
-		margin-right: 1rem;
-
-		> .avatar {
-			$size: 32px;
-			display: inline-block;
-			width: $size;
-			height: $size;
-			vertical-align: bottom;
-			margin: 0 8px;
-			pointer-events: none;
+	> .left {
+		> .backButton {
+			display: flex;
+			align-items: center;
+			justify-content: center;
 		}
-
-		> .icon {
-			margin-right: 8px;
-			width: 16px;
-			text-align: center;
-			transform: translate(0em);
-		}
-
-		> .title {
-			min-width: 0;
-			overflow: hidden;
-			text-overflow: ellipsis;
+		> .titleContainer {
+			display: flex;
+			align-items: center;
+			max-width: 400px;
+			overflow: auto;
 			white-space: nowrap;
-			line-height: 1.1;
-
-			> .subtitle {
-				opacity: 0.6;
-				font-size: 0.8em;
-				font-weight: normal;
-				white-space: nowrap;
+			text-align: left;
+			font-weight: bold;
+			flex-shrink: 0;
+			margin-right: 1rem;
+			max-width: 20vw;
+	
+			> .avatar {
+				$size: 32px;
+				display: inline-block;
+				width: $size;
+				height: $size;
+				vertical-align: bottom;
+				margin: 0 8px;
+				pointer-events: none;
+			}
+	
+			> .icon {
+				margin-right: 8px;
+				width: 16px;
+				text-align: center;
+			}
+	
+			> .title {
+				min-width: 0;
 				overflow: hidden;
 				text-overflow: ellipsis;
-
-				&.activeTab {
-					text-align: center;
-
-					> .chevron {
-						display: inline-block;
-						margin-left: 6px;
+				white-space: nowrap;
+				line-height: 1.1;
+	
+				> .subtitle {
+					opacity: 0.6;
+					font-size: 0.8em;
+					font-weight: normal;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+	
+					&.activeTab {
+						text-align: center;
+	
+						> .chevron {
+							display: inline-block;
+							margin-left: 6px;
+						}
 					}
 				}
 			}
 		}
 	}
 
-	> .buttons, > .left {
-		width: 20%;
+
+	> .left, > .right {
+		flex-basis: 100%;
+		flex-shrink: 9999;
+	}
+	> .left {
+		// margin-right: auto;
+		min-width: 20%;
+		// min-width: max-content;
+	}
+	> .right {
+		// margin-left: auto;
+		min-width: max-content;
 	}
 
 	> .tabs {
@@ -508,31 +483,35 @@ onUnmounted(() => {
 		font-size: 1em;
 		overflow-x: auto;
 		white-space: nowrap;
-		contain: strict;
+		contain: content;
 		display: flex;
-		flex-grow: 1;
-		justify-content: center;
+		padding-inline: 20px;
+		margin-inline: -20px;
+		mask: linear-gradient(
+			to right,
+			transparent,
+			black 20px calc(100% - 20px),
+			transparent
+		);
+		-webkit-mask: linear-gradient(
+			to right,
+			transparent,
+			black 20px calc(100% - 20px),
+			transparent
+		);
+		scrollbar-width: none;
+
 		&.collapse {
 			--width: 38px;
 			> .tab {
 				width: 38px;
-				min-width: unset !important;
+				min-width: 38px !important;
 				&:not(.active) > .title {
 					opacity: 0;
 				}
 			}
 		}
 
-		// &::before {
-		// 	content: "";
-		// 	display: inline-block;
-		// 	height: 40%;
-		// 	border-left: 1px solid var(--divider);
-		// 	margin-right: 1em;
-		// 	margin-left: 10px;
-		// 	vertical-align: -1px;
-		// }
-
 		> .tab {
 			display: inline-flex;
 			align-items: center;
@@ -543,7 +522,7 @@ onUnmounted(() => {
 			font-weight: normal;
 			opacity: 0.7;
 			overflow: hidden;
-			transition: color 0.2s, opacity 0.2s, width 0.2s;
+			transition: color 0.2s, opacity 0.2s, width 0.2s, min-width .2s;
 
 			&:hover {
 				opacity: 1;
@@ -554,6 +533,7 @@ onUnmounted(() => {
 				color: var(--accent);
 				font-weight: 600;
 				width: var(--width);
+				min-width: var(--width) !important;
 			}
 
 			> .icon + .title {

From 4b56d34f93f8c5f637beb9b27c901aaa4509105d Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 15:23:26 -0400
Subject: [PATCH 03/18] better way of doing that

Couldn't due before becuase of how css was done
---
 packages/client/src/components/global/MkPageHeader.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index c96b620097..4ccd9b3107 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -129,7 +129,6 @@ import {
 	nextTick,
 	reactive,
 } from "vue";
-import tinycolor from "tinycolor2";
 import MkFollowButton from "@/components/MkFollowButton.vue";
 import { popupMenu } from "@/os";
 import { scrollToTop } from "@/scripts/scroll";
@@ -257,15 +256,11 @@ onMounted(() => {
 						tabEl.style = `--width: ${tabSizeX}px`;
 					}
 					setTimeout(() => {
-						const parentRect = tabsEl.getBoundingClientRect();
-						const rect = tabEl.getBoundingClientRect();
-						const left =
-							rect.left - parentRect.left + tabsEl?.scrollLeft;
 						tabHighlightEl.style.width = tabSizeX + "px";
-						tabHighlightEl.style.transform = `translateX(${left}px)`;
+						tabHighlightEl.style.transform = `translateX(${tabEl.offsetLeft}px)`;
 						window.requestAnimationFrame(() => {
 							tabsEl?.scrollTo({
-								left: left - 60,
+								left: tabEl.offsetLeft - 60,
 								behavior: "smooth",
 							});
 						});

From 9db7962e3721f7a8b11786597eaaef6a379092eb Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 15:35:03 -0400
Subject: [PATCH 04/18] more fix, actually

---
 packages/client/src/components/global/MkPageHeader.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 4ccd9b3107..99f809fc3d 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -308,10 +308,6 @@ onUnmounted(() => {
 		.titleContainer {
 			min-width: 0;
 		}
-		.buttons:empty {
-			width: 0;
-			flex-basis: 0;
-		}
 	}
 
 	&::before {
@@ -412,7 +408,6 @@ onUnmounted(() => {
 			font-weight: bold;
 			flex-shrink: 0;
 			margin-right: 1rem;
-			max-width: 20vw;
 	
 			> .avatar {
 				$size: 32px;
@@ -462,15 +457,20 @@ onUnmounted(() => {
 	> .left, > .right {
 		flex-basis: 100%;
 		flex-shrink: 9999;
+		overflow: hidden;
 	}
 	> .left {
 		// margin-right: auto;
 		min-width: 20%;
+		margin-left: -10px;
+		padding-left: 10px;
 		// min-width: max-content;
 	}
 	> .right {
 		// margin-left: auto;
 		min-width: max-content;
+		margin-right: -10px;
+		padding-right: 10px;
 	}
 
 	> .tabs {

From ddb52ca4e39829fd099fbe6f9d5fc139c39a7483 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 15:40:36 -0400
Subject: [PATCH 05/18] add ::before & ::after to themeChanging class

---
 packages/client/src/style.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 8191dac267..fbbae64fed 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -103,7 +103,7 @@ body::-webkit-scrollbar-thumb {
 }
 
 html._themeChanging_ {
-	&, * {
+	&, *, ::before, ::after {
 		transition: background 1s ease, border 1s ease !important;
 	}
 }

From e36ce8e8493f7957255c9864d6c467653fd853df Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 15:45:39 -0400
Subject: [PATCH 06/18] fix avatar pos

---
 packages/client/src/components/global/MkPageHeader.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 99f809fc3d..465015ce8e 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -347,6 +347,7 @@ onUnmounted(() => {
 			> .avatar {
 				width: 32px;
 				height: 32px;
+				margin-left: var(--margin);
 			}
 		}
 	}

From 07ce15d30e16ee8a07c10fce4b8fe7ad5712e025 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 16:38:11 -0400
Subject: [PATCH 07/18] this took longer than i would have liked.

---
 .../src/components/global/MkPageHeader.vue    | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 465015ce8e..c1cf0e9a1e 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -3,7 +3,7 @@
 		v-if="show"
 		ref="el"
 		class="fdidabkb"
-		:class="{ thin: thin_ }"
+		:class="{ thin: thin_, tabs: tabs?.length > 0 }"
 		:style="{ background: bg }"
 		@click="onClick"
 	>
@@ -300,13 +300,31 @@ onUnmounted(() => {
 	box-sizing: border-box;
 	overflow: hidden;
 	@media (max-width: 500px) {
-		padding-inline: 12px;
+		padding-inline: 12p
+	}
+	@media (max-width: 700px) {
 		> .left {
-			// flex-basis: unset !important;
-			min-width: max-content !important;
+			min-width: unset !important;
+			max-width: 40%;
 		}
-		.titleContainer {
-			min-width: 0;
+		> .left, > .right {
+			flex: unset !important;
+		}
+		&:not(.tabs) {
+			> .left {
+				width: 0 !important;
+				flex-grow: 1 !important;
+				max-width: unset !important;
+			}
+		}
+		&.tabs {
+			> .left {
+				flex-shrink: 0 !important;
+			}
+
+			.buttons ~ .titleContainer > .title {
+				display: none;
+			}
 		}
 	}
 
@@ -461,11 +479,9 @@ onUnmounted(() => {
 		overflow: hidden;
 	}
 	> .left {
-		// margin-right: auto;
 		min-width: 20%;
 		margin-left: -10px;
 		padding-left: 10px;
-		// min-width: max-content;
 	}
 	> .right {
 		// margin-left: auto;
@@ -519,6 +535,7 @@ onUnmounted(() => {
 			opacity: 0.7;
 			overflow: hidden;
 			transition: color 0.2s, opacity 0.2s, width 0.2s, min-width .2s;
+			--width: max-content;
 
 			&:hover {
 				opacity: 1;

From 452b0309a59915ef0f18df419be740fe7c248420 Mon Sep 17 00:00:00 2001
From: warrows <codeberg@warrows.fr>
Date: Wed, 10 May 2023 12:28:50 +0200
Subject: [PATCH 08/18] Doc : Add apache2 basic configuration to documentation

Signed-off-by: warrows <codeberg@warrows.fr>
---
 README.md | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 79bd8f86cb..328c85aa6e 100644
--- a/README.md
+++ b/README.md
@@ -168,31 +168,25 @@ In Calckey's directory, fill out the `sonic` section of `.config/default.yml` wi
 
 For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](https://codeberg.org/calckey/calckey/src/branch/develop/docs/migrate.md).
 
-## 🌐 Web proxy
+## Web proxy
 
-### 🍀 Nginx (recommended)
+Choose between NGINX or Apache (we recommend NGINX)
+
+### 🍀 NGINX
 
 - Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/`
 - Edit `calckey.nginx.conf` to reflect your instance properly
 - Run `sudo ln -s ./calckey.nginx.conf ../sites-enabled/calckey.nginx.conf`
 - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service.
 
-### 🪶 Apache
+### Apache 2
 
 - Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/`
 - Edit `calckey.apache.conf` to reflect your instance properly
 - Run `sudo a2ensite calckey.apache` to enable the site
 - Run `sudo service apache2 restart` to reload apache2 configuration
 
-### 🦦 Caddy
-
-- Add the following block to your `Caddyfile`, replacing `example.tld` with your own domain:
-```caddy
-example.tld {
-    reverse_proxy http://127.0.0.1:3000
-}
-```
-- Reload your caddy configuration
+</details>
 
 ## 🚀 Build and launch!
 

From 454fec34b9a1fa006e998c917bca028f9e3337a1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 10 May 2023 17:08:16 -0700
Subject: [PATCH 09/18] docs: cleanup apache

---
 README.md | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 328c85aa6e..b8fd09b770 100644
--- a/README.md
+++ b/README.md
@@ -83,14 +83,11 @@ If you have access to a server that supports one of the sources below, I recomme
 - Web Proxy (one of the following)
   - 🍀 Nginx (recommended)
   - 🪶 Apache
-  - 🦦 Caddy
 
 ### 😗 Optional dependencies
 
 - [FFmpeg](https://ffmpeg.org/) for video transcoding
-- Full text search (one of the following)
-  - 🦔 [Sonic](https://crates.io/crates/sonic-server) (recommended)
-  - [ElasticSearch](https://www.elastic.co/elasticsearch/)
+- [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search
 
 ### 🏗️ Build dependencies
 
@@ -168,18 +165,16 @@ In Calckey's directory, fill out the `sonic` section of `.config/default.yml` wi
 
 For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](https://codeberg.org/calckey/calckey/src/branch/develop/docs/migrate.md).
 
-## Web proxy
+## 🌐 Web proxy
 
-Choose between NGINX or Apache (we recommend NGINX)
-
-### 🍀 NGINX
+### 🍀 Nginx (recommended)
 
 - Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/`
 - Edit `calckey.nginx.conf` to reflect your instance properly
 - Run `sudo ln -s ./calckey.nginx.conf ../sites-enabled/calckey.nginx.conf`
 - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service.
 
-### Apache 2
+### 🪶 Apache
 
 - Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/`
 - Edit `calckey.apache.conf` to reflect your instance properly

From e2552bdfbb9fafab161a9697d62dccc8b51c4215 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:18:58 +1000
Subject: [PATCH 10/18] Add MFM fade functionality

---
 .../src/components/global/MkMisskeyFlavoredMarkdown.vue      | 5 +++++
 packages/client/src/scripts/mfm-tags.ts                      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index c235b48354..896891d5e5 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -299,6 +299,11 @@ const props = withDefaults(
 		filter: hue-rotate(360deg) contrast(150%) saturate(150%);
 	}
 }
+
+@keyframes mfm-fade {
+	0% { opacity: 0; }
+	100% { opacity: 1; }
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/scripts/mfm-tags.ts b/packages/client/src/scripts/mfm-tags.ts
index b39c8b37b8..da0bea8186 100644
--- a/packages/client/src/scripts/mfm-tags.ts
+++ b/packages/client/src/scripts/mfm-tags.ts
@@ -19,4 +19,5 @@ export const MFM_TAGS = [
 	"rainbow",
 	"sparkle",
 	"rotate",
+	"fade",
 ];

From 03f41c12a4927af9e1c80caa25cbd36ef2109179 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:19:13 +1000
Subject: [PATCH 11/18] add fade description

---
 locales/ar-SA.yml | 2 ++
 locales/bn-BD.yml | 2 ++
 locales/cs-CZ.yml | 1 +
 locales/de-DE.yml | 2 ++
 locales/en-US.yml | 2 ++
 locales/es-ES.yml | 2 ++
 locales/fr-FR.yml | 2 ++
 locales/id-ID.yml | 2 ++
 locales/it-IT.yml | 2 ++
 locales/ja-JP.yml | 2 ++
 locales/ko-KR.yml | 2 ++
 locales/pl-PL.yml | 2 ++
 locales/sk-SK.yml | 2 ++
 locales/th-TH.yml | 2 ++
 locales/uk-UA.yml | 2 ++
 locales/vi-VN.yml | 2 ++
 locales/zh-CN.yml | 2 ++
 locales/zh-TW.yml | 2 ++
 18 files changed, 35 insertions(+)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index 148cd32a04..f2bc4476dd 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -919,6 +919,8 @@ _mfm:
   rainbowDescription: "اجعل المحتوى يظهر بألوان الطيف"
   rotate: "تدوير"
   rotateDescription: "يُدير المحتوى بزاوية معيّنة."
+  fade: "يختفي"
+  fadeDescription: "يتلاشى المحتوى للداخل والخارج."
 _instanceTicker:
   none: "لا تظهره بتاتًا"
   remote: "أظهر للمستخدمين البِعاد"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index cde425d7fd..a9428eea5f 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -974,6 +974,8 @@ _mfm:
   sparkleDescription: "বিষয়বস্তুকে একটি চিকচিকে কণা প্রভাব দেয়।"
   rotate: "ঘুরান"
   rotateDescription: "বিষয়বস্তুকে একটি নির্দিষ্ট কোনে ঘুরায়।"
+  fade: "বিবর্ণ"
+  fadeDescription: "ভিতরে এবং বাইরে বিষয়বস্তু বিবর্ণ।"
 _instanceTicker:
   none: "দেখাবেন না"
   remote: "রিমোট ব্যাবহারকারীদের জন্য দেখান"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 1d12e69aba..70d56b66d3 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -663,6 +663,7 @@ _mfm:
   blur: "Rozmazání"
   font: "Font"
   rainbow: "Duha"
+  fade: "Slábnout"
 _channel:
   featured: "Trendy"
 _menuDisplay:
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index ed5a7334b3..259eb8dc1f 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1171,6 +1171,8 @@ _mfm:
   sparkleDescription: "Verleiht Inhalt einen glitzernden Partikeleffekt."
   rotate: "Drehen"
   rotateDescription: "Dreht den Inhalt um einen angegebenen Winkel."
+  fade: "Ein-/Ausblenden"
+  fadeDescription: "Blended Inhalt ein and aus."
   plain: "Schlicht"
   plainDescription: "Deaktiviert jegliche MFM-Syntax, die sich innerhalb dieses MFM-Effekts\
     \ befindet."
diff --git a/locales/en-US.yml b/locales/en-US.yml
index b3944b1e57..b19801f75c 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1266,6 +1266,8 @@ _mfm:
   sparkleDescription: "Gives content a sparkling particle effect."
   rotate: "Rotate"
   rotateDescription: "Turns content by a specified angle."
+  fade: "Fade"
+  fadeDescription: "Fades content in and out."
   position: "Position"
   positionDescription: "Move content by a specified amount."
   scale: "Scale"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 49f51bff6e..de2b145054 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1151,6 +1151,8 @@ _mfm:
   sparkleDescription: "Aplica un efecto de partículas parpadeantes"
   rotate: "Rotar"
   rotateDescription: "Rota el contenido a un ángulo especificado."
+  fade: "Desvanecerse"
+  fadeDescription: "Desvanece el contenido hacia adentro y hacia afuera."
   plain: "Plano"
   plainDescription: "Desactiva los efectos de todo el contenido MFM con este efecto\
     \ MFM."
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 33201d820a..e7416f5775 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -1077,6 +1077,8 @@ _mfm:
   sparkle: "Paillettes"
   sparkleDescription: "Ajoute un effet scintillant au contenu."
   rotate: "Pivoter"
+  fade: "Apparaître/Disparaître"
+  fadeDescription: "Fait apparaître et disparaître le contenu."
   plainDescription: Désactiver les effets de tous les MFM contenus dans cet effet
     MFM.
   rotateDescription: Pivoter le contenu d'un angle spécifique.
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 4caca44399..edb9feace7 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -1074,6 +1074,8 @@ _mfm:
   sparkleDescription: "Memberikan konten efek partikel kelap-kelip."
   rotate: "Putar"
   rotateDescription: "Putar konten sesuai sudut yang ditentukan."
+  fade: "Memudar"
+  fadeDescription: "Memudar konten masuk dan keluar."
 _instanceTicker:
   none: "Jangan tampilkan"
   remote: "Tampilkan untuk pengguna luar"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index f526cac19e..6dc4b68b56 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -910,6 +910,8 @@ _mfm:
   fontDescription: "Puoi scegliere il tipo di carattere per il contenuto."
   rainbow: "Arcobaleno"
   rotate: "Ruota"
+  fade: "Dissolvenza"
+  fadeDescription: "Dissolvenza in entrata e in uscita del contenuto."
 _instanceTicker:
   none: "Nascondi"
   remote: "Mostra solo per gli/le utenti remotə"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 84c894c7a8..70854e42cd 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1128,6 +1128,8 @@ _mfm:
   sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
   rotate: "回転"
   rotateDescription: "指定した角度で回転させます。"
+  fade: "フェード"
+  fadeDescription: "コンテンツをフェードインおよびフェードアウトします。"
   plain: "プレーン"
   plainDescription: "内側の構文を全て無効にします。"
   position: 位置
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 15e776faf0..0a5fa26d9e 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1042,6 +1042,8 @@ _mfm:
   sparkleDescription: "반짝이는 파티클 효과를 추가합니다."
   rotate: "회전"
   rotateDescription: "지정한 각도로 회전시킵니다."
+  fade: "바래다"
+  fadeDescription: "콘텐츠를 페이드 인 및 페이드 아웃합니다."
   plain: "평문"
   plainDescription: "안에 있는 MFM 구문을 모두 무시하고 평문으로 표시합니다."
 _instanceTicker:
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index c127c5a525..8ab065384b 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1069,6 +1069,8 @@ _mfm:
   sparkleDescription: "Nadaje zawartości efekt lśniącego brokatu."
   rotate: "Obrót"
   rotateDescription: "Obraca zawartość o określony kąt."
+  fade: "Znikać"
+  fadeDescription: "Pojawia się i znika zawartość."
   plain: "Zwyczajny"
   plainDescription: "Wyłącza efekty wszystkich MFM zawartych w tym efekcie MFM."
   inlineCodeDescription: Wyświetla podświetlanie składni dla kodu (programu) w linii.
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index a36caf1fd0..51776c22a1 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1038,6 +1038,8 @@ _mfm:
   sparkleDescription: "Obsahu dodá trblietajúci efekt."
   rotate: "Otáčať"
   rotateDescription: "Otočí obsah o určitý uhol."
+  fade: "Vyblednúť"
+  fadeDescription: "Mizne obsah dovnútra a von."
   plain: "Obyčajné"
   plainDescription: "Bez akejkoľvej syntaxe"
 _instanceTicker:
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index b6d81d8f53..43e098319a 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1043,6 +1043,8 @@ _mfm:
   sparkleDescription: "ให้เนื้อหานั้นมีเอฟเฟกต์แบบอนุภาคประกาย"
   rotate: "หมุนหน้าจอ"
   rotateDescription: "เปลี่ยนเนื้อหาตามด้วยมุมที่ระบุไว้"
+  fade: "เลือนหายไป"
+  fadeDescription: "เลือนเนื้อหาเข้าและออก"
   plain: "เรียบง่าย"
   plainDescription: "ปิดการใช้งานเอฟเฟกต์ของ MFM ทั้งหมดที่มีอยู่ในเอฟเฟกต์ MFM นี้"
 _instanceTicker:
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 0368a0897e..f4b57f9872 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -824,6 +824,8 @@ _mfm:
   font: "Шрифт"
   fontDescription: "Встановлює шрифт для контенту."
   rotate: "Обертати"
+  fade: "Зникати"
+  fadeDescription: "Розмиває вміст."
 _instanceTicker:
   none: "Не відображати"
   remote: "Відображати для віддалених користувачів"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 7662af4095..fdf69b722e 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1043,6 +1043,8 @@ _mfm:
   sparkleDescription: "Làm cho nội dung hiệu ứng hạt lấp lánh."
   rotate: "Xoay"
   rotateDescription: "Xoay nội dung theo một góc cụ thể."
+  fade: "Phai màu"
+  fadeDescription: "Làm mờ dần nội dung trong và ngoài."
   plain: "Đơn giản"
   plainDescription: "Vô hiệu hóa mọi hiệu ứng MFM chứa trong hiệu ứng MFM này."
 _instanceTicker:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 8ca19e5969..b2af679bb1 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1050,6 +1050,8 @@ _mfm:
   sparkleDescription: "添加发光粒子效果。"
   rotate: "旋转"
   rotateDescription: "旋转指定的角度。"
+  fade: "褪色"
+  fadeDescription: "淡入和淡出内容。"
   plain: "简洁"
   plainDescription: "禁用所有内部语法。"
 _instanceTicker:
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index fd5117f48c..c33c3f3023 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1052,6 +1052,8 @@ _mfm:
   sparkleDescription: "添加閃閃發光的粒子效果。"
   rotate: "旋轉"
   rotateDescription: "以指定的角度旋轉。"
+  fade: "褪色"
+  fadeDescription: "淡入和淡出內容。"
   plain: "簡潔"
   plainDescription: "停用全部的內部語法。"
   play: 播放 MFM

From 006358540ccc5daf020746d51930f8d68b6cc1ba Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:19:27 +1000
Subject: [PATCH 12/18] add fade to cheat sheet

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

diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 20f69a6cef..ea35a6210c 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -353,6 +353,16 @@
 						</div>
 					</div>
 				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.fade }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.fadeDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_fade"/>
+							<MkTextarea v-model="preview_fade"><span>MFM</span></MkTextarea>
+						</div>
+					</div>
+				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.position }}</div>
 					<div class="content">
@@ -411,6 +421,14 @@
 								><span>MFM</span></MkTextarea
 							>
 						</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ i18n.ts._mfm.plain }}</div>
+				<div class="content">
+					<p>{{ i18n.ts._mfm.plainDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_plain"/>
+						<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -479,6 +497,7 @@ let preview_bg = $ref("$[bg.color=ff0000 Background color]");
 let preview_plain = $ref(
 	"<plain>**bold** @mention #hashtag `code` $[x2 🍮]</plain>"
 );
+let preview_fade = $ref('$[fade 🍮] $[fade.out 🍮] $[fade.speed=5s 🍮]');
 
 definePageMetadata({
 	title: i18n.ts._mfm.cheatSheet,

From a4f075271f741dc402589c65719a2458a5622eb4 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 15 May 2023 13:30:42 +1000
Subject: [PATCH 13/18] add fade to MFM options

---
 packages/client/src/components/mfm.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 7e3c143357..7275c66873 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -253,6 +253,16 @@ export default defineComponent({
 									style = `background-color: #${color};`;
 									break;
 								}
+								case "fade": {
+									const direction = token.props.args.out
+										? "alternate-reverse"
+										: "alternate";
+									const speed = validTime(token.props.args.speed) || "1.5s";
+									style =
+										this.$store.state.animatedMfm && !reducedMotion()
+											? `animation: mfm-fade ${speed} linear infinite; animation-direction: ${direction};`
+											: "";
+								}
 							}
 							if (style == null) {
 								return h("span", {}, [

From 5ee098e51f94da90f7e6baa5b8d1125ed967cc88 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 22 May 2023 07:55:45 +1000
Subject: [PATCH 14/18] remove autogenerated translations

---
 locales/ar-SA.yml | 2 --
 locales/bn-BD.yml | 2 --
 locales/cs-CZ.yml | 1 -
 locales/es-ES.yml | 2 --
 locales/id-ID.yml | 2 --
 locales/ja-JP.yml | 2 --
 locales/ko-KR.yml | 2 --
 locales/pl-PL.yml | 2 --
 locales/sk-SK.yml | 2 --
 locales/th-TH.yml | 2 --
 locales/uk-UA.yml | 2 --
 locales/vi-VN.yml | 2 --
 locales/zh-CN.yml | 2 --
 locales/zh-TW.yml | 2 --
 14 files changed, 27 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index f2bc4476dd..148cd32a04 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -919,8 +919,6 @@ _mfm:
   rainbowDescription: "اجعل المحتوى يظهر بألوان الطيف"
   rotate: "تدوير"
   rotateDescription: "يُدير المحتوى بزاوية معيّنة."
-  fade: "يختفي"
-  fadeDescription: "يتلاشى المحتوى للداخل والخارج."
 _instanceTicker:
   none: "لا تظهره بتاتًا"
   remote: "أظهر للمستخدمين البِعاد"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index a9428eea5f..cde425d7fd 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -974,8 +974,6 @@ _mfm:
   sparkleDescription: "বিষয়বস্তুকে একটি চিকচিকে কণা প্রভাব দেয়।"
   rotate: "ঘুরান"
   rotateDescription: "বিষয়বস্তুকে একটি নির্দিষ্ট কোনে ঘুরায়।"
-  fade: "বিবর্ণ"
-  fadeDescription: "ভিতরে এবং বাইরে বিষয়বস্তু বিবর্ণ।"
 _instanceTicker:
   none: "দেখাবেন না"
   remote: "রিমোট ব্যাবহারকারীদের জন্য দেখান"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 70d56b66d3..1d12e69aba 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -663,7 +663,6 @@ _mfm:
   blur: "Rozmazání"
   font: "Font"
   rainbow: "Duha"
-  fade: "Slábnout"
 _channel:
   featured: "Trendy"
 _menuDisplay:
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index de2b145054..49f51bff6e 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1151,8 +1151,6 @@ _mfm:
   sparkleDescription: "Aplica un efecto de partículas parpadeantes"
   rotate: "Rotar"
   rotateDescription: "Rota el contenido a un ángulo especificado."
-  fade: "Desvanecerse"
-  fadeDescription: "Desvanece el contenido hacia adentro y hacia afuera."
   plain: "Plano"
   plainDescription: "Desactiva los efectos de todo el contenido MFM con este efecto\
     \ MFM."
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index edb9feace7..4caca44399 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -1074,8 +1074,6 @@ _mfm:
   sparkleDescription: "Memberikan konten efek partikel kelap-kelip."
   rotate: "Putar"
   rotateDescription: "Putar konten sesuai sudut yang ditentukan."
-  fade: "Memudar"
-  fadeDescription: "Memudar konten masuk dan keluar."
 _instanceTicker:
   none: "Jangan tampilkan"
   remote: "Tampilkan untuk pengguna luar"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 70854e42cd..84c894c7a8 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1128,8 +1128,6 @@ _mfm:
   sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
   rotate: "回転"
   rotateDescription: "指定した角度で回転させます。"
-  fade: "フェード"
-  fadeDescription: "コンテンツをフェードインおよびフェードアウトします。"
   plain: "プレーン"
   plainDescription: "内側の構文を全て無効にします。"
   position: 位置
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 0a5fa26d9e..15e776faf0 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1042,8 +1042,6 @@ _mfm:
   sparkleDescription: "반짝이는 파티클 효과를 추가합니다."
   rotate: "회전"
   rotateDescription: "지정한 각도로 회전시킵니다."
-  fade: "바래다"
-  fadeDescription: "콘텐츠를 페이드 인 및 페이드 아웃합니다."
   plain: "평문"
   plainDescription: "안에 있는 MFM 구문을 모두 무시하고 평문으로 표시합니다."
 _instanceTicker:
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 8ab065384b..c127c5a525 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1069,8 +1069,6 @@ _mfm:
   sparkleDescription: "Nadaje zawartości efekt lśniącego brokatu."
   rotate: "Obrót"
   rotateDescription: "Obraca zawartość o określony kąt."
-  fade: "Znikać"
-  fadeDescription: "Pojawia się i znika zawartość."
   plain: "Zwyczajny"
   plainDescription: "Wyłącza efekty wszystkich MFM zawartych w tym efekcie MFM."
   inlineCodeDescription: Wyświetla podświetlanie składni dla kodu (programu) w linii.
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index 51776c22a1..a36caf1fd0 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1038,8 +1038,6 @@ _mfm:
   sparkleDescription: "Obsahu dodá trblietajúci efekt."
   rotate: "Otáčať"
   rotateDescription: "Otočí obsah o určitý uhol."
-  fade: "Vyblednúť"
-  fadeDescription: "Mizne obsah dovnútra a von."
   plain: "Obyčajné"
   plainDescription: "Bez akejkoľvej syntaxe"
 _instanceTicker:
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 43e098319a..b6d81d8f53 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1043,8 +1043,6 @@ _mfm:
   sparkleDescription: "ให้เนื้อหานั้นมีเอฟเฟกต์แบบอนุภาคประกาย"
   rotate: "หมุนหน้าจอ"
   rotateDescription: "เปลี่ยนเนื้อหาตามด้วยมุมที่ระบุไว้"
-  fade: "เลือนหายไป"
-  fadeDescription: "เลือนเนื้อหาเข้าและออก"
   plain: "เรียบง่าย"
   plainDescription: "ปิดการใช้งานเอฟเฟกต์ของ MFM ทั้งหมดที่มีอยู่ในเอฟเฟกต์ MFM นี้"
 _instanceTicker:
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index f4b57f9872..0368a0897e 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -824,8 +824,6 @@ _mfm:
   font: "Шрифт"
   fontDescription: "Встановлює шрифт для контенту."
   rotate: "Обертати"
-  fade: "Зникати"
-  fadeDescription: "Розмиває вміст."
 _instanceTicker:
   none: "Не відображати"
   remote: "Відображати для віддалених користувачів"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index fdf69b722e..7662af4095 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1043,8 +1043,6 @@ _mfm:
   sparkleDescription: "Làm cho nội dung hiệu ứng hạt lấp lánh."
   rotate: "Xoay"
   rotateDescription: "Xoay nội dung theo một góc cụ thể."
-  fade: "Phai màu"
-  fadeDescription: "Làm mờ dần nội dung trong và ngoài."
   plain: "Đơn giản"
   plainDescription: "Vô hiệu hóa mọi hiệu ứng MFM chứa trong hiệu ứng MFM này."
 _instanceTicker:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index b2af679bb1..8ca19e5969 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1050,8 +1050,6 @@ _mfm:
   sparkleDescription: "添加发光粒子效果。"
   rotate: "旋转"
   rotateDescription: "旋转指定的角度。"
-  fade: "褪色"
-  fadeDescription: "淡入和淡出内容。"
   plain: "简洁"
   plainDescription: "禁用所有内部语法。"
 _instanceTicker:
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index c33c3f3023..fd5117f48c 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1052,8 +1052,6 @@ _mfm:
   sparkleDescription: "添加閃閃發光的粒子效果。"
   rotate: "旋轉"
   rotateDescription: "以指定的角度旋轉。"
-  fade: "褪色"
-  fadeDescription: "淡入和淡出內容。"
   plain: "簡潔"
   plainDescription: "停用全部的內部語法。"
   play: 播放 MFM

From 45a8b9831e33919df35c1864ff2bd1c4c34a6f42 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Tue, 23 May 2023 07:05:43 +1000
Subject: [PATCH 15/18] clean up rebase

---
 README.md                                     | 15 +++++++++++++--
 packages/client/src/pages/mfm-cheat-sheet.vue | 14 ++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index b8fd09b770..79bd8f86cb 100644
--- a/README.md
+++ b/README.md
@@ -83,11 +83,14 @@ If you have access to a server that supports one of the sources below, I recomme
 - Web Proxy (one of the following)
   - 🍀 Nginx (recommended)
   - 🪶 Apache
+  - 🦦 Caddy
 
 ### 😗 Optional dependencies
 
 - [FFmpeg](https://ffmpeg.org/) for video transcoding
-- [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search
+- Full text search (one of the following)
+  - 🦔 [Sonic](https://crates.io/crates/sonic-server) (recommended)
+  - [ElasticSearch](https://www.elastic.co/elasticsearch/)
 
 ### 🏗️ Build dependencies
 
@@ -181,7 +184,15 @@ For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](
 - Run `sudo a2ensite calckey.apache` to enable the site
 - Run `sudo service apache2 restart` to reload apache2 configuration
 
-</details>
+### 🦦 Caddy
+
+- Add the following block to your `Caddyfile`, replacing `example.tld` with your own domain:
+```caddy
+example.tld {
+    reverse_proxy http://127.0.0.1:3000
+}
+```
+- Reload your caddy configuration
 
 ## 🚀 Build and launch!
 
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index ea35a6210c..5492a37223 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -416,19 +416,9 @@
 					<div class="content">
 						<p>{{ i18n.ts._mfm.plainDescription }}</p>
 						<div class="preview">
-							<Mfm :text="preview_plain" />
-							<MkTextarea v-model="preview_plain"
-								><span>MFM</span></MkTextarea
-							>
+							<Mfm :text="preview_plain"/>
+							<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
 						</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.plain }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.plainDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_plain"/>
-						<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
 					</div>
 				</div>
 			</div>

From ccfdf9564264aaba248d1496e3556509cdbb354f Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Mon, 22 May 2023 17:11:58 +0000
Subject: [PATCH 16/18] chore: Translated using Weblate (Catalan)

Currently translated at 100.0% (1748 of 1748 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
---
 locales/ca-ES.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index de8246be39..91cccb5eeb 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1290,7 +1290,7 @@ loadRawImages: Carregar les imatges originals en comptes de mostrar les miniatur
 noteFavoritesCount: Nombre de notes afegides a favorits
 useSystemFont: Fes servir la font per defecte del sistema
 contact: Contacte
-clips: Clips
+clips: Retalls
 experimentalFeatures: Característiques experimentals
 developer: Desenvolupador
 makeExplorableDescription: Si desactives aquesta funció el teu compte no sortirà a
@@ -1496,7 +1496,7 @@ gallery: Galeria
 popularPosts: Pàgines populars
 shareWithNote: Comparteix amb una publicació
 expiration: Data límit
-memo: Memo
+memo: Recordatori
 priority: Prioritat
 high: Alta
 middle: Mitjana
@@ -1537,7 +1537,7 @@ incorrectPassword: Contrasenya incorrecta.
 clickToFinishEmailVerification: Feu clic a [{ok}] per completar la verificació del
   correu electrònic.
 overridedDeviceKind: Tipus de dispositiu
-smartphone: Smartphone
+smartphone: Telèfon intel·ligent
 tablet: Tauleta
 auto: Automàtic
 recentNHours: Últimes {n} hores
@@ -1625,7 +1625,7 @@ customKaTeXMacroDescription: "Configura macros per escriure expressions matemàt
 objectStorageRegion: Regió
 objectStoragePrefix: Prefix
 objectStoragePrefixDesc: Els fitxers es guardaran dins de carpetes amb aquest prefix.
-objectStorageEndpoint: Endpoint
+objectStorageEndpoint: Extrem
 newNoteRecived: Hi han notes noves
 sounds: Sons
 listen: Escoltar
@@ -1748,7 +1748,7 @@ reverse: Revés
 objectStorageBucket: Cubell
 objectStorageBucketDesc: Si us plau específica el nom del cubell que faràs servir
   al teu proveïdor.
-clip: Clip
+clip: Retall
 createNew: Crear una nova
 optional: Opcional
 jumpToSpecifiedDate: Vés a una data concreta
@@ -2059,3 +2059,4 @@ older: Més antic
 silencedWarning: S'està mostrant aquesta pàgina per què aquest usuari és d'un servidor
   que l'administrador a silenciat, així que pot ser spam.
 jumpToPrevious: Vés a l'anterior
+cw: Avís de contingut

From f27611b00b97aa7a7ebd3e02230dba1117cf193c Mon Sep 17 00:00:00 2001
From: Richard <galmt@protonmail.com>
Date: Mon, 22 May 2023 17:36:30 +0000
Subject: [PATCH 17/18] chore: Translated using Weblate (Dutch)

Currently translated at 25.0% (438 of 1748 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
---
 locales/nl-NL.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index cea1d5f70f..6837f1e864 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -13,7 +13,7 @@ password: "Wachtwoord"
 forgotPassword: "Wachtwoord vergeten"
 fetchingAsApObject: "Ophalen vanuit de Fediverse"
 ok: "Ok"
-gotIt: "Begrepen"
+gotIt: "Begrepen!"
 cancel: "Annuleren"
 enterUsername: "Voer een gebruikersnaam in"
 renotedBy: "Hergedeeld door {user}"
@@ -51,8 +51,8 @@ deleteAndEditConfirm: "Weet je zeker dat je deze post wilt verwijderen en dan be
   Je verliest alle reacties, boosts en antwoorden erop."
 addToList: "Aan lijst toevoegen"
 sendMessage: "Verstuur bericht"
-copyUsername: "Kopiëren gebruikersnaam "
-searchUser: "Zoeken een gebruiker"
+copyUsername: "Gebruikersnaam kopiëren"
+searchUser: "Zoek een gebruiker"
 reply: "Antwoord"
 loadMore: "Laad meer"
 showMore: "Toon meer"
@@ -517,3 +517,5 @@ withFileAntenna: Alleen posts met bestanden
 enableServiceworker: Schakel pushmeldingen voor je browser in
 renoteUnmute: Ontdemp boosts
 jumpToPrevious: Spring naar vorige
+caseSensitive: Hoofdlettergevoelig
+cw: Inhoudswaarschuwing

From afaf22ee23421a7efe420c9e832ba5d06e60ce7f Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 22 May 2023 19:40:38 -0400
Subject: [PATCH 18/18] padding fix

---
 packages/client/src/components/MkNoteDetailed.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 9f311a979f..e716f7860b 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -518,7 +518,7 @@ onUnmounted(() => {
 			cursor: unset;
 			padding-bottom: 0;
 		}
-		&:first-of-type {
+		&:first-child {
 			padding-top: 28px;
 		}
 	}