diff --git a/src/app.css b/src/app.css index 08bf224..4988e6a 100644 --- a/src/app.css +++ b/src/app.css @@ -160,11 +160,11 @@ } aside.sidebar-leather > div { - @apply bg-primary-50 dark:bg-primary-900 h-full px-5 py-0; + @apply bg-primary-50 dark:bg-gray-800 h-full px-5 py-0; } a.sidebar-item-leather { - @apply hover:bg-primary-100 dark:hover:bg-primary-800; + @apply hover:bg-primary-100 dark:hover:bg-gray-800; } div.skeleton-leather div { diff --git a/src/lib/components/Publication.svelte b/src/lib/components/Publication.svelte index 32c6c35..3e5f049 100644 --- a/src/lib/components/Publication.svelte +++ b/src/lib/components/Publication.svelte @@ -84,6 +84,7 @@ // region Columns visibility let currentBlog: null|string = $state(null); let currentBlogEvent: null|NDKEvent = $state(null); + const isLeaf = $derived(indexEvent.kind === 30041); function isInnerActive() { return currentBlog !== null && $publicationColumnVisibility.inner; @@ -122,7 +123,7 @@ onMount(() => { // Set current columns depending on the publication type const isBlog = publicationType === 'blog'; - publicationColumnVisibility.update(v => ({ ...v, main: !isBlog, blog: isBlog })); + publicationColumnVisibility.update(v => ({ ...v, main: !isBlog, blog: isBlog, toc: !(isLeaf || isBlog) })); // Set up the intersection observer. observer = new IntersectionObserver((entries) => { @@ -142,7 +143,7 @@ -{#if publicationType !== 'blog'} +{#if publicationType !== 'blog' || !isLeaf} {/if} @@ -233,7 +234,7 @@
Discussion -
diff --git a/src/lib/components/util/ArticleNav.svelte b/src/lib/components/util/ArticleNav.svelte index d2d2694..c34b0e0 100644 --- a/src/lib/components/util/ArticleNav.svelte +++ b/src/lib/components/util/ArticleNav.svelte @@ -19,6 +19,7 @@ let title: string = $derived(indexEvent.getMatchingTags('title')[0]?.[1]); let author: string = $derived(indexEvent.getMatchingTags('author')[0]?.[1] ?? 'unknown'); let pubkey: string = $derived(indexEvent.getMatchingTags('p')[0]?.[1] ?? null); + let isLeaf: boolean = $derived(indexEvent.kind === 30041); let lastScrollY = $state(0); let isVisible = $state(true); @@ -116,23 +117,23 @@ {/if} - {#if publicationType === 'blog'} - - {:else} - {#if !$publicationColumnVisibility.discussion && !$publicationColumnVisibility.toc} - + {#if !isLeaf} + {#if publicationType === 'blog'} + + {:else if !$publicationColumnVisibility.discussion && !$publicationColumnVisibility.toc} + {/if} {/if}

{title} by

-
+
{#if $publicationColumnVisibility.inner}