From 328b8cbab5a9756d901ab8b8bc2195531f7de112 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Thu, 6 Mar 2025 13:00:56 -0600
Subject: [PATCH] UX: More desktop tweaks (#20)

---
 about.json          |  6 +++---
 scss/box-view.scss  | 12 ++++++++++++
 scss/buttons.scss   | 10 +++++-----
 scss/chat.scss      | 33 ++++++++++++++++++++++++++++++---
 scss/main.scss      | 14 +++++++++++++-
 scss/nav-pills.scss | 10 +++++++---
 scss/sidebar.scss   |  5 ++++-
 scss/topic.scss     | 17 +++++++++++++++++
 scss/variables.scss |  1 +
 9 files changed, 92 insertions(+), 16 deletions(-)

diff --git a/about.json b/about.json
index 16a0c2e..ac907fe 100644
--- a/about.json
+++ b/about.json
@@ -1,5 +1,5 @@
 {
-  "name": "next-gen",
+  "name": "Horizon Theme",
   "authors": "Design Team",
   "about_url": "TODO: Put your theme's public repo or Meta topic URL here",
   "license_url": "TODO: Put your theme's LICENSE URL here",
@@ -17,7 +17,7 @@
     "https://github.com/discourse/discourse-full-width-component.git"
   ],
   "color_schemes": {
-    "next_gen": {
+    "Horizon": {
       "primary": "1A1A1A",
       "primary-low": "ebecf9",
       "primary-500": "8591ad",
@@ -29,7 +29,7 @@
       "selected": "d8d9f3",
       "hover": "ebebf9"
     },
-    "next_gen_dark": {
+    "Horizon Dark": {
       "primary": "F1EFF9",
       "secondary": "1e1a36",
       "header_background": "00091d",
diff --git a/scss/box-view.scss b/scss/box-view.scss
index 4dffa9b..8b7d04a 100644
--- a/scss/box-view.scss
+++ b/scss/box-view.scss
@@ -5,6 +5,18 @@
   }
 }
 
+.chat-drawer-active.chat-drawer-expanded {
+  .experimental-screen {
+    &__top-left,
+    &__top-right,
+    &__bottom-left,
+    &__bottom-right,
+    &__bottom-bar {
+      z-index: 199;
+    }
+  }
+}
+
 .has-full-page-chat .experimental-screen {
   display: none;
 }
diff --git a/scss/buttons.scss b/scss/buttons.scss
index ad05da7..58aa071 100644
--- a/scss/buttons.scss
+++ b/scss/buttons.scss
@@ -34,9 +34,8 @@
   }
 }
 
-.btn-default,
-.select-kit .select-kit-header {
-  border: 1px solid var(--accent-color);
+.btn-default {
+  border: 1px solid var(--primary-300);
   //id like to use rgba of the accent colour but how to derive that?
   // box-shadow: 0px 0px 8px 2px oklch(from (var(--accent-color)) calc(l * 2) calc(c * 0.125) h);
   background: var(--secondary);
@@ -46,8 +45,9 @@
   }
   &:hover {
     .discourse-no-touch & {
-      border: 1px solid transparent;
-      box-shadow: 0px 0px 8px 2px rgba(0, 0, 0, 0.1);
+      border: 1px solid var(--accent-color);
+      box-shadow: 0px 0px 8px 2px
+        oklch(from (var(--accent-color)) calc(l * 2) calc(c * 0.125) h);
       background: var(--secondary);
       color: var(--accent-color);
       .d-icon {
diff --git a/scss/chat.scss b/scss/chat.scss
index 964a7c4..e05517b 100644
--- a/scss/chat.scss
+++ b/scss/chat.scss
@@ -1,16 +1,43 @@
 .full-page-chat.full-page-chat-sidebar-enabled {
   border-top-left-radius: var(--d-border-radius-large);
-  box-shadow: 0px 0px 1px 2px var(--tertiary-100),
-    0px 0px 24px 4px var(--tertiary-100);
+  border-top-right-radius: var(--d-border-radius-large);
+  box-shadow: 0px 0px 0px 2px
+      oklch(from var(--accent-color) calc(l * 2) calc(c * 0.125) h),
+    0px 0px 8px 2px
+      oklch(from var(--accent-color) calc(l * 2) calc(c * 0.125) h);
   border: none;
 }
 
 .c-navbar-container {
   border-top-left-radius: var(--d-border-radius-large);
-  padding: 0 1.5rem;
+  border-top-right-radius: var(--d-border-radius-large);
+  padding: 0 1.5em;
   background-color: var(--d-content-background);
 }
 
 body.has-full-page-chat {
   background-color: var(--background-color);
 }
+
+.chat-drawer .chat-drawer-container {
+  box-shadow: 0px 0px 0px 2px
+      oklch(from var(--accent-color) calc(l * 2) calc(c * 0.125) h),
+    0px 0px 8px 2px
+      oklch(from var(--accent-color) calc(l * 2) calc(c * 0.125) h);
+  border: none;
+}
+
+.chat-drawer .channels-list-container .chat-channel-row {
+  margin-bottom: var(--spacing-block-xs);
+  font-size: var(--font-up-1);
+  border-radius: var(--d-border-radius);
+  &:hover {
+    background-color: var(--d-sidebar-active-background);
+  }
+}
+
+.channel-title {
+  font-weight: bold;
+  text-transform: uppercase;
+  font-size: var(--font-down-1);
+}
diff --git a/scss/main.scss b/scss/main.scss
index af78304..9651ead 100644
--- a/scss/main.scss
+++ b/scss/main.scss
@@ -6,6 +6,17 @@ html:not(:has(.has-full-page-chat)) {
   --main-grid-gap: 2em;
 }
 
+body.has-sidebar-page.has-full-page-chat #main-outlet-wrapper {
+  grid-column-gap: var(--main-grid-gap);
+}
+
+body.has-sidebar-page #main-outlet-wrapper {
+  grid-template-columns: var(--d-sidebar-width) 1fr 0px;
+  #main-outlet {
+    max-width: unset;
+  }
+}
+
 body:not(.has-full-page-chat) {
   background-color: var(--background-color);
   #main-outlet-wrapper {
@@ -45,7 +56,8 @@ body:not(.has-full-page-chat) {
       .discourse-post-event-upcoming-events,
       .container.groups-index,
       .body-page,
-      .container.badges {
+      .container.badges,
+      .topic-above-footer-buttons-outlet .presence-users {
         max-width: 1000px;
         margin-inline: auto;
         padding-inline: 1.5em;
diff --git a/scss/nav-pills.scss b/scss/nav-pills.scss
index ec0fc44..e024263 100644
--- a/scss/nav-pills.scss
+++ b/scss/nav-pills.scss
@@ -12,13 +12,17 @@
       order: 1;
     }
   }
-  .combo-box .combo-box-header,
-  .discourse-post-event .discourse-post-event-widget {
+  .combo-box .combo-box-header {
     // needs more specificy than just in the button file
     background-color: var(--secondary);
-    border: 1px solid var(--accent-color);
     border-radius: var(--d-border-radius-large);
+    border: 1px solid var(--primary-300);
     // font-size: var(--font-up-1-rem);
+    &:hover {
+      border: 1px solid var(--accent-color);
+      box-shadow: 0px 0px 8px 2px
+        oklch(from (var(--accent-color)) calc(l * 2) calc(c * 0.125) h);
+    }
   }
   .select-kit.combo-box.category-drop.has-selection
     .category-drop-header:hover {
diff --git a/scss/sidebar.scss b/scss/sidebar.scss
index 39f4ba3..706bfc5 100644
--- a/scss/sidebar.scss
+++ b/scss/sidebar.scss
@@ -15,8 +15,11 @@
     // dont want to change fonts here just yet as font-size can be changed as a user pref.
     // – charlie: sure but I want it to be bigger by default
     // letter-spacing: 0.5px;
-    border-radius: 10px; // visually somewhat consistent with border on main outlet (?)
     transition: none;
+    border-radius: var(--d-border-radius);
+  }
+  .dropdown-menu__item .sidebar-section-link {
+    border-radius: 0px;
   }
 }
 .sidebar-section-wrapper {
diff --git a/scss/topic.scss b/scss/topic.scss
index ee2b288..6bcdae6 100644
--- a/scss/topic.scss
+++ b/scss/topic.scss
@@ -62,6 +62,23 @@
   padding: 0 24px;
 }
 
+.container.posts {
+  grid-template-columns: auto 150px;
+  @media screen and (max-width: 924px) {
+    grid-template-columns: auto auto;
+  }
+}
+
+.timeline-container .topic-timeline .timeline-ago {
+  max-width: unset;
+  overflow: unset;
+  text-overflow: unset;
+}
+
+.timeline-container .topic-timeline .timeline-scroller-content {
+  overflow: unset;
+}
+
 .more-topics__container
   .more-topics__list
   .topic-list-body
diff --git a/scss/variables.scss b/scss/variables.scss
index 2fad870..e268b0d 100644
--- a/scss/variables.scss
+++ b/scss/variables.scss
@@ -1,5 +1,6 @@
 :root {
   color-scheme: light dark;
+  --d-max-width: 1000px;
   --d-border-radius-large: 20px;
   --d-border-radius: 8px;
   --d-input-border-radius: 6px;