diff --git a/packages/ui/src/app.html b/packages/ui/src/app.html index 72561ea2b..4b3a6d99b 100644 --- a/packages/ui/src/app.html +++ b/packages/ui/src/app.html @@ -6,10 +6,7 @@ %sveltekit.head% - +
%sveltekit.body%
diff --git a/packages/ui/src/lib/components/Resizer.svelte b/packages/ui/src/lib/components/Resizer.svelte index f26431443..f2846d73f 100644 --- a/packages/ui/src/lib/components/Resizer.svelte +++ b/packages/ui/src/lib/components/Resizer.svelte @@ -120,5 +120,6 @@ : `${width}px` : `${width}px` : undefined} + style:cursor={direction == 'horizontal' ? 'ew-resize' : 'ns-resize'} class="shrink-0 {classes ? ` ${classes}` : ''}" /> diff --git a/packages/ui/src/routes/[projectId]/navigation/BaseBranchCard.svelte b/packages/ui/src/routes/[projectId]/navigation/BaseBranchCard.svelte index 7c5f08bdf..15dcfd7d8 100644 --- a/packages/ui/src/routes/[projectId]/navigation/BaseBranchCard.svelte +++ b/packages/ui/src/routes/[projectId]/navigation/BaseBranchCard.svelte @@ -26,19 +26,20 @@ style:background-color={selected ? 'var(--clr-theme-container-pale)' : undefined} bind:this={baseContents} > -
+
-
-
+ +
+
Trunk - - - {#if ($base$?.behind || 0) > 0} + + +
-
+
{#if $base$?.remoteUrl.includes('github.com')} - + {:else} {/if} @@ -76,27 +77,27 @@ display: flex; gap: var(--space-10); padding: var(--space-8); - border-radius: var(--m, 6px); + border-radius: var(--radius-m); &:hover, &:focus { background-color: var(--clr-theme-container-pale); } } - .card__icon { + .icon { flex-shrink: 0; } - .card__content { + .content { display: flex; flex-direction: column; gap: var(--space-8); } - .card__row_1 { + .row_1 { display: flex; gap: var(--space-6); align-items: center; color: var(--clr-theme-scale-ntrl-10); } - .card__row_2 { + .row_2 { display: flex; align-items: center; gap: var(--space-4); diff --git a/packages/ui/src/routes/[projectId]/navigation/Header.svelte b/packages/ui/src/routes/[projectId]/navigation/Header.svelte index 855e86aea..8da0ff426 100644 --- a/packages/ui/src/routes/[projectId]/navigation/Header.svelte +++ b/packages/ui/src/routes/[projectId]/navigation/Header.svelte @@ -17,29 +17,40 @@
-
- { - e.preventDefault(); - e.stopPropagation(); - fetching = true; - await branchController.fetchFromTarget().finally(() => { - fetching = false; - prService.reload(); - }); - }} - > -
- -
- +
+
diff --git a/packages/ui/src/routes/[projectId]/navigation/ProjectSelector.svelte b/packages/ui/src/routes/[projectId]/navigation/ProjectSelector.svelte index 7a654aebf..f92ab0665 100644 --- a/packages/ui/src/routes/[projectId]/navigation/ProjectSelector.svelte +++ b/packages/ui/src/routes/[projectId]/navigation/ProjectSelector.svelte @@ -27,7 +27,7 @@ e.preventDefault(); }} > - {project.title} + {project.title}
@@ -36,22 +36,24 @@
-