From 7ed1cc1ff78b82e8c07fcb4f7be15d38d20e34e2 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 21 Jun 2023 14:22:04 -0400
Subject: [PATCH] i apologize to all the cats that may have been harmed before
 this commit (#10342)

---
 packages/client/src/components/MkNote.vue     |  8 ++++++--
 .../src/components/MkSubNoteContent.vue       | 20 +++++++------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 7f69117cb..fbcb1a099 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -630,9 +630,10 @@ defineExpose({
 
 	.note-context {
 		position: relative;
-		z-index: 2;
 		padding: 0 32px 0 32px;
 		display: flex;
+		background: var(--panel);
+		z-index: 1;
 		&:first-child {
 			margin-top: 20px;
 		}
@@ -716,7 +717,8 @@ defineExpose({
 	> .article {
 		position: relative;
 		overflow: clip;
-		padding: 4px 32px 10px;
+		padding: 20px 32px 10px;
+		margin-top: -16px;
 
 		&:first-child,
 		&:nth-child(2) {
@@ -730,6 +732,8 @@ defineExpose({
 
 		.header-container {
 			display: flex;
+			position: relative;
+			z-index: 2;
 			> .avatar {
 				flex-shrink: 0;
 				display: block;
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index ab9c0a366..4065ba8dd 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -210,19 +210,13 @@ const emit = defineEmits<{
 const cwButton = ref<HTMLElement>();
 const showMoreButton = ref<HTMLElement>();
 
-const isLong = !props.detailedView && props.note.cw == null &&
-	(
-		(
-			props.note.text != null &&
-			(
-				props.note.text.split("\n").length > 10 ||
-				props.note.text.length > 800
-			)
-		) ||
-		props.note.files.length > 4
-	)
-;
-
+const isLong =
+	!props.detailedView &&
+	props.note.cw == null &&
+	((props.note.text != null &&
+		(props.note.text.split("\n").length > 10 ||
+			props.note.text.length > 800)) ||
+		props.note.files.length > 4);
 const collapsed = $ref(props.note.cw == null && isLong);
 
 const urls = props.note.text