From 3ee432819a5a511dfe28598131cc972e882e492d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 18 Nov 2022 17:54:50 -0800
Subject: [PATCH] fix

---
 package.json                       |  2 +-
 packages/client/src/pages/page.vue | 54 ++++++++++++++----------------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index 20089fdc5d..a8f074d495 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.15-beta.4",
+	"version": "12.119.0-calc.15-beta.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue
index f2177b8154..4ef081ed31 100644
--- a/packages/client/src/pages/page.vue
+++ b/packages/client/src/pages/page.vue
@@ -25,14 +25,14 @@
 							<button v-tooltip="i18n.ts.shareWithNote" v-click-anime class="_button" @click="shareWithNote"><i class="ph-repeat-bold ph-lg ph-fw ph-lg"></i></button>
 							<button v-tooltip="i18n.ts.share" v-click-anime class="_button" @click="share"><i class="ph-share-network-bold ph-lg ph-fw ph-lg"></i></button>
 						</div>
-					</div>
-					<div class="user">
-						<div class="name">
-							<MkAvatar :user="page.user" class="avatar"/>
-							<MkUserName :user="page.user" style="display: block;"/>
-							<MkAcct :user="page.user"/>
+						<div class="user">
+							<div class="name">
+								<MkAvatar :user="page.user" class="avatar"/>
+								<MkUserName :user="page.user" style="display: block;"/>
+								<MkAcct :user="page.user"/>
+							</div>
+							<MkFollowButton v-if="!$i || $i.id != page.user.id" :user="page.user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
 						</div>
-						<MkFollowButton v-if="!$i || $i.id != page.user.id" :user="page.user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
 					</div>
 					<div class="links">
 						<MkA :to="`/@${username}/pages/${pageName}/view-source`" class="link">{{ i18n.ts._pages.viewSource }}</MkA>
@@ -226,8 +226,6 @@ definePageMetadata(computed(() => page ? {
 			}
 
 			> .other {
-				margin-left: auto;
-
 				> button {
 					padding: 8px;
 					margin: 0 8px;
@@ -237,27 +235,27 @@ definePageMetadata(computed(() => page ? {
 					}
 				}
 			}
-		}
 
-		> .user {
-			margin-left: auto;
-			padding: 16px 0 0 0;
-			border-top: solid 0.5px var(--divider);
-			display: flex;
-			align-items: center;
-
-			> .avatar {
-				width: 52px;
-				height: 52px;
-			}
-
-			> .name {
-				margin: 0 0 0 12px;
-				font-size: 90%;
-			}
-
-			> .koudoku {
+			> .user {
 				margin-left: auto;
+				padding: 16px 0 0 0;
+				border-top: solid 0.5px var(--divider);
+				display: flex;
+				align-items: center;
+
+				> .avatar {
+					width: 52px;
+					height: 52px;
+				}
+
+				> .name {
+					margin: 0 0 0 12px;
+					font-size: 90%;
+				}
+
+				> .koudoku {
+					margin-left: auto;
+				}
 			}
 		}