gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-30 01:17:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update styling for base branch view

Browse Source
This commit is contained in:
Mattias Granlund 2023-11-29 11:45:44 +01:00
parent 9f2d4f2359
commit ad11d82ae9
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/ui/src/routes/[projectId]/base/+page.svelte
View File

@ -10,12 +10,8 @@
$: error$ = baseBranchService.error$;
</script>
<div class="h-full flex-grow overflow-y-auto overscroll-none p-3">
<div
class="flex max-w-4xl flex-col gap-y-6 overflow-visible rounded-lg px-5 py-4"
style:background-color="var(--bg-surface)"
style:border-color="var(--border-surface)"
>
<div class="h-full flex-grow overflow-y-auto overscroll-none p-4">
<div class="wrapper flex max-w-2xl flex-col gap-y-6 overflow-visible">
{#if $error$}
<p>Error...</p>
{:else if !$base$}
@ -25,3 +21,12 @@
{/if}
</div>
</div>
<style lang="postcss">
.wrapper {
border: 1px solid var(--clr-theme-container-outline-light);
background-color: var(--clr-theme-container-light);
padding: var(--space-16);
border-radius: var(--radius-m);
}
</style>

2
packages/ui/src/routes/[projectId]/base/BaseBranch.svelte
View File

@ -24,7 +24,7 @@
<div bind:this={viewport} class="flex max-h-full flex-col overflow-y-scroll overscroll-none">
<div bind:this={contents} class="flex flex-col gap-y-4">
<div class="rounded-sm text-sm text-light-700 dark:text-dark-200">
<div class="text-base-13 rounded-sm">
There {multiple ? 'are' : 'is'}
{base.upstreamCommits.length} unmerged upstream
{multiple ? 'commits' : 'commit'}

5
packages/ui/src/routes/[projectId]/pull/[number]/+page.svelte
View File

@ -14,7 +14,7 @@
</script>
<div class="wrapper overflow-y-auto overscroll-none">
<div class="inner flex px-5 py-4">
<div class="inner flex">
{#if !$pr}
<p>Loading...</p>
{:else if pr}
@ -31,4 +31,7 @@
height: 100%;
overflow-y: auto;
}
.inner {
padding: var(--space-16);
}
</style>