From 210b58d8f8f7e6329eca9e26ad0f26dbeca483e9 Mon Sep 17 00:00:00 2001 From: Pavel Laptev Date: Fri, 4 Oct 2024 10:56:48 +0200 Subject: [PATCH] fix: `DefaultTargetButton` size for the stacking feature --- apps/desktop/src/lib/branch/BranchHeader.svelte | 1 + apps/desktop/src/lib/branch/DefaultTargetButton.svelte | 7 ++++--- apps/desktop/src/lib/stack/StackHeader.svelte | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/desktop/src/lib/branch/BranchHeader.svelte b/apps/desktop/src/lib/branch/BranchHeader.svelte index f85f9c617..a15f7219c 100644 --- a/apps/desktop/src/lib/branch/BranchHeader.svelte +++ b/apps/desktop/src/lib/branch/BranchHeader.svelte @@ -151,6 +151,7 @@
{ isTargetBranchAnimated = true; diff --git a/apps/desktop/src/lib/branch/DefaultTargetButton.svelte b/apps/desktop/src/lib/branch/DefaultTargetButton.svelte index 0d9edbdf7..646771b4a 100644 --- a/apps/desktop/src/lib/branch/DefaultTargetButton.svelte +++ b/apps/desktop/src/lib/branch/DefaultTargetButton.svelte @@ -4,9 +4,10 @@ interface Props { selectedForChanges: boolean; onclick: () => void; + size: 'button' | 'tag'; } - const { selectedForChanges, onclick }: Props = $props(); + const { selectedForChanges, size = 'button', onclick }: Props = $props(); {#if selectedForChanges} @@ -15,7 +16,7 @@ kind="soft" tooltip="New changes will land here" icon="target" - size="tag" + {size} clickable={false} > Default branch @@ -26,7 +27,7 @@ outline tooltip="When selected, new changes land here" icon="target" - size="tag" + {size} {onclick} > Set as default diff --git a/apps/desktop/src/lib/stack/StackHeader.svelte b/apps/desktop/src/lib/stack/StackHeader.svelte index 3346f2d2f..e51d1fc1a 100644 --- a/apps/desktop/src/lib/stack/StackHeader.svelte +++ b/apps/desktop/src/lib/stack/StackHeader.svelte @@ -112,6 +112,7 @@ handleBranchNameChange(name)} /> { isTargetBranchAnimated = true;