From a4560d562dd08f2584b220f786aaaaa461361120 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 30 Dec 2024 17:32:57 +0200
Subject: [PATCH 1/3] fix tests

---
 src/services/color_convert/color_convert.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/color_convert/color_convert.js b/src/services/color_convert/color_convert.js
index 8a0531be6..a8b0f7741 100644
--- a/src/services/color_convert/color_convert.js
+++ b/src/services/color_convert/color_convert.js
@@ -216,7 +216,7 @@ export const getTextColor = function (bg, text, preserve) {
   }
 
   const base = typeof text.a !== 'undefined' ? { a: text.a } : {}
-  return Object.assign(base, result)
+  return Object.assign(convert(result).rgb, base)
 }
 
 /**

From 5e098c123127fd289ac4c4fab8d8ae6e875c63ea Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 30 Dec 2024 20:41:38 +0200
Subject: [PATCH 2/3] better topbar consistency

---
 src/components/desktop_nav/desktop_nav.scss |  8 --------
 src/components/top_bar.style.js             | 12 ++++++++++++
 static/palettes/index.json                  |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
index 61d2541ca..0c094ce28 100644
--- a/src/components/desktop_nav/desktop_nav.scss
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -6,10 +6,6 @@
     color: var(--inputTopbarText, var(--inputText));
   }
 
-  a {
-    color: var(--link);
-  }
-
   .inner-nav {
     display: grid;
     grid-template-rows: var(--navbar-height);
@@ -91,10 +87,6 @@
     width: 2em;
     height: 100%;
     text-align: center;
-
-    .svg-inline--fa {
-      color: var(--link);
-    }
   }
 
   .sitename {
diff --git a/src/components/top_bar.style.js b/src/components/top_bar.style.js
index 20181adc0..daee80afe 100644
--- a/src/components/top_bar.style.js
+++ b/src/components/top_bar.style.js
@@ -32,6 +32,18 @@ export default {
       directives: {
         textColor: '--text'
       }
+    },
+    {
+      component: 'Icon',
+      parent: {
+        component: 'ButtonUnstyled',
+        parent: {
+          component: 'TopBar'
+        }
+      },
+      directives: {
+        textColor: '--parent--text'
+      }
     }
   ]
 }
diff --git a/static/palettes/index.json b/static/palettes/index.json
index 198a16689..2cd110d1e 100644
--- a/static/palettes/index.json
+++ b/static/palettes/index.json
@@ -54,6 +54,7 @@
     "bg": "#323337",
     "fg": "#1D1E21",
     "link": "#18A0E3",
+    "accent": "#6671E2",
     "text": "#DBDDE0",
     "cRed": "#E05053",
     "cBlue": "#6671E2",

From 3548075abb41baffb05ebd8f45886bb487ed3961 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 30 Dec 2024 20:56:50 +0200
Subject: [PATCH 3/3] i have no idea how this worked but now it actually works

---
 src/services/color_convert/color_convert.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/services/color_convert/color_convert.js b/src/services/color_convert/color_convert.js
index a8b0f7741..aa7dc8b94 100644
--- a/src/services/color_convert/color_convert.js
+++ b/src/services/color_convert/color_convert.js
@@ -197,7 +197,7 @@ export const getTextColor = function (bg, text, preserve) {
 
   const originalColor = convert(text).hex
   const invertedColor = invertLightness(originalColor).hex
-  const invertedContrast = getContrastRatio(bg, invertedColor)
+  const invertedContrast = getContrastRatio(bg, convert(invertedColor).rgb)
   let workColor
 
   if (invertedContrast > originalContrast) {
@@ -210,9 +210,10 @@ export const getTextColor = function (bg, text, preserve) {
   const result = convert(rgb2hex(workColor)).hsl
   const delta = result.l > 50 ? 1 : -1
   const multiplier = 10
-  while (contrast < 4.5) {
+  while (contrast < 4.5 && result.l > 0 && result.l < 100) {
     result.l += delta * multiplier
-    contrast = getContrastRatio(bg, result)
+    contrast = getContrastRatio(bg, convert(result).rgb)
+    console.log(convert(result).hex, result.l, contrast)
   }
 
   const base = typeof text.a !== 'undefined' ? { a: text.a } : {}