gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-02 07:53:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4414 from gitbutlerapp/revert-4402-rename-trunk-to-target

Browse Source 
Revert "rename Trunk to Target in the UI"
This commit is contained in:
Kiril Videlov 2024-07-16 19:24:13 +02:00 committed by GitHub
commit 99dfb0084f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/lib/navigation/BaseBranchCard.svelte
View File

@ -21,7 +21,7 @@
</script>
<button
use:tooltip={isNavCollapsed ? 'Target' : ''}
use:tooltip={isNavCollapsed ? 'Trunk' : ''}
on:mousedown={async () => await goto(`/${project.id}/base`)}
class="base-branch-card"
class:selected
@ -39,10 +39,7 @@
{#if !isNavCollapsed}
<div class="content">
<div class="button-head">
<span
use:tooltip={'The branch that your Workspace virtual branches are based on and will be merged into.'}
class="text-base-14 text-semibold trunk-label">Target</span
>
<span class="text-base-14 text-semibold trunk-label">Trunk</span>
{#if ($base?.behind || 0) > 0}
<Badge count={$base?.behind || 0} help="Unmerged upstream commits" />
{/if}