From b6b814590165977ada2ba1bbb5820538e3aff262 Mon Sep 17 00:00:00 2001
From: Jon Staab <jstaab@protonmail.com>
Date: Thu, 4 Jun 2026 14:31:07 -0700
Subject: [PATCH] Fix some bottom padding stuff

---
 src/app/components/Chat.svelte                   |  2 +-
 src/app/components/RoomItem.svelte               | 13 ++-----------
 src/lib/components/PageContent.svelte            |  2 +-
 src/routes/spaces/+page.svelte                   |  2 +-
 src/routes/spaces/[relay]/[h]/+page.svelte       | 13 ++-----------
 src/routes/spaces/[relay]/calendar/+page.svelte  |  2 +-
 .../[relay]/calendar/[address]/+page.svelte      | 14 ++++++++------
 src/routes/spaces/[relay]/chat/+page.svelte      | 15 +++------------
 .../spaces/[relay]/classifieds/+page.svelte      |  2 +-
 .../[relay]/classifieds/[address]/+page.svelte   |  6 +++---
 src/routes/spaces/[relay]/goals/+page.svelte     |  2 +-
 .../spaces/[relay]/goals/[id]/+page.svelte       | 16 +++++++++-------
 src/routes/spaces/[relay]/polls/+page.svelte     |  2 +-
 .../spaces/[relay]/polls/[id]/+page.svelte       | 16 +++++++++-------
 src/routes/spaces/[relay]/recent/+page.svelte    |  2 +-
 src/routes/spaces/[relay]/threads/+page.svelte   |  2 +-
 .../spaces/[relay]/threads/[id]/+page.svelte     | 16 +++++++++-------
 src/routes/spaces/create/+page.svelte            |  2 +-
 18 files changed, 55 insertions(+), 74 deletions(-)

diff --git a/src/app/components/Chat.svelte b/src/app/components/Chat.svelte
index 4a078841..d5eb969e 100644
--- a/src/app/components/Chat.svelte
+++ b/src/app/components/Chat.svelte
@@ -280,7 +280,7 @@
   </div>
 </PageBar>
 
-<PageContent class="flex flex-col-reverse gap-2 py-4">
+<PageContent class="flex flex-col-reverse gap-2 py-2 !mb-0">
   {#if missingRelayLists.length > 0}
     <div class="py-12">
       <div class="card2 col-2 m-auto max-w-md items-center text-center">
diff --git a/src/app/components/RoomItem.svelte b/src/app/components/RoomItem.svelte
index 87c49c10..ee031138 100644
--- a/src/app/components/RoomItem.svelte
+++ b/src/app/components/RoomItem.svelte
@@ -45,20 +45,11 @@
     event: TrustedEvent
     replyTo?: (event: TrustedEvent) => void
     showPubkey?: boolean
-    addSpaceBelow?: boolean
     canEdit: (event: TrustedEvent) => boolean
     onEdit: (event: TrustedEvent) => void
   }
 
-  const {
-    url,
-    event,
-    replyTo = undefined,
-    showPubkey = false,
-    addSpaceBelow = false,
-    canEdit,
-    onEdit,
-  }: Props = $props()
+  const {url, event, replyTo = undefined, showPubkey = false, canEdit, onEdit}: Props = $props()
 
   const path = getRoomItemPath(url, event)
   const shouldProtect = canEnforceNip70(url)
