From 8f391a87ac7d313465843927463ff78434f96746 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 2 Feb 2023 19:25:42 -0500
Subject: [PATCH 1/3] Fix status buttons text wrapping in webkit

---
 packages/client/src/components/MkNote.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 79b774385..f7bfed650 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -605,6 +605,7 @@ function readPromo() {
 					opacity: 0.7;
 					flex-grow: 1;
 					max-width: 3.5em;
+					width: max-content;
 					min-width: max-content;
 					&:first-of-type {
 						margin-left: -.5em;

From 7e4325f10b2daf7a4c81d8f3021e4de63190d1b9 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 3 Feb 2023 15:44:40 -0500
Subject: [PATCH 2/3] Change note context position

---
 packages/client/src/components/MkNote.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index f7bfed650..e69e29280 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -381,8 +381,7 @@ function readPromo() {
 		}
 		
 		> div > i {
-			position: absolute;
-			right: 100%;
+			margin-left: -.5px;
 		}
 		> .info {
 			display: flex;
@@ -638,11 +637,15 @@ function readPromo() {
 
 	&.max-width_450px {
 		--avatarSize: 46px;
+		padding-top: 6px;
 		> .note-context {
 			padding-inline: 16px;
 			margin-top: 0;
 			> :not(.line) {
-				margin-top: 10px;
+				margin-top: 5px;
+			}
+			> .line {
+				margin-right: 10px;
 			}
 		}
 		> .article {

From 32ab681714bd22bb9d5fe2a8b67eb0a5e6ccd888 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 5 Feb 2023 20:26:38 -0500
Subject: [PATCH 3/3] Allow interacting with subnote w/out opening post

---
 packages/client/src/components/MkCwButton.vue       | 2 +-
 packages/client/src/components/MkMediaList.vue      | 2 +-
 packages/client/src/components/MkNote.vue           | 4 ++--
 packages/client/src/components/MkSubNoteContent.vue | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 91ba95076..4e38b16b0 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -1,5 +1,5 @@
 <template>
-<button class="nrvgflfu _button" @click="toggle">
+<button class="nrvgflfu _button" @click.stop.prevent="toggle">
 	<b>{{ modelValue ? i18n.ts._cw.hide : i18n.ts._cw.show }}</b>
 	<span v-if="!modelValue">{{ label }}</span>
 </button>
diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue
index b721fe2e8..6cc12c9df 100644
--- a/packages/client/src/components/MkMediaList.vue
+++ b/packages/client/src/components/MkMediaList.vue
@@ -2,7 +2,7 @@
 <div class="hoawjimk">
 	<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
 	<div v-if="mediaList.filter(media => previewable(media)).length > 0" class="gird-container" :class="{ dmWidth: inDm }">
-		<div ref="gallery" :data-count="mediaList.filter(media => previewable(media)).length">
+		<div ref="gallery" :data-count="mediaList.filter(media => previewable(media)).length" @click.stop.prevent>
 			<template v-for="media in mediaList.filter(media => previewable(media))">
 				<XVideo v-if="media.type.startsWith('video')" :key="media.id" :video="media"/>
 				<XImage v-else-if="media.type.startsWith('image')" :key="media.id" class="image" :data-id="media.id" :image="media" :raw="raw"/>
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index e69e29280..ee6c5770f 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -62,10 +62,10 @@
 					<XPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" class="poll"/>
 					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
 					<div v-if="appearNote.renote" class="renote"><XNoteSimple :note="appearNote.renote"/></div>
-					<button v-if="isLong && collapsed" class="fade _button" @click="collapsed = false">
+					<button v-if="isLong && collapsed" class="fade _button" @click.stop.prevent="collapsed = false">
 						<span>{{ i18n.ts.showMore }}</span>
 					</button>
-					<button v-else-if="isLong && !collapsed" class="showLess _button" @click="collapsed = true">
+					<button v-else-if="isLong && !collapsed" class="showLess _button" @click.stop.prevent="collapsed = true">
 						<span>{{ i18n.ts.showLess }}</span>
 					</button>
 				</div>
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index aab736053..b575fcc0a 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -14,10 +14,10 @@
 		<summary>{{ i18n.ts.poll }}</summary>
 		<XPoll :note="note"/>
 	</div>
-	<button v-if="isLong && collapsed" class="fade _button" @click="collapsed = false">
+	<button v-if="isLong && collapsed" class="fade _button" @click.stop.prevent="collapsed = false">
 		<span>{{ i18n.ts.showMore }}</span>
 	</button>
-	<button v-if="isLong && !collapsed" class="showLess _button" @click="collapsed = true">
+	<button v-if="isLong && !collapsed" class="showLess _button" @click.stop.prevent="collapsed = true">
 		<span>{{ i18n.ts.showLess }}</span>
 	</button>
 </div>