gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-30 01:17:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve UI for stashed branch header

Browse Source
This commit is contained in:
Mattias Granlund 2023-11-29 10:17:15 +01:00
parent e9bb16488f
commit 2548ced85c
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/ui/src/routes/[projectId]/stashed/[branchId]/+page.svelte
View File

@ -56,25 +56,27 @@
>
<span class="purple"> Apply </span>
</Button>
<IconButton
icon="cross"
title="delete branch"
on:click={() => deleteBranchModal.show(branch)}
/>
{#await branch.isMergeable then isMergeable}
{#if !isMergeable}
<Tooltip
timeoutMilliseconds={100}
label="Applying this branch will add merge conflict markers that you will have to resolve"
>
<div
class="flex cursor-default select-none rounded bg-yellow-300 px-2 py-0.5 dark:bg-yellow-800"
<div class="flex items-center">
{#await branch.isMergeable then isMergeable}
{#if !isMergeable}
<Tooltip
timeoutMilliseconds={100}
label="Applying this branch will add merge conflict markers that you will have to resolve"
>
Conflicts with Applied Branches
</div>
</Tooltip>
{/if}
{/await}
<div
class="flex cursor-default select-none rounded bg-yellow-300 px-2 py-0.5 dark:bg-yellow-800"
>
Conflicts with Applied Branches
</div>
</Tooltip>
{/if}
{/await}
<IconButton
icon="cross"
title="delete branch"
on:click={() => deleteBranchModal.show(branch)}
/>
</div>
</div>
<div class="h-full">
<BranchLane