@@ -95,7 +86,7 @@
   {onTap}
   class={cx(
     "group relative flex w-full cursor-default flex-col px-2 py-0.5 text-left hover:bg-base-100/50",
-    {"mt-1.5": showPubkey, "mb-1.5": addSpaceBelow},
+    {"mt-1.5": showPubkey},
   )}>
   <div class="flex w-full gap-3 overflow-auto">
     {#if showPubkey}
diff --git a/src/lib/components/PageContent.svelte b/src/lib/components/PageContent.svelte
index 45998e66..6da09e00 100644
--- a/src/lib/components/PageContent.svelte
+++ b/src/lib/components/PageContent.svelte
@@ -13,7 +13,7 @@
   const className = $derived(
     cx(
       props.class,
-      "scroll-container z-feature flex min-h-0 w-full min-w-0 flex-col overflow-y-auto overflow-x-hidden pb-14 md:pb-0",
+      "scroll-container z-feature flex flex-col min-h-0 w-full min-w-0 overflow-y-auto overflow-x-hidden mb-14 md:mb-0",
     ),
   )
 </script>
diff --git a/src/routes/spaces/+page.svelte b/src/routes/spaces/+page.svelte
index 0f0804c7..18aaccbd 100644
--- a/src/routes/spaces/+page.svelte
+++ b/src/routes/spaces/+page.svelte
@@ -254,7 +254,7 @@
       </div>
     </div>
   </PageBar>
-  <PageContent class="flex flex-col gap-2 p-2 pt-4">
+  <PageContent class="flex flex-col gap-2 p-2">
     <div class="flex flex-col gap-2" bind:this={element}>
       {#each PLATFORM_RELAYS as url (url)}
         <Button
diff --git a/src/routes/spaces/[relay]/[h]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte
index 55ea26d8..66578315 100644
--- a/src/routes/spaces/[relay]/[h]/+page.svelte
+++ b/src/routes/spaces/[relay]/[h]/+page.svelte
@@ -350,16 +350,11 @@
           event.created_at - previousCreatedAt > int(3, MINUTE) ||
           previousKind === ROOM_ADD_MEMBER
 
-        if (showPubkey && elements.length > 0) {
-          elements[elements.length - 1].addSpaceBelow = true
-        }
-
         elements.push({
           id: event.id,
           type: "note",
           value: event,
           showPubkey,
-          addSpaceBelow: false,
         })
 
         previousDate = date
@@ -368,9 +363,6 @@
         previousCreatedAt = event.created_at
         seen.add(event.id)
       }
-      if (elements.length > 0) {
-        elements[elements.length - 1].addSpaceBelow = true
-      }
     }
 
     elements.reverse()
@@ -470,7 +462,7 @@
       bind:element
       onscroll={onScroll}
       class={cx(
-        "flex-col-reverse pb-0! pt-4",
+        "flex-col-reverse !mb-0",
         showMobileVideoPanel ? "hidden md:flex md:flex-col-reverse" : "flex",
         pageContentHiddenDesktopVideoOnly && "md:hidden",
       )}>
@@ -501,7 +493,7 @@
             <Spinner loading={loadingForward}>Looking for messages...</Spinner>
           </p>
         {/if}
