From 3fa061a0eb05436e73b376ff618718d12a9f1f9f Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Thu, 26 Oct 2023 04:57:43 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=ED=97=A4=EB=8D=94=EC=9D=98=20?=
 =?UTF-8?q?=EC=95=A1=EC=85=98=20=ED=95=AD=EB=AA=A9=EC=9D=B4=20=EC=97=AC?=
 =?UTF-8?q?=EB=9F=AC=20=EA=B0=9C=20=EC=9D=BC=20=EB=95=8C=20=EC=99=BC?=
 =?UTF-8?q?=EC=AA=BD=EC=9C=BC=EB=A1=9C=20=ED=83=80=EC=9D=B4=ED=8B=80?=
 =?UTF-8?q?=EC=9D=B4=20=EC=B9=98=EC=9A=B0=EC=B9=98=EB=8A=94=20=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                                  | 1 +
 packages/frontend/src/components/global/CPPageHeader.vue | 1 +
 packages/frontend/src/components/global/MkPageHeader.vue | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index ea05ad7103..99dfb3f100 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -44,6 +44,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE
 - Fix: 외부 리소스 설치 페이지에서 페이지 캐시가 작동하는 문제 수정 (misskey-dev/misskey#12105)
 - Fix: 채널 생성/업데이트 시 실패하면 아무 것도 표시되지 않는 문제 수정 misskey-dev/misskey#11983 (misskey-dev/misskey#12142)
 - Fix: 유저 페이지의 미디어 타임라인에서 미디어가 없는 답글이 표시됨 #388
+- Fix: 헤더의 액션 항목이 여러 개 일 때 왼쪽으로 타이틀이 치우치는 문제
 
 ### Server
 - Feat: 연합에서 노트 수정이 반영됨 (libnare/cp-castella#1)
diff --git a/packages/frontend/src/components/global/CPPageHeader.vue b/packages/frontend/src/components/global/CPPageHeader.vue
index b7539d56ee..efcb84b009 100644
--- a/packages/frontend/src/components/global/CPPageHeader.vue
+++ b/packages/frontend/src/components/global/CPPageHeader.vue
@@ -13,6 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</div>
 	<div v-else-if="!thin_ && narrow && !hideTitle && canBack" :class="$style.buttonsLeft"/>
 	<div v-else-if="!thin_ && canBack && (actions && actions.length > 0)" :class="$style.buttonsLeft"/>
+	<div v-if="!thin_ && canBack && (actions && actions.length === 2 && ['index', 'my-notifications', 'messaging'].includes(<string>mainRouter.currentRoute.value.name))" :class="$style.buttonsLeft"/>
 
 	<template v-if="metadata">
 		<div v-if="!hideTitle" :class="[$style.titleContainer, { [$style.titleContainer_canBack]: !canBack }]">
diff --git a/packages/frontend/src/components/global/MkPageHeader.vue b/packages/frontend/src/components/global/MkPageHeader.vue
index b7dcb84658..7fb10218da 100644
--- a/packages/frontend/src/components/global/MkPageHeader.vue
+++ b/packages/frontend/src/components/global/MkPageHeader.vue
@@ -14,6 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 		<div v-else-if="!thin_ && narrow && !hideTitle && canBack" :class="$style.buttonsLeft"/>
 		<div v-else-if="!thin_ && canBack && (actions && actions.length > 0)" :class="$style.buttonsLeft"/>
+		<div v-if="!thin_ && canBack && (actions && actions.length === 2 && ['index', 'my-notifications', 'messaging'].includes(<string>mainRouter.currentRoute.value.name))" :class="$style.buttonsLeft"/>
 
 		<template v-if="metadata">
 			<div v-if="!hideTitle" :class="[$style.titleContainer, { [$style.titleContainer_canBack]: !canBack }]" @click="top">