diff --git a/apps/desktop/src/lib/branch/StackingSeriesHeader.svelte b/apps/desktop/src/lib/branch/StackingSeriesHeader.svelte index 0395f9abfa..c30fc2794a 100644 --- a/apps/desktop/src/lib/branch/StackingSeriesHeader.svelte +++ b/apps/desktop/src/lib/branch/StackingSeriesHeader.svelte @@ -32,9 +32,11 @@ interface Props { currentSeries: PatchSeries; isTopSeries: boolean; + sequenceId: number; + seqenceAmount: number; } - const { currentSeries, isTopSeries }: Props = $props(); + const { currentSeries, isTopSeries, sequenceId, seqenceAmount }: Props = $props(); let descriptionVisible = $state(false); @@ -193,10 +195,13 @@
0 || branch.series.length > 1} />
@@ -258,11 +263,6 @@
{/if} -
-
-
-
- {#if $pr} {:else} @@ -343,7 +343,7 @@ .branch-action__line { min-width: 2px; - margin: 0 20px; + margin: var(--lines-inner-margin); background-color: var(--bg-color, var(--clr-border-3)); } diff --git a/apps/desktop/src/lib/branch/StackingStatusIcon.svelte b/apps/desktop/src/lib/branch/StackingStatusIcon.svelte index 6e758bba64..89ade59d1f 100644 --- a/apps/desktop/src/lib/branch/StackingStatusIcon.svelte +++ b/apps/desktop/src/lib/branch/StackingStatusIcon.svelte @@ -1,5 +1,7 @@ -
+
= 10}>
-
- -
+ + 1 + ? `${branchNameType()} ${sequenceId} of ${seqenceAmount}` + : branchNameType()} + > +
+ {#if seqenceAmount > 1} + {sequenceId}/{seqenceAmount} + {:else} + + {/if} +
+
diff --git a/apps/desktop/src/lib/commit/StackingUpstreamCommitsAccordion.svelte b/apps/desktop/src/lib/commit/StackingUpstreamCommitsAccordion.svelte index 84530e1305..da1a54500c 100644 --- a/apps/desktop/src/lib/commit/StackingUpstreamCommitsAccordion.svelte +++ b/apps/desktop/src/lib/commit/StackingUpstreamCommitsAccordion.svelte @@ -95,7 +95,7 @@ & .accordion-row__line { position: relative; width: 2px; - margin: 0 20px; + margin: var(--lines-inner-margin); background-color: var(--clr-commit-upstream); --dots-y-shift: -8px; diff --git a/apps/desktop/src/lib/stack/StackCurrentSeries.svelte b/apps/desktop/src/lib/stack/StackCurrentSeries.svelte index f6f3983f49..386f057812 100644 --- a/apps/desktop/src/lib/stack/StackCurrentSeries.svelte +++ b/apps/desktop/src/lib/stack/StackCurrentSeries.svelte @@ -47,6 +47,7 @@