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

Improve no changes branch state

Browse Source
This commit is contained in:
Mattias Granlund 2023-11-28 00:14:22 +01:00
parent 63108d1afd
commit 174e295f3a
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/ui/src/routes/[projectId]/components/BranchCard.svelte
View File

@ -330,7 +330,9 @@
{/if} {/if}
{:else if branch.commits.length == 0} {:else if branch.commits.length == 0}
<div class="new-branch" data-dnd-ignore> <div class="new-branch" data-dnd-ignore>
<h1 class="text-base-16 text-semibold">Nothing on this branch yet</h1> <h1 class="text-base-16 text-semibold">
This is a new branch. Let's start creating!
</h1>
<p class="px-12">Get some work done, then throw some files my way!</p> <p class="px-12">Get some work done, then throw some files my way!</p>
</div> </div>
{:else} {:else}
@ -425,14 +427,16 @@
display: flex; display: flex;
flex-grow: 1; flex-grow: 1;
flex-direction: column; flex-direction: column;
color: var(--clr-theme-scale-ntrl-60);
background: var(--clr-theme-container-light); background: var(--clr-theme-container-light);
justify-content: center; justify-content: center;
gap: var(--space-8); gap: var(--space-8);
padding: 0 var(--space-40);
}
& h1 { .new-branch h1 {
color: var(--clr-theme-scale-ntrl-40); color: var(--clr-theme-scale-ntrl-40);
text-align: center; text-align: center;
}
} }
.new-branch p { .new-branch p {

24
packages/ui/src/routes/[projectId]/components/BranchFiles.svelte
View File

@ -106,22 +106,6 @@
}} }}
/> />
{/if} {/if}
{#if branch.files.length == 0}
{#if branch.commits.length == 0}
<div class="new-branch text-color-3 space-y-6 rounded p-8 text-center" data-dnd-ignore>
<p>Nothing on this branch yet.</p>
{#if !readonly}
<IconNewBadge class="mx-auto mt-4 h-16 w-16 text-blue-400" />
<p class="px-12">Get some work done, then throw some files my way!</p>
{/if}
</div>
{:else}
<!-- attention: these markers have custom css at the bottom of thise file -->
<div class="no-uncommitted text-color-3 rounded py-6 text-center font-mono" data-dnd-ignore>
No uncommitted changes on this branch
</div>
{/if}
{/if}
</div> </div>
<style lang="postcss"> <style lang="postcss">
@ -164,12 +148,4 @@
flex-grow: 1; flex-grow: 1;
gap: var(--space-4); gap: var(--space-4);
} }
.no-uncommitted {
flex-grow: 1;
}
.new-branch {
flex-grow: 1;
}
</style> </style>