diff --git a/src/lib/icons/IconEmptyMug.svelte b/src/lib/icons/IconEmptyMug.svelte new file mode 100644 index 000000000..1883ddef7 --- /dev/null +++ b/src/lib/icons/IconEmptyMug.svelte @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + diff --git a/src/lib/icons/IconHelp.svelte b/src/lib/icons/IconHelp.svelte new file mode 100644 index 000000000..ed2c84e59 --- /dev/null +++ b/src/lib/icons/IconHelp.svelte @@ -0,0 +1,19 @@ + + + + + diff --git a/src/lib/icons/IconLock.svelte b/src/lib/icons/IconLock.svelte new file mode 100644 index 000000000..0e38787ca --- /dev/null +++ b/src/lib/icons/IconLock.svelte @@ -0,0 +1,19 @@ + + + + + diff --git a/src/lib/icons/IconNewBadge.svelte b/src/lib/icons/IconNewBadge.svelte new file mode 100644 index 000000000..31d48aac2 --- /dev/null +++ b/src/lib/icons/IconNewBadge.svelte @@ -0,0 +1,86 @@ + + + + + + + + + + + + diff --git a/src/routes/repo/[projectId]/+page.svelte b/src/routes/repo/[projectId]/+page.svelte index 384e2531c..a34bb46ba 100644 --- a/src/routes/repo/[projectId]/+page.svelte +++ b/src/routes/repo/[projectId]/+page.svelte @@ -50,7 +50,7 @@
diff --git a/src/routes/repo/[projectId]/BranchLane.svelte b/src/routes/repo/[projectId]/BranchLane.svelte index 62de4432b..26148b5c0 100644 --- a/src/routes/repo/[projectId]/BranchLane.svelte +++ b/src/routes/repo/[projectId]/BranchLane.svelte @@ -20,6 +20,7 @@ import { invoke } from '@tauri-apps/api/tauri'; import type { getCloudApiClient } from '$lib/api/cloud/api'; import Scrollbar from '$lib/components/Scrollbar.svelte'; + import IconNewBadge from '$lib/icons/IconNewBadge.svelte'; const [send, receive] = crossfade({ duration: (d) => Math.sqrt(d * 200), @@ -378,13 +379,26 @@
{/if} {#if files.length == 0} - -
- No uncomitted changes -
+ {#if commits.length == 0} +
+

Nothing on this branch yet.

+ +

+ Get some work done, then throw some files my way! +

+
+ {:else} + +
+ No uncommitted changes on this branch +
+ {/if} {/if} {#if localCommits.length > 0 || remoteCommits.length > 0} @@ -498,6 +512,16 @@ + {#if !maximized} + (maximized = !maximized)}>Maximize + {:else} + (maximized = !maximized)}>Minimize + {/if} + +
+
+
+ branchId && branchController.unapplyBranch(branchId)}> Unapply diff --git a/src/routes/repo/[projectId]/FileCardNext.svelte b/src/routes/repo/[projectId]/FileCardNext.svelte index ac5021e1e..eaaa14699 100644 --- a/src/routes/repo/[projectId]/FileCardNext.svelte +++ b/src/routes/repo/[projectId]/FileCardNext.svelte @@ -21,6 +21,8 @@ import { slide } from 'svelte/transition'; import { SETTINGS_CONTEXT, type SettingsStore } from '$lib/userSettings'; import { summarizeHunk } from '$lib/summaries'; + import Tooltip from '$lib/components/Tooltip/Tooltip.svelte'; + import IconLock from '$lib/icons/IconLock.svelte'; export let file: File; export let conflicted: boolean; @@ -83,7 +85,7 @@ on:dragstart={(e) => e.dataTransfer?.setData('text/hunk', getAllHunksOwnership())} role="group" class="changed-file inner" - class:opacity-60={isFileLocked} + class:opacity-80={isFileLocked} >
+ {#if isFileLocked} +
+ + + +
+ {/if}
{ expanded = !expanded; @@ -119,7 +130,7 @@ on:keypress={() => (expanded = !expanded)} role="button" tabindex="0" - class="cursor-pointer px-3 py-2 text-light-600 dark:text-dark-200" + class="flex-grow-0 cursor-pointer px-3 py-2 text-light-600 dark:text-dark-200" > {#if !file.binary} {#if expanded} diff --git a/src/routes/repo/[projectId]/Tray.svelte b/src/routes/repo/[projectId]/Tray.svelte index 59e20f31c..9a3f5ba07 100644 --- a/src/routes/repo/[projectId]/Tray.svelte +++ b/src/routes/repo/[projectId]/Tray.svelte @@ -1,5 +1,5 @@
-
+
- + diff --git a/tailwind.config.cjs b/tailwind.config.cjs index a69aa62b8..9423c1ade 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -102,9 +102,16 @@ const config = { 900: '#1e3a8a' }, yellow: { - 400: '#facc15', - 500: '#eab308', - 900: '#713f12' + 50: '#FFFBE6', + 100: '#FFF7CC', + 200: '#FEF0A2', + 300: '#FDE978', + 400: '#FACC15', + 500: '#EAB308', + 600: '#C19206', + 700: '#987105', + 800: '#6F5004', + 900: '#713F12' }, red: { 400: '#F87171', @@ -126,11 +133,28 @@ const config = { 900: '#14532d' }, purple: { - 600: '#5852A0' + 50: '#F2F0FD', + 100: '#E6E0FA', + 200: '#CFC7F5', + 300: '#B8ADF1', + 400: '#A193EC', + 500: '#8A79E7', + 600: '#5852A0', + 700: '#443D7A', + 800: '#302854', + 900: '#1C142E' }, orange: { - 200: '#fed7aa', - 700: '#CD6E02' + 50: '#FEF6E4', + 100: '#FEE9C8', + 200: '#FED7AA', + 300: '#FDC592', + 400: '#FCB37B', + 500: '#FBA163', + 600: '#FA8E4B', + 700: '#CD6E02', + 800: '#A55602', + 900: '#7D3F02' }, zinc: { 50: '#fafafa',