-        {#each elements as { type, id, value, showPubkey, addSpaceBelow }, i (id)}
+        {#each elements as { type, id, value, showPubkey }, i (id)}
           {#if type === "new-messages"}
             <div
               {id}
@@ -523,7 +515,6 @@
                 {event}
                 {replyTo}
                 {showPubkey}
-                {addSpaceBelow}
                 canEdit={canEditEvent}
                 onEdit={onEditEvent} />
             {/if}
diff --git a/src/routes/spaces/[relay]/calendar/+page.svelte b/src/routes/spaces/[relay]/calendar/+page.svelte
index 33da0bad..4df95a73 100644
--- a/src/routes/spaces/[relay]/calendar/+page.svelte
+++ b/src/routes/spaces/[relay]/calendar/+page.svelte
@@ -125,7 +125,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent bind:element class="flex flex-col gap-2 p-2 pt-4">
+<PageContent bind:element class="flex flex-col gap-2 p-2">
   {#each items as { event, dateDisplay, isFirstFutureEvent }, i (event.id)}
     <div class={"calendar-event-" + event.id}>
       {#if isFirstFutureEvent}
diff --git a/src/routes/spaces/[relay]/calendar/[address]/+page.svelte b/src/routes/spaces/[relay]/calendar/[address]/+page.svelte
index bde8ecb7..55c6dbf8 100644
--- a/src/routes/spaces/[relay]/calendar/[address]/+page.svelte
+++ b/src/routes/spaces/[relay]/calendar/[address]/+page.svelte
@@ -64,7 +64,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent class="flex flex-col gap-3 p-2 pt-4">
+<PageContent class="flex flex-col gap-3 p-2">
   {#if $event}
     <div class="card2 bg-alt col-3 z-feature">
       <div class="flex items-start gap-4">
@@ -109,10 +109,12 @@
       </div>
     {/if}
   {:else}
-    {#await sleep(5000)}
-      <Spinner loading>Loading comments...</Spinner>
-    {:then}
-      <p>Failed to load comments.</p>
-    {/await}
+    <div class="flex justify-center py-20">
+      {#await sleep(5000)}
+        <Spinner loading>Loading event...</Spinner>
+      {:then}
+        <p>Failed to load event.</p>
+      {/await}
+    </div>
   {/if}
 </PageContent>
diff --git a/src/routes/spaces/[relay]/chat/+page.svelte b/src/routes/spaces/[relay]/chat/+page.svelte
index 9fdd55d3..0bd1d2ae 100644
--- a/src/routes/spaces/[relay]/chat/+page.svelte
+++ b/src/routes/spaces/[relay]/chat/+page.svelte
@@ -227,16 +227,11 @@
           event.created_at - previousCreatedAt > int(3, MINUTE) ||
           previousKind === RELAY_ADD_MEMBER
 
-        if (showPubkey && elements.length > 0) {
-          elements[elements.length - 1].addSpaceBelow = true
-        }
-
         elements.push({
           id: event.id,
           type: "note",
           value: event,
           showPubkey,
-          addSpaceBelow: false,
         })
 
         previousDate = date
@@ -245,9 +240,6 @@
         previousCreatedAt = event.created_at
         seen.add(event.id)
       }
-      if (elements.length > 0) {
-        elements[elements.length - 1].addSpaceBelow = true
-      }
     }
 
     elements.reverse()
@@ -318,13 +310,13 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent bind:element onscroll={onScroll} class="flex flex-col-reverse pt-4 pb-0!">
+<PageContent bind:element onscroll={onScroll} class="flex-col-reverse !mb-0">
   {#if loadingForward}
     <p class="py-20 flex justify-center">
       <Spinner loading={loadingForward}>Looking for messages...</Spinner>
     </p>
   {/if}
-  {#each elements as { type, id, value, showPubkey, addSpaceBelow }, i (id)}
+  {#each elements as { type, id, value, showPubkey }, i (id)}
     {#if type === "new-messages"}
       <div
         {id}
@@ -347,8 +339,7 @@
           {replyTo}
           {showPubkey}
           canEdit={canEditEvent}
-          onEdit={onEditEvent}
-          {addSpaceBelow} />
+          onEdit={onEditEvent} />
       {/if}
     {/if}
   {/each}
diff --git a/src/routes/spaces/[relay]/classifieds/+page.svelte b/src/routes/spaces/[relay]/classifieds/+page.svelte
index 4188b4e8..b86ce8bc 100644
--- a/src/routes/spaces/[relay]/classifieds/+page.svelte
+++ b/src/routes/spaces/[relay]/classifieds/+page.svelte
@@ -77,7 +77,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent bind:element class="flex flex-col gap-2 p-2 pt-4">
+<PageContent bind:element class="flex flex-col gap-2 p-2">
   {#each items as event (event.id)}
     <div in:fly>
       <ClassifiedItem {url} event={$state.snapshot(event)} />
diff --git a/src/routes/spaces/[relay]/classifieds/[address]/+page.svelte b/src/routes/spaces/[relay]/classifieds/[address]/+page.svelte
index f1abc2c7..3d76cc20 100644
--- a/src/routes/spaces/[relay]/classifieds/[address]/+page.svelte
+++ b/src/routes/spaces/[relay]/classifieds/[address]/+page.svelte
@@ -61,7 +61,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent class="flex flex-col p-2 pt-4">
+<PageContent class="flex flex-col gap-2 p-2">
   {#if $event}
     <div class="flex flex-col gap-3">
       <NoteCard event={$event} {url} class="card2 bg-alt z-feature w-full">
@@ -90,7 +90,7 @@
     {#if showReply}
       <EventReply {url} event={$event} onClose={closeReply} onSubmit={closeReply} />
     {:else}
-      <div class="flex justify-end p-2">
+      <div class="flex justify-end">
         <Button class="btn btn-primary" onclick={openReply}>
           <Icon icon={Reply} />
           Reply to listing
@@ -98,7 +98,7 @@
       </div>
     {/if}
   {:else}
-    <div class="py-20 m-auto">
+    <div class="flex justify-center py-20">
       {#await sleep(5000)}
         <Spinner loading>Loading listing...</Spinner>
       {:then}
diff --git a/src/routes/spaces/[relay]/goals/+page.svelte b/src/routes/spaces/[relay]/goals/+page.svelte
index d49268cb..e2370257 100644
--- a/src/routes/spaces/[relay]/goals/+page.svelte
+++ b/src/routes/spaces/[relay]/goals/+page.svelte
@@ -76,7 +76,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent bind:element class="flex flex-col gap-2 p-2 pt-4">
+<PageContent bind:element class="flex flex-col gap-2 p-2">
   {#each items as event (event.id)}
     <div in:fly>
       <GoalItem {url} event={$state.snapshot(event)} />
diff --git a/src/routes/spaces/[relay]/goals/[id]/+page.svelte b/src/routes/spaces/[relay]/goals/[id]/+page.svelte
index 23dadf7b..44be8900 100644
--- a/src/routes/spaces/[relay]/goals/[id]/+page.svelte
+++ b/src/routes/spaces/[relay]/goals/[id]/+page.svelte
@@ -62,7 +62,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent class="flex flex-col p-2 pt-4">
+<PageContent class="flex flex-col gap-2 p-2">
   {#if $event}
     <div class="flex flex-col gap-3">
       <NoteCard event={$event} {url} class="card2 bg-alt z-feature w-full">
@@ -91,7 +91,7 @@
     {#if showReply}
       <EventReply {url} event={$event} onClose={closeReply} onSubmit={closeReply} />
     {:else}
-      <div class="flex justify-end p-2">
+      <div class="flex justify-end">
         <Button class="btn btn-primary" onclick={openReply}>
           <Icon icon={Reply} />
           Comment on this goal
@@ -99,10 +99,12 @@
       </div>
     {/if}
   {:else}
-    {#await sleep(5000)}
-      <Spinner loading>Loading funding goal...</Spinner>
-    {:then}
-      <p>Failed to load funding goal.</p>
-    {/await}
+    <div class="flex justify-center py-20">
+      {#await sleep(5000)}
+        <Spinner loading>Loading funding goal...</Spinner>
+      {:then}
+        <p>Failed to load funding goal.</p>
+      {/await}
+    </div>
   {/if}
 </PageContent>
diff --git a/src/routes/spaces/[relay]/polls/+page.svelte b/src/routes/spaces/[relay]/polls/+page.svelte
index f217f390..5faa9fac 100644
--- a/src/routes/spaces/[relay]/polls/+page.svelte
+++ b/src/routes/spaces/[relay]/polls/+page.svelte
@@ -76,7 +76,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent bind:element class="flex flex-col gap-2 p-2 pt-4">
+<PageContent bind:element class="flex flex-col gap-2 p-2">
   {#each items as event (event.id)}
     <div in:fly>
       <PollItem {url} event={$state.snapshot(event)} />
diff --git a/src/routes/spaces/[relay]/polls/[id]/+page.svelte b/src/routes/spaces/[relay]/polls/[id]/+page.svelte
index 38fc649f..44f86701 100644
--- a/src/routes/spaces/[relay]/polls/[id]/+page.svelte
+++ b/src/routes/spaces/[relay]/polls/[id]/+page.svelte
@@ -63,7 +63,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent class="flex flex-col gap-3 p-2 pt-4">
+<PageContent class="flex flex-col gap-2 p-2">
   {#if $event}
     <div class="flex flex-col gap-3">
       <NoteCard event={$event} {url} class="card2 bg-alt z-feature w-full">
@@ -92,15 +92,17 @@
     {#if showReply}
       <EventReply {url} event={$event} onClose={closeReply} onSubmit={closeReply} />
     {:else}
-      <div class="flex justify-end p-2">
+      <div class="flex justify-end">
         <Button class="btn btn-primary" onclick={openReply}>Comment on this poll</Button>
       </div>
     {/if}
   {:else}
-    {#await sleep(5000)}
-      <Spinner loading>Loading poll...</Spinner>
-    {:then}
-      <p>Failed to load poll.</p>
-    {/await}
+    <div class="flex justify-center py-20">
+      {#await sleep(5000)}
+        <Spinner loading>Loading poll...</Spinner>
+      {:then}
+        <p>Failed to load poll.</p>
+      {/await}
+    </div>
   {/if}
 </PageContent>
diff --git a/src/routes/spaces/[relay]/recent/+page.svelte b/src/routes/spaces/[relay]/recent/+page.svelte
index 0a12a0d3..f69fd88a 100644
--- a/src/routes/spaces/[relay]/recent/+page.svelte
+++ b/src/routes/spaces/[relay]/recent/+page.svelte
@@ -292,7 +292,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent class="flex flex-col gap-2 p-2 pt-4" bind:element>
+<PageContent class="flex flex-col gap-2 p-2" bind:element>
   {#if $recentActivity.length === 0}
     <p class="flex flex-col items-center py-20 text-center">No recent activity found!</p>
   {:else}
diff --git a/src/routes/spaces/[relay]/threads/+page.svelte b/src/routes/spaces/[relay]/threads/+page.svelte
index b2733663..7d48ecbb 100644
--- a/src/routes/spaces/[relay]/threads/+page.svelte
+++ b/src/routes/spaces/[relay]/threads/+page.svelte
@@ -77,7 +77,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent bind:element class="flex flex-col gap-2 p-2 pt-4">
+<PageContent bind:element class="flex flex-col gap-2 p-2">
   {#each items as event (event.id)}
     <div in:fly>
       <ThreadItem {url} event={$state.snapshot(event)} />
diff --git a/src/routes/spaces/[relay]/threads/[id]/+page.svelte b/src/routes/spaces/[relay]/threads/[id]/+page.svelte
index cd04e78a..44489319 100644
--- a/src/routes/spaces/[relay]/threads/[id]/+page.svelte
+++ b/src/routes/spaces/[relay]/threads/[id]/+page.svelte
@@ -61,7 +61,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent class="flex flex-col p-2 pt-4">
+<PageContent class="flex flex-col gap-2 p-2">
   {#if $event}
     <div class="flex flex-col gap-3">
       <NoteCard event={$event} {url} class="card2 bg-alt z-feature w-full">
@@ -90,7 +90,7 @@
     {#if showReply}
       <EventReply {url} event={$event} onClose={closeReply} onSubmit={closeReply} />
     {:else}
-      <div class="flex justify-end p-2">
+      <div class="flex justify-end">
         <Button class="btn btn-primary" onclick={openReply}>
           <Icon icon={Reply} />
           Reply to thread
@@ -98,10 +98,12 @@
       </div>
     {/if}
   {:else}
-    {#await sleep(5000)}
-      <Spinner loading>Loading thread...</Spinner>
-    {:then}
-      <p>Failed to load thread.</p>
-    {/await}
+    <div class="flex justify-center py-20">
+      {#await sleep(5000)}
+        <Spinner loading>Loading thread...</Spinner>
+      {:then}
+        <p>Failed to load thread.</p>
+      {/await}
+    </div>
   {/if}
 </PageContent>
diff --git a/src/routes/spaces/create/+page.svelte b/src/routes/spaces/create/+page.svelte
index 1ea49ccf..a02b4085 100644
--- a/src/routes/spaces/create/+page.svelte
+++ b/src/routes/spaces/create/+page.svelte
@@ -10,7 +10,7 @@
 </script>
 
 <Page>
-  <PageContent class="flex flex-col items-center gap-2 p-2 pt-4">
+  <PageContent class="flex flex-col items-center gap-2 p-2">
     <PageHeader>
       {#snippet title()}
         <div>Choose your Hosting Plan</div>