From 74a28e166a2322b0934b0ebc72032ab4359ad616 Mon Sep 17 00:00:00 2001
From: Mattias Granlund <mtsgrd@gmail.com>
Date: Fri, 17 Nov 2023 15:31:50 +0100
Subject: [PATCH] Move settings and change vbranch label

---
 packages/ui/src/lib/components/Link.svelte            |  8 ++++----
 .../routes/[projectId]/navigation/DomainButton.svelte |  2 +-
 .../src/routes/[projectId]/navigation/Footer.svelte   | 11 +++++++----
 .../routes/[projectId]/navigation/Navigation.svelte   |  5 ++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/ui/src/lib/components/Link.svelte b/packages/ui/src/lib/components/Link.svelte
index 39df6c248..1bcb5c1fe 100644
--- a/packages/ui/src/lib/components/Link.svelte
+++ b/packages/ui/src/lib/components/Link.svelte
@@ -41,10 +41,10 @@
 		<div class="truncate">
 			<slot />
 		</div>
-		<div class="shrink-0">
-			{#if isExternal}
+		{#if isExternal}
+			<div class="shrink-0">
 				<IconExternalLink class="h-3.5 w-3.5" />
-			{/if}
-		</div>
+			</div>
+		{/if}
 	</a>
 {/if}
diff --git a/packages/ui/src/routes/[projectId]/navigation/DomainButton.svelte b/packages/ui/src/routes/[projectId]/navigation/DomainButton.svelte
index 759e460ee..b4e849161 100644
--- a/packages/ui/src/routes/[projectId]/navigation/DomainButton.svelte
+++ b/packages/ui/src/routes/[projectId]/navigation/DomainButton.svelte
@@ -9,7 +9,7 @@
 
 <a
 	{href}
-	class="mx-4 block rounded px-3 py-2 font-semibold"
+	class="mx-4 flex items-center gap-x-1 rounded px-3 py-2 font-semibold"
 	style:background-color={selected ? 'var(--bg-surface-highlight)' : undefined}
 >
 	<svelte:component this={icon} class="text-color-4 mr-1 inline h-4 w-4 align-middle" />
diff --git a/packages/ui/src/routes/[projectId]/navigation/Footer.svelte b/packages/ui/src/routes/[projectId]/navigation/Footer.svelte
index 4dcb3f766..a55d7117c 100644
--- a/packages/ui/src/routes/[projectId]/navigation/Footer.svelte
+++ b/packages/ui/src/routes/[projectId]/navigation/Footer.svelte
@@ -5,10 +5,12 @@
 	import Tooltip from '$lib/components/Tooltip.svelte';
 	import IconEmail from '$lib/icons/IconEmail.svelte';
 	import IconHome from '$lib/icons/IconHome.svelte';
+	import IconSettings from '$lib/icons/IconSettings.svelte';
 	import IconSpinner from '$lib/icons/IconSpinner.svelte';
 	import * as events from '$lib/utils/events';
 
 	export let user: User | undefined;
+	export let projectId: string | undefined;
 </script>
 
 <div
@@ -16,15 +18,16 @@
 	style:background-color="var(--bg-surface-highlight)"
 	style:border-color="var(--border-surface)"
 >
-	<div class="flex items-center">
-		<Link href="/" class="p-1">
-			<IconHome />
-		</Link>
+	<div class="flex items-center gap-x-1">
+		<Link href="/" class="p-1"><IconHome /></Link>
 		<Tooltip label="Send feedback">
 			<button class="p-1 align-middle" on:click={() => events.emit('openSendIssueModal')}>
 				<IconEmail class="align-top" />
 			</button>
 		</Tooltip>
+		<Link href={`/${projectId}/settings`} class="p-1">
+			<IconSettings />
+		</Link>
 		{#if $isLoading}
 			<Tooltip label={loadStack.join('\n')}>
 				<IconSpinner class="scale-75" />
diff --git a/packages/ui/src/routes/[projectId]/navigation/Navigation.svelte b/packages/ui/src/routes/[projectId]/navigation/Navigation.svelte
index b4c8f95dd..82f042d18 100644
--- a/packages/ui/src/routes/[projectId]/navigation/Navigation.svelte
+++ b/packages/ui/src/routes/[projectId]/navigation/Navigation.svelte
@@ -53,8 +53,7 @@
 		<BaseBranchCard {project} {baseBranchService} {branchController} {prService} />
 	</div>
 	<div class="mb-4">
-		<DomainButton href={`/${project.id}/board`} icon={IconBranch}>Active branches</DomainButton>
-		<DomainButton href={`/${project.id}/settings`} icon={IconSettings}>Settings</DomainButton>
+		<DomainButton href={`/${project.id}/board`} icon={IconBranch}>Applied branches</DomainButton>
 	</div>
 	<YourBranches {project} {branchController} {vbranchService} />
 	{#if githubContext}
@@ -62,6 +61,6 @@
 	{:else}
 		<RemoteBranches {remoteBranchService} projectId={project.id}></RemoteBranches>
 	{/if}
-	<Footer {user} />
+	<Footer {user} projectId={project.id} />
 	<AppUpdater {update} />
 </div>