From afa27d4811c33a5638872fc46427b113a3f815ad Mon Sep 17 00:00:00 2001
From: Jeder <jeder+git@jeder.pl>
Date: Mon, 28 Aug 2023 16:46:03 +0200
Subject: [PATCH] Change position of "Expand all CWs" button

---
 .../client/src/components/MkFollowButton.vue  |  8 ++-----
 .../src/components/global/MkPageHeader.vue    | 22 +++++++++----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index 9244a7271..ec75fcab9 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -1,7 +1,7 @@
 <template>
 	<button
 		v-if="!hideMenu"
-		class="menu _button"
+		class="_buttonIcon _button"
 		@click.stop="menu"
 		v-tooltip="i18n.ts.menu"
 	>
@@ -181,11 +181,6 @@ onBeforeUnmount(() => {
 </script>
 
 <style lang="scss" scoped>
-.menu {
-	width: 3em;
-	height: 2em;
-	vertical-align: middle;
-}
 .follow-button {
 	position: relative;
 	display: inline-flex;
@@ -201,6 +196,7 @@ onBeforeUnmount(() => {
 	border-radius: 100px;
 	background: var(--bg);
 	vertical-align: middle;
+	margin-left: 0.5em;
 
 	&.full {
 		padding: 0.2em 0.7em;
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index adf899497..d1165d27a 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -91,6 +91,17 @@
 			</nav>
 		</template>
 		<div class="buttons right">
+			<template v-for="action in actions">
+				<button
+					v-tooltip.noDelay="action.text"
+					class="_buttonIcon _button"
+					:class="{ highlighted: action.highlighted }"
+					@click.stop="action.handler"
+					@touchstart="preventDrag"
+				>
+					<i :class="action.icon"></i>
+				</button>
+			</template>
 			<template v-if="metadata && metadata.avatar">
 				<MkFollowButton
 					v-if="narrow"
@@ -105,17 +116,6 @@
 					class="fullButton"
 				></MkFollowButton>
 			</template>
-			<template v-for="action in actions">
-				<button
-					v-tooltip.noDelay="action.text"
-					class="_buttonIcon button"
-					:class="{ highlighted: action.highlighted }"
-					@click.stop="action.handler"
-					@touchstart="preventDrag"
-				>
-					<i :class="action.icon"></i>
-				</button>
-			</template>
 		</div>
 	</header>
 </template>