diff --git a/plugins/activity-resources/src/components/Activity.svelte b/plugins/activity-resources/src/components/Activity.svelte index c2b4b4e6bc..2dbe065b85 100644 --- a/plugins/activity-resources/src/components/Activity.svelte +++ b/plugins/activity-resources/src/components/Activity.svelte @@ -82,7 +82,7 @@ $: if (editableMap) updateTxes(object) - $: newTxPos = newTx(txes, $lastViews) + $: newTxPos = newTx(txesF, $lastViews) function newTx (txes: DisplayTx[], lastViews: Map, number> | undefined): number { const lastView = lastViews?.get(object._id) @@ -129,7 +129,12 @@ {#if txesF} {#each txesF as tx, i} - + {/each} {/if} @@ -166,7 +171,12 @@ {#if txesF} {#each txesF as tx, i} - + {/each} {/if} diff --git a/plugins/activity-resources/src/components/TxView.svelte b/plugins/activity-resources/src/components/TxView.svelte index 57c28e300d..cd1776d96c 100644 --- a/plugins/activity-resources/src/components/TxView.svelte +++ b/plugins/activity-resources/src/components/TxView.svelte @@ -42,6 +42,7 @@ export let viewlets: Map export let showIcon: boolean = true export let isNew: boolean = false + export let isNextNew: boolean = false // export let showDocument = false let ptx: DisplayTx | undefined @@ -141,7 +142,7 @@ {#if (viewlet !== undefined && !((viewlet?.hideOnRemove ?? false) && tx.removed)) || model.length > 0} -
+
{#if showIcon}
{#if viewlet} @@ -156,7 +157,6 @@
@@ -351,11 +351,6 @@ min-width: 0; } - .isNew { - padding-bottom: 0.5rem; - border-bottom: 1px solid var(--highlight-red); - } - .showIcon { &::after, &::before { @@ -364,6 +359,19 @@ width: 1px; background-color: var(--popup-divider); } + &.isNew { + &::before { + background-color: var(--highlight-red); + } + .icon { + border: 1px solid var(--highlight-red); + } + &.isNextNew { + &:after { + background-color: var(--highlight-red); + } + } + } &::before { top: -1.5rem; height: 1.5rem;