From 88bf3e58e8d883ea1d8b24bd88cca1561716b786 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Sat, 23 Dec 2023 00:49:11 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=EC=9D=BC=EB=B6=80=20=ED=99=98?=
 =?UTF-8?q?=EA=B2=BD=EC=97=90=EC=84=9C=20=ED=8A=B9=EC=A0=95=20=EC=98=81?=
 =?UTF-8?q?=EC=97=AD=EC=97=90=20=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EB=B0=94?=
 =?UTF-8?q?=EA=B0=80=20=ED=91=9C=EC=8B=9C=EB=90=A0=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                               | 1 +
 packages/frontend/src/components/MkInstanceTicker.vue | 2 +-
 packages/frontend/src/components/MkNoteDetailed.vue   | 4 ++--
 packages/frontend/src/components/MkNoteHeader.vue     | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 573998c9c5..8f5c5e7743 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -74,6 +74,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE
 - Fix: 내 프로필에서 간헐적으로 헤더에 MkFollowButton 컴포넌트가 표시될 수 있음
 - Fix: 다이렉트 노트를 리노트 할 수 있음
 - Fix: 이모지를 변경할 때 이모지가 ❤️로 고정될 수 있음
+- Fix: 일부 환경에서 특정 영역에 스크롤 바가 표시될 수 있음
 
 ### Server
 - Enhance: (dev) 개발 모드에서 locale 및 유형 정의가 자동으로 재생성됨 (misskey-dev/misskey#12481)
diff --git a/packages/frontend/src/components/MkInstanceTicker.vue b/packages/frontend/src/components/MkInstanceTicker.vue
index 6c79fa9db3..2ec5815dbb 100644
--- a/packages/frontend/src/components/MkInstanceTicker.vue
+++ b/packages/frontend/src/components/MkInstanceTicker.vue
@@ -77,7 +77,7 @@ $height: 2ex;
 	font-size: 0.9em;
 	font-weight: bold;
 	white-space: nowrap;
-	overflow: scroll;
+	overflow: hidden;
   overflow-wrap: anywhere;
   max-width: 300px;
   text-overflow: ellipsis;
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 9747c16284..99a81eda97 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -805,7 +805,7 @@ onMounted(() => {
 	font-weight: bold;
 	line-height: 1.3;
 	margin: 0 .5em 0 0;
-  overflow: scroll;
+  overflow: hidden;
   overflow-wrap: anywhere;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -839,7 +839,7 @@ onMounted(() => {
 	margin-bottom: 2px;
 	line-height: 1.3;
 	word-wrap: anywhere;
-  overflow: scroll;
+  overflow: hidden;
   overflow-wrap: anywhere;
   text-overflow: ellipsis;
   white-space: nowrap;
diff --git a/packages/frontend/src/components/MkNoteHeader.vue b/packages/frontend/src/components/MkNoteHeader.vue
index 0b944a6893..43ef3382e7 100644
--- a/packages/frontend/src/components/MkNoteHeader.vue
+++ b/packages/frontend/src/components/MkNoteHeader.vue
@@ -99,7 +99,7 @@ function showOnRemote() {
 	display: block;
 	margin: 0 .5em 0 0;
 	padding: 0;
-	overflow: scroll;
+	overflow: hidden;
   overflow-wrap: anywhere;
 	font-size: 1em;
 	font-weight: bold;
@@ -130,7 +130,7 @@ function showOnRemote() {
 .username {
 	flex-shrink: 9999999;
 	margin: 0 .5em 0 0;
-	overflow: scroll;
+	overflow: hidden;
 	text-overflow: ellipsis;
 	font-size: .95em;
   max-width: 300px;