From 04b701f08404bbb98ad2c3760524aaa47db3496f Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 28 Jan 2023 16:10:45 -0500
Subject: [PATCH] Padding & alignment improvements

---
 packages/client/src/components/MkNote.vue     |  4 ++--
 .../client/src/components/MkNoteDetailed.vue  |  6 +----
 packages/client/src/components/MkNoteSub.vue  | 23 +++++++++++++------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 84d9502a7..6c631272a 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -351,7 +351,7 @@ function readPromo() {
 			.line::before {
 				content: "";
 				display: block;
-				margin-bottom: -15px;
+				margin-bottom: -10px;
 				width: 2px;
 				background-color: var(--accentDarken);
 				margin-inline: auto;
@@ -442,7 +442,7 @@ function readPromo() {
 		}
 
 		& + .article {
-			padding-top: 10px;
+			padding-top: 10px !important;
 		}
 
 	}
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index cf4e9120f..dd6187d7e 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -336,7 +336,6 @@ if (appearNote.replyId) {
 	&:hover > .article > .main > .footer > .button {
 		opacity: 1;
 	}
-
 	> .reply-to {
 		margin-bottom: -16px;
 	}
@@ -344,9 +343,6 @@ if (appearNote.replyId) {
 	> .reply-to-more {
 		// opacity: 0.7;
 		cursor: pointer;
-		&:first-child {
-			padding-top: 30px;
-		}
 
 		@media (pointer: coarse) {
 			cursor: default;
@@ -562,7 +558,7 @@ if (appearNote.replyId) {
 
 	> .reply, .reply-to, .reply-to-more {
 		transition: background-color 0.25s ease-in-out;
-
+		
 		&:hover {
 			background-color: var(--panelHighlight);
 		}
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index c71408004..437baeba3 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -89,7 +89,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 			flex: 1;
 			min-width: 0;
 			cursor: pointer;
-
 			@media (pointer: coarse) {
 				cursor: default;
 			}
@@ -131,10 +130,11 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 		padding: 10px 0 0 16px;
 	}
 
-	&.reply-to:first-child {
-		padding-top: 30px;
-	}
 	&.reply-to, &.reply-to-more {
+		padding-bottom: 0;
+		&:first-child {
+			padding-top: 30px;
+		}
 		.avatar-container {
 			display: flex;
 			flex-direction: column;
@@ -153,18 +153,27 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 				&::before {
 					content: "";
 					display: block;
-					margin-bottom: -30px;
 					width: 2px;
 					background-color: var(--accentDarken);
 					margin-inline: auto;
+					.note > & {
+						margin-bottom: -16px;
+					}
 				}
 			}
 		}
+		> .main > .body {
+			padding-bottom: 16px;
+		}
 	}
 
 	&.max-width_450px {
-		padding: 14px 16px !important;
-		margin-bottom: 0 !important;
+		padding: 14px 16px;
+		&.reply-to, &.reply-to-more {
+			padding-top: 14px !important;
+			padding-bottom: 0 !important;
+			margin-bottom: 0 !important;
+		}
 		> .main > .avatar-container {
 			margin-right: 10px;
 		}