gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-01 04:14:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merged origin/master into Lane style updates

Browse Source
This commit is contained in:
Pavel Laptev 2024-01-23 17:40:14 +01:00 committed by GitButler
commit 91e0bdd19e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,12 +45,12 @@
<div class="header__remote-branch"> <div class="header__remote-branch">
{#if !branch.upstream} {#if !branch.upstream}
{#if hasIntegratedCommits} {#if hasIntegratedCommits}
<div class="status-tag text-base-11 text-semibold deleted"> <div class="status-tag text-base-11 text-semibold integrated">
<Icon name="removed-branch-small" /> deleted <Icon name="pr-small" /> integrated
</div> </div>
{:else} {:else}
<div class="status-tag text-base-11 text-semibold pending"> <div class="status-tag text-base-11 text-semibold pending">
<Icon name="virtual-branch-small" /> new <Icon name="virtual-branch-small" /> virtual
</div> </div>
{/if} {/if}
<div class="pending-name"> <div class="pending-name">
@ -245,7 +245,6 @@
gap: var(--space-2); gap: var(--space-2);
padding: var(--space-2) var(--space-6) var(--space-2) var(--space-4); padding: var(--space-2) var(--space-6) var(--space-2) var(--space-4);
border-radius: var(--radius-m); border-radius: var(--radius-m);
margin-right: var(--space-2);
} }
.pending { .pending {
@ -269,9 +268,14 @@
} }
} }
.deleted { .pending {
color: var(--clr-theme-scale-ntrl-100); color: var(--clr-theme-scale-ntrl-30);
background: var(--clr-theme-scale-err-50); background: color-mix(in srgb, var(--clr-theme-scale-ntrl-50) 20%, transparent);
}
.integrated {
color: var(--clr-theme-succ-on-element);
background: var(--clr-theme-succ-element);
} }
.remote { .remote {