gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-26 11:08:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Show deleted instead of pending if branch has integrated commit(s)

Browse Source
This commit is contained in:
Mattias Granlund 2024-01-04 18:22:21 +01:00
parent 54773d0bfe
commit 1b02c240b1
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gitbutler-ui/src/routes/[projectId]/components/BranchHeader.svelte
View File

@ -19,6 +19,8 @@
function handleBranchNameChange() {
branchController.updateBranchName(branch.id, branch.name);
}
$: hasIntegratedCommits = branch.commits?.some((b) => b.isIntegrated);
</script>
<div class="card__header relative" data-drag-handle>
@ -48,7 +50,13 @@
{#if branch.upstreamName}
<div class="card__row text-base-11" data-drag-handle>
<div class="card__remote">
{#if !branch.upstream}<div class="pending">pending</div>{/if}
{#if !branch.upstream}
{#if hasIntegratedCommits}
<div class="status-tag deleted">deleted</div>
{:else}
<div class="status-tag pending">pending</div>
{/if}
{/if}
<div>origin/{branch.upstreamName}</div>
</div>
</div>
@ -106,10 +114,16 @@
align-items: center;
}
.pending {
color: var(--clr-theme-scale-ntrl-40);
background: var(--clr-theme-container-sub);
.status-tag {
padding: var(--space-2) var(--space-4);
border-radius: var(--radius-s);
}
.pending {
color: var(--clr-theme-scale-ntrl-40);
background: var(--clr-theme-container-sub);
}
.deleted {
color: var(--clr-theme-scale-warn-30);
background: var(--clr-theme-warn-container-dim);
}
</style>