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

Move settings and change vbranch label

Browse Source
This commit is contained in:
Mattias Granlund 2023-11-17 15:31:50 +01:00
parent bbcb5c12ca
commit 74a28e166a
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/ui/src/lib/components/Link.svelte
View File

@ -41,10 +41,10 @@
<div class="truncate"> <div class="truncate">
<slot /> <slot />
</div> </div>
<div class="shrink-0"> {#if isExternal}
{#if isExternal} <div class="shrink-0">
<IconExternalLink class="h-3.5 w-3.5" /> <IconExternalLink class="h-3.5 w-3.5" />
{/if} </div>
</div> {/if}
</a> </a>
{/if} {/if}

2
packages/ui/src/routes/[projectId]/navigation/DomainButton.svelte
View File

@ -9,7 +9,7 @@
<a <a
{href} {href}
class="mx-4 block rounded px-3 py-2 font-semibold" class="mx-4 flex items-center gap-x-1 rounded px-3 py-2 font-semibold"
style:background-color={selected ? 'var(--bg-surface-highlight)' : undefined} style:background-color={selected ? 'var(--bg-surface-highlight)' : undefined}
> >
<svelte:component this={icon} class="text-color-4 mr-1 inline h-4 w-4 align-middle" /> <svelte:component this={icon} class="text-color-4 mr-1 inline h-4 w-4 align-middle" />

11
packages/ui/src/routes/[projectId]/navigation/Footer.svelte
View File

@ -5,10 +5,12 @@
import Tooltip from '$lib/components/Tooltip.svelte'; import Tooltip from '$lib/components/Tooltip.svelte';
import IconEmail from '$lib/icons/IconEmail.svelte'; import IconEmail from '$lib/icons/IconEmail.svelte';
import IconHome from '$lib/icons/IconHome.svelte'; import IconHome from '$lib/icons/IconHome.svelte';
import IconSettings from '$lib/icons/IconSettings.svelte';
import IconSpinner from '$lib/icons/IconSpinner.svelte'; import IconSpinner from '$lib/icons/IconSpinner.svelte';
import * as events from '$lib/utils/events'; import * as events from '$lib/utils/events';
export let user: User | undefined; export let user: User | undefined;
export let projectId: string | undefined;
</script> </script>
<div <div
@ -16,15 +18,16 @@
style:background-color="var(--bg-surface-highlight)" style:background-color="var(--bg-surface-highlight)"
style:border-color="var(--border-surface)" style:border-color="var(--border-surface)"
> >
<div class="flex items-center"> <div class="flex items-center gap-x-1">
<Link href="/" class="p-1"> <Link href="/" class="p-1"><IconHome /></Link>
<IconHome />
</Link>
<Tooltip label="Send feedback"> <Tooltip label="Send feedback">
<button class="p-1 align-middle" on:click={() => events.emit('openSendIssueModal')}> <button class="p-1 align-middle" on:click={() => events.emit('openSendIssueModal')}>
<IconEmail class="align-top" /> <IconEmail class="align-top" />
</button> </button>
</Tooltip> </Tooltip>
<Link href={`/${projectId}/settings`} class="p-1">
<IconSettings />
</Link>
{#if $isLoading} {#if $isLoading}
<Tooltip label={loadStack.join('\n')}> <Tooltip label={loadStack.join('\n')}>
<IconSpinner class="scale-75" /> <IconSpinner class="scale-75" />

5
packages/ui/src/routes/[projectId]/navigation/Navigation.svelte
View File

@ -53,8 +53,7 @@
<BaseBranchCard {project} {baseBranchService} {branchController} {prService} /> <BaseBranchCard {project} {baseBranchService} {branchController} {prService} />
</div> </div>
<div class="mb-4"> <div class="mb-4">
<DomainButton href={`/${project.id}/board`} icon={IconBranch}>Active branches</DomainButton> <DomainButton href={`/${project.id}/board`} icon={IconBranch}>Applied branches</DomainButton>
<DomainButton href={`/${project.id}/settings`} icon={IconSettings}>Settings</DomainButton>
</div> </div>
<YourBranches {project} {branchController} {vbranchService} /> <YourBranches {project} {branchController} {vbranchService} />
{#if githubContext} {#if githubContext}
@ -62,6 +61,6 @@
{:else} {:else}
<RemoteBranches {remoteBranchService} projectId={project.id}></RemoteBranches> <RemoteBranches {remoteBranchService} projectId={project.id}></RemoteBranches>
{/if} {/if}
<Footer {user} /> <Footer {user} projectId={project.id} />
<AppUpdater {update} /> <AppUpdater {update} />
</div> </div>