From d66f2b62c7bf7405192cd81d34d30f47800d4016 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Mon, 12 Jun 2023 01:14:26 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3?=
 =?UTF-8?q?=E3=82=92=E5=9B=9B=E8=A7=92=E5=BD=A2=E3=81=AB=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E9=9A=9B=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=9D?=
 =?UTF-8?q?=E3=83=83=E3=83=97=E3=82=A2=E3=83=83=E3=83=97=E3=81=AE=E3=83=87?=
 =?UTF-8?q?=E3=82=B6=E3=82=A4=E3=83=B3=E6=94=B9=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                          | 1 +
 packages/frontend/src/components/MkUserPopup.vue | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index e2139196b0..be65cf1626 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -61,6 +61,7 @@
 - Fix: 네트워크 트래픽이 10MB/s를 초과하면 네트워크 통계 위젯의 그래프가 잘못 출력되는 문제
 - Fix: iOS 기기에서 채팅 입력란이 채팅을 가리는 문제
 - Fix: 특정 MFM 구문이 포함된 노트 간략화 옵션 비활성화 시, MFM 구문에 대해서는 더보기 버튼을 표시하지 않도록
+- Fix: 프로필 아이콘을 사각형으로 설정했을 때 유저 팝업의 디자인 개선
 
 ### Server
 - mfm-js를 cherrypick-mfm-js로 변경
diff --git a/packages/frontend/src/components/MkUserPopup.vue b/packages/frontend/src/components/MkUserPopup.vue
index 69575b4389..64f07b8998 100644
--- a/packages/frontend/src/components/MkUserPopup.vue
+++ b/packages/frontend/src/components/MkUserPopup.vue
@@ -11,7 +11,7 @@
 			<div :class="$style.banner" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl})` : ''">
 				<span v-if="$i && $i.id != user.id && user.isFollowed" :class="$style.followed">{{ i18n.ts.followsYou }}</span>
 			</div>
-			<svg viewBox="0 0 128 128" :class="$style.avatarBack">
+			<svg v-if="!defaultStore.state.squareAvatars" viewBox="0 0 128 128" :class="$style.avatarBack">
 				<g transform="matrix(1.6,0,0,1.6,-38.4,-51.2)">
 					<path d="M64,32C81.661,32 96,46.339 96,64C95.891,72.184 104,72 104,72C104,72 74.096,80 64,80C52.755,80 24,72 24,72C24,72 31.854,72.018 32,64C32,46.339 46.339,32 64,32Z" style="fill: var(--popup);"/>
 				</g>
@@ -177,6 +177,7 @@ onMounted(() => {
 	z-index: 2;
 	width: 58px;
 	height: 58px;
+	background: var(--panel);
 }
 
 .title {