gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-04 15:53:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: update styling and conditional rendering in branch component

Browse Source
This commit is contained in:
Kiril Videlov 2023-11-27 17:59:58 +01:00 committed by Kiril Videlov
parent a6a1a7e3c9
commit fac45a2d6b
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,14 +317,14 @@
>
<!-- TODO: Figure out why z-10 is necessary for expand up/down to not come out on top -->
<div
class="cherrypick-dz-marker absolute z-10 hidden h-full w-full items-center justify-center rounded bg-blue-100/70 outline-dashed outline-2 -outline-offset-8 outline-light-600 dark:bg-blue-900/60 dark:outline-dark-300"
class="cherrypick-dz-marker outline-light-600 dark:outline-dark-300 absolute z-10 hidden h-full w-full items-center justify-center rounded bg-blue-100/70 outline-dashed outline-2 -outline-offset-8 dark:bg-blue-900/60"
>
<div class="hover-text invisible font-semibold">Apply here</div>
</div>
<!-- TODO: Figure out why z-10 is necessary for expand up/down to not come out on top -->
<div
class="lane-dz-marker absolute z-10 hidden h-full w-full items-center justify-center rounded bg-blue-100/70 outline-dashed outline-2 -outline-offset-8 outline-light-600 dark:bg-blue-900/60 dark:outline-dark-300"
class="lane-dz-marker outline-light-600 dark:outline-dark-300 absolute z-10 hidden h-full w-full items-center justify-center rounded bg-blue-100/70 outline-dashed outline-2 -outline-offset-8 dark:bg-blue-900/60"
>
<div class="hover-text invisible font-semibold">Move here</div>
</div>
@ -332,15 +332,17 @@
<div bind:this={contents} class="flex min-h-full flex-col">
{#if branch.files?.length > 0}
<BranchFiles {branch} {readonly} {selectedOwnership} />
<CommitDialog
{projectId}
{branchController}
{branch}
{cloudEnabled}
{cloud}
{selectedOwnership}
{user}
/>
{#if branch.active}
<CommitDialog
{projectId}
{branchController}
{branch}
{cloudEnabled}
{cloud}
{selectedOwnership}
{user}
/>
{/if}
{:else if branch.commits.length == 0}
<div class="new-branch" data-dnd-ignore>
<h1 class="text-base-16 text-semibold">Nothing on this branch yet</h1>