From 39fcf86e21971bd979ab1c3c89b64e3627e46483 Mon Sep 17 00:00:00 2001
From: awesomerobot <kris.aubuchon@discourse.org>
Date: Tue, 3 Feb 2026 13:26:42 -0500
Subject: [PATCH] UX: general layout fixes for core changes

---
 about.json                                    |  3 ++
 common/common.scss                            | 50 ++++++++++++++++---
 .../discourse/components/custom-sidebar.gjs   | 12 ++---
 mobile/mobile.scss                            |  4 ++
 4 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/about.json b/about.json
index ec547b13..f0740a8b 100644
--- a/about.json
+++ b/about.json
@@ -24,5 +24,8 @@
     ],
     "serialize_topic_excerpts": true
   },
+  "theme_site_settings": {
+    "enable_welcome_banner": false
+  },
   "screenshots": ["screenshots/light.png", "screenshots/dark.png"]
 }
diff --git a/common/common.scss b/common/common.scss
index e0754d55..8f742cfb 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -24,7 +24,7 @@
       grid-area: alerts;
     }
 
-    .container:nth-of-type(2),
+    #main-container.container,
     .tag-info {
       grid-area: pins;
     }
@@ -42,13 +42,9 @@
       }
     }
 
-    .list-container + span {
+    .list-container + .dbook-sidebar {
       grid-area: sidebar;
-
-      .custom-sidebar-connector,
-      .dbook-sidebar {
-        display: block;
-      }
+      display: block;
 
       @media screen and (width <= 920px) {
         display: none;
@@ -95,6 +91,10 @@
       }
     }
 
+    .welcome-banner {
+      display: none;
+    }
+
     .latest-topic-list .table-heading,
     .top-topic-list .table-heading {
       padding-top: 0;
@@ -525,6 +525,9 @@ body {
   padding: 1em;
   margin-bottom: 0.5em;
   color: var(--primary, $primary);
+  align-self: start;
+  position: sticky;
+  top: calc(var(--header-offset) + 1em);
 
   @include fb-background;
 
@@ -547,6 +550,7 @@ body {
   }
 
   .sign-up-button {
+    display: block;
     margin-top: 1em;
   }
 
@@ -599,6 +603,10 @@ body {
       font-size: 0.9em;
     }
   }
+
+  .user-badge {
+    margin-bottom: 0.25em;
+  }
 }
 
 // Topic
@@ -623,7 +631,27 @@ body {
 }
 
 .topic-map {
-  border-radius: 4px;
+  &.--op {
+    padding-left: 0;
+  }
+}
+
+.small-action {
+  &.time-gap {
+    .small-action-desc {
+      padding-left: 0;
+    }
+  }
+
+  .small-action-desc {
+    border: none;
+  }
+}
+
+.small-action.topic-post-visited
+  .topic-post-visited-line
+  .topic-post-visited-message {
+  background: var(--primary-low);
 }
 
 .topic-avatar {
@@ -1146,6 +1174,7 @@ body {
 
       .raw-link {
         display: block;
+        padding-left: 0;
       }
     }
 
@@ -1164,6 +1193,7 @@ body {
   }
 
   .topic-list-op {
+    margin-bottom: 1em;
     font-size: var(--font-down-1);
 
     > a {
@@ -1351,3 +1381,7 @@ section.tag-info {
 .chat-messages-container {
   background: var(--secondary);
 }
+
+.topic-post-badges {
+  align-self: inherit;
+}
diff --git a/javascripts/discourse/components/custom-sidebar.gjs b/javascripts/discourse/components/custom-sidebar.gjs
index f6a9d3cc..3288198c 100644
--- a/javascripts/discourse/components/custom-sidebar.gjs
+++ b/javascripts/discourse/components/custom-sidebar.gjs
@@ -105,12 +105,12 @@ export default class CustomSidebar extends Component {
           </div>
         {{/unless}}
       </ConditionalLoadingSpinner>
-    </div>
 
-    {{#if this.currentUser}}
-      <a class="sidebar-link" href="/my/summary">
-        {{i18n (themePrefix "sidebar.full_profile")}}
-      </a>
-    {{/if}}
+      {{#if this.currentUser}}
+        <a class="sidebar-link" href="/my/summary">
+          {{i18n (themePrefix "sidebar.full_profile")}}
+        </a>
+      {{/if}}
+    </div>
   </template>
 }
diff --git a/mobile/mobile.scss b/mobile/mobile.scss
index 52bdcd67..cfbcf899 100644
--- a/mobile/mobile.scss
+++ b/mobile/mobile.scss
@@ -127,6 +127,10 @@ tr {
   }
 }
 
+.category-list.with-topics .category-list-item {
+  border: none !important; // overrides specific style
+}
+
 // topic list
 
 // The mobile template is different