From 11ba55e42f1e7db5bd07f59408eeea8fe67e048f Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Wed, 4 Oct 2023 00:14:27 +0200
Subject: [PATCH] Overhauled default themes with new brand colors

---
 packages/client/src/themes/_dark.json5       |  2 ++
 packages/client/src/themes/_light.json5      |  2 ++
 packages/client/src/themes/d-iceshrimp.json5 | 19 +++++++++++------
 packages/client/src/themes/l-iceshrimp.json5 | 22 ++++++++++----------
 packages/client/src/ui/_common_/navbar.vue   |  8 +++----
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/packages/client/src/themes/_dark.json5 b/packages/client/src/themes/_dark.json5
index 5d671b3ab..ce612d27a 100644
--- a/packages/client/src/themes/_dark.json5
+++ b/packages/client/src/themes/_dark.json5
@@ -31,6 +31,8 @@
 		panelHeaderFg: '@fg',
 		panelHeaderDivider: 'rgba(0, 0, 0, 0)',
 		panelBorder: '" solid 1px var(--divider)',
+		panelActiveFg: '@accent',
+		panelActiveBg: '@accentedBg',
 		acrylicPanel: ':alpha<0.5<@panel',
 		windowHeader: ':alpha<0.85<@panel',
 		pageHeader: ':alpha<0.85<@bg',
diff --git a/packages/client/src/themes/_light.json5 b/packages/client/src/themes/_light.json5
index 4aed71373..fabad29bb 100644
--- a/packages/client/src/themes/_light.json5
+++ b/packages/client/src/themes/_light.json5
@@ -31,6 +31,8 @@
 		panelHeaderFg: '@fg',
 		panelHeaderDivider: 'rgba(0, 0, 0, 0)',
 		panelBorder: '" solid 1px var(--divider)',
+		panelActiveFg: '@accent',
+		panelActiveBg: '@accentedBg',
 		acrylicPanel: ':alpha<0.5<@panel',
 		windowHeader: ':alpha<0.85<@panel',
 		pageHeader: ':alpha<0.85<@bg',
diff --git a/packages/client/src/themes/d-iceshrimp.json5 b/packages/client/src/themes/d-iceshrimp.json5
index ec24d7814..4b948b75e 100644
--- a/packages/client/src/themes/d-iceshrimp.json5
+++ b/packages/client/src/themes/d-iceshrimp.json5
@@ -1,15 +1,22 @@
 {
 	id: '0c74bfbe-c9b9-4a42-9798-2ee030e65f1c',
-
 	name: 'Iceshrimp Dark',
-	author: 'aylamz',
-
+	author: '@TyrKilcat@meow.social',
 	base: 'dark',
-
 	props: {
-		accent: '#47BFE8',
-		bg: '#212526',
+		fg: '#E7EDFF',
+		bg: '#3B364C',
+		accent: '#9A92FF',
 		shadow: 'rgba(0, 0, 0, 0)',
 		fgOnAccent: '@bg',
+		panel: ':lighten<3<@bg',
+		panelActiveBg: ':darken<1.5<@bg',
+		panelActiveFg: '@fg',
+		panelHeaderBg: ':lighten<1<@bg',
+		panelHighlight: ':lighten<6<@panel',
+		hashtag: ':darken<6<#91c0ff',
+		link: ':darken<6<#ff9891',
+		infoFg: ':lighten<6<@fg',
+		infoBg: ':darken<3<@bg',
 	},
 }
diff --git a/packages/client/src/themes/l-iceshrimp.json5 b/packages/client/src/themes/l-iceshrimp.json5
index 054fe0a06..b73489d41 100644
--- a/packages/client/src/themes/l-iceshrimp.json5
+++ b/packages/client/src/themes/l-iceshrimp.json5
@@ -1,21 +1,21 @@
 {
 	id: '360da846-debe-40f9-9f10-5ad035afa546',
-
 	name: 'Iceshrimp Light',
-	author: 'aylamz',
-
+	author: '@TyrKilcat@meow.social',
 	base: 'light',
-
 	props: {
-		fg: '#444',
-		bg: '#f7f7f7',
-		accent: '#008cff',
+		fg: '#3B364C',
+		bg: '#E7EDFF',
+		accent: '#9A92FF',
 		panel: ':lighten<3<@bg',
 		panelHeaderBg: ':lighten<1<@bg',
-		panelHighlight: ':darken<6<@bg',
+		panelActiveFg: '@fg',
+		panelActiveBg: ':lighten<12<@accent',
+		panelHighlight: ':darken<3<@bg',
 		shadow: 'rgba(0, 0, 0, 0)',
-		hashtag: '#c44100',
-		link: '#2c7386',
-		infoFg: '#212528',
+		hashtag: ':darken<20<#91c0ff',
+		link: ':darken<8<#ff9891',
+		infoFg: ':lighten<6<@fg',
+		infoBg: ':darken<6<@bg',
 	},
 }
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 5409fb824..5a631de3b 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -446,11 +446,11 @@ function more(ev: MouseEvent) {
 					}
 
 					&.active {
-						color: var(--accent);
+						color: var(--panelActiveFg);
 						transition: all 0.4s ease;
 
 						&:before {
-							background: var(--accentedBg);
+							background: var(--panelActiveBg);
 						}
 					}
 				}
@@ -603,7 +603,7 @@ function more(ev: MouseEvent) {
 					&:focus-within,
 					&.active {
 						text-decoration: none;
-						color: var(--accent);
+						color: var(--panelActiveFg);
 						transition: all 0.4s ease;
 
 						&:before {
@@ -635,7 +635,7 @@ function more(ev: MouseEvent) {
 
 					&.active {
 						&:before {
-							background: var(--accentedBg);
+							background: var(--panelActiveBg);
 						}
 					}
 				}