From cdcbffc483d0feb124c8a918d8a305228c88c5fc Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Thu, 3 Apr 2025 16:13:23 -0500
Subject: [PATCH] UX: More color fixes (#111)

---
 about.json                    | 16 ++++++-------
 common/color_definitions.scss |  6 +----
 scss/nav-pills.scss           |  4 ++--
 scss/search-banner.scss       | 45 +++++++++++++++++++----------------
 4 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/about.json b/about.json
index 3eefd84..a4cf862 100644
--- a/about.json
+++ b/about.json
@@ -40,8 +40,8 @@
     "Royal": {
       "primary": "1A1A1A",
       "secondary": "ffffff",
-      "tertiary": "288EDC",
-      "tertiary-med-or-tertiary": "288EDC",
+      "tertiary": "1F7BC1",
+      "tertiary-med-or-tertiary": "1F7BC1",
       "selected": "c7e3ff",
       "header_background": "ffffff",
       "header_primary": "1A1A1A",
@@ -50,8 +50,8 @@
     "Royal Dark": {
       "primary": "ffffff",
       "secondary": "1A1A1A",
-      "tertiary": "288EDC",
-      "tertiary-med-or-tertiary": "288EDC",
+      "tertiary": "1F7BC1",
+      "tertiary-med-or-tertiary": "1F7BC1",
       "selected": "3a455f",
       "header_background": "1A1A1A",
       "header_primary": "ffffff",
@@ -60,8 +60,8 @@
     "Clover": {
       "primary": "1A1A1A",
       "secondary": "ffffff",
-      "tertiary": "45a06e",
-      "tertiary-med-or-tertiary": "45a06e",
+      "tertiary": "39845B",
+      "tertiary-med-or-tertiary": "39845B",
       "selected": "c6f1d5",
       "header_background": "ffffff",
       "header_primary": "1A1A1A",
@@ -70,8 +70,8 @@
     "Clover Dark": {
       "primary": "ffffff",
       "secondary": "1A1A1A",
-      "tertiary": "45a06e",
-      "tertiary-med-or-tertiary": "45a06e",
+      "tertiary": "39845B",
+      "tertiary-med-or-tertiary": "39845B",
       "selected": "47594e",
       "header_background": "1A1A1A",
       "header_primary": "ffffff",
diff --git a/common/color_definitions.scss b/common/color_definitions.scss
index 5461b31..c087636 100644
--- a/common/color_definitions.scss
+++ b/common/color_definitions.scss
@@ -64,11 +64,7 @@ html {
   // Search Colors
   --search-color: light-dark(
     oklch(from #{$tertiary} l c h),
-    oklch(from #{$tertiary} calc(l * 1.5) c h)
-  ) !important;
-  --search-banner-text-color: light-dark(
-    oklch(from #{$tertiary} calc(l * 0.65) calc(c * 0.65) h),
-    oklch(from #{$tertiary} calc(l * 1.5) c h)
+    oklch(from #{$tertiary} calc(l * 1.5) calc(c * 0.25) h)
   ) !important;
 
   // Topic Card Colors
diff --git a/scss/nav-pills.scss b/scss/nav-pills.scss
index 82d4b18..13e8448 100644
--- a/scss/nav-pills.scss
+++ b/scss/nav-pills.scss
@@ -47,7 +47,7 @@
 .nav-pills > li button:hover {
   .discourse-no-touch & {
     background: transparent;
-    color: var(--accent-color);
+    color: var(--d-nav-color--hover);
     &::after {
       content: "";
       position: absolute;
@@ -55,7 +55,7 @@
       bottom: 0;
       right: 0;
       height: var(--d-nav-underline-height);
-      background: var(--accent-color);
+      background: var(--d-nav-color--hover);
     }
   }
 }
diff --git a/scss/search-banner.scss b/scss/search-banner.scss
index 22828a1..83543bc 100644
--- a/scss/search-banner.scss
+++ b/scss/search-banner.scss
@@ -21,7 +21,7 @@
     align-self: center;
     margin: 0;
     font-weight: 400;
-    color: var(--search-banner-text-color);
+    color: var(--search-color);
     @media screen and (max-width: 1028px) {
       font-size: var(--font-up-4);
       grid-column: 1/-1;
@@ -63,24 +63,27 @@
   p {
     display: none;
   }
-  .search-input {
-    background: var(--d-content-background);
-    border: 1px solid var(--search-color);
-    box-shadow: 0 4px 10px rgba(52, 6, 121, 15%);
-  }
-  .search-menu .search-input:focus-within,
-  .search-menu-container .search-input:focus-within {
-    border: 1px solid var(--search-color);
-    outline: 2px solid var(--search-color);
-  }
-  .search-menu .d-icon,
-  .search-menu .searching .d-icon {
-    color: var(--search-color);
-  }
-  .panel-body {
-    z-index: z("dropdown");
-  }
-  .results {
-    background: var(--d-content-background);
-  }
+}
+
+.search-menu .search-input,
+.search-menu-container .search-input {
+  background: var(--d-content-background);
+  border: 1px solid var(--search-color);
+  box-shadow: 0 4px 10px rgba(52, 6, 121, 15%);
+}
+.search-menu .search-input:focus-within,
+.search-menu-container .search-input:focus-within {
+  border: 1px solid var(--search-color);
+  outline: 2px solid var(--search-color);
+}
+.search-menu .d-icon,
+.search-menu .searching .d-icon,
+.search-menu .searching .show-advanced-search .d-icon {
+  color: var(--search-color);
+}
+.panel-body {
+  z-index: z("dropdown");
+}
+.results {
+  background: var(--d-content-background);
 }