From 5907b7090ee89b2aebe61f75a818810846963318 Mon Sep 17 00:00:00 2001
From: Nriver <6752679+Nriver@users.noreply.github.com>
Date: Tue, 9 Dec 2025 10:45:25 +0800
Subject: [PATCH 1/4] fix note title color for legacy themes

---
 apps/client/src/stylesheets/theme-dark.css  | 6 +++++-
 apps/client/src/stylesheets/theme-light.css | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/client/src/stylesheets/theme-dark.css b/apps/client/src/stylesheets/theme-dark.css
index 690d49ecd..3630e6a42 100644
--- a/apps/client/src/stylesheets/theme-dark.css
+++ b/apps/client/src/stylesheets/theme-dark.css
@@ -114,4 +114,8 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
 
 .use-note-color {
     --custom-color: var(--dark-theme-custom-color);
-}
\ No newline at end of file
+}
+
+span.fancytree-active {
+    color: var(--dark-theme-custom-color);
+}
diff --git a/apps/client/src/stylesheets/theme-light.css b/apps/client/src/stylesheets/theme-light.css
index 0c14a2d92..c5c508f7c 100644
--- a/apps/client/src/stylesheets/theme-light.css
+++ b/apps/client/src/stylesheets/theme-light.css
@@ -98,4 +98,8 @@ html {
 
 .use-note-color {
     --custom-color: var(--light-theme-custom-color);
-}
\ No newline at end of file
+}
+
+span.fancytree-active {
+    color: var(--light-theme-custom-color);
+}

From 641176011ff6748fb7c770375d958f03d062b1bf Mon Sep 17 00:00:00 2001
From: Nate River <6752679+Nriver@users.noreply.github.com>
Date: Wed, 17 Dec 2025 11:25:35 +0800
Subject: [PATCH 2/4] Update apps/client/src/stylesheets/theme-dark.css

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---
 apps/client/src/stylesheets/theme-dark.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/client/src/stylesheets/theme-dark.css b/apps/client/src/stylesheets/theme-dark.css
index 3630e6a42..6912533fa 100644
--- a/apps/client/src/stylesheets/theme-dark.css
+++ b/apps/client/src/stylesheets/theme-dark.css
@@ -117,5 +117,5 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
 }
 
 span.fancytree-active {
-    color: var(--dark-theme-custom-color);
+    color: var(--custom-color, var(--active-item-text-color));
 }

From 35a109616cabe9a4ac0c92a97eb0373b12c1931f Mon Sep 17 00:00:00 2001
From: Nate River <6752679+Nriver@users.noreply.github.com>
Date: Wed, 17 Dec 2025 11:25:41 +0800
Subject: [PATCH 3/4] Update apps/client/src/stylesheets/theme-light.css

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---
 apps/client/src/stylesheets/theme-light.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/client/src/stylesheets/theme-light.css b/apps/client/src/stylesheets/theme-light.css
index c5c508f7c..97bb386fa 100644
--- a/apps/client/src/stylesheets/theme-light.css
+++ b/apps/client/src/stylesheets/theme-light.css
@@ -101,5 +101,5 @@ html {
 }
 
 span.fancytree-active {
-    color: var(--light-theme-custom-color);
+    color: var(--custom-color, var(--active-item-text-color));
 }

From cecf7e6afbc9cf6c14fbc813994c9b78f79c4bab Mon Sep 17 00:00:00 2001
From: Adorian Doran <adorian@esevo.ro>
Date: Thu, 25 Dec 2025 11:34:41 +0200
Subject: [PATCH 4/4] style/selected tree item color: use the color adjusted
 for readability

---
 apps/client/src/stylesheets/theme-dark.css  | 2 +-
 apps/client/src/stylesheets/theme-light.css | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/client/src/stylesheets/theme-dark.css b/apps/client/src/stylesheets/theme-dark.css
index 84fc30db6..5bff3262f 100644
--- a/apps/client/src/stylesheets/theme-dark.css
+++ b/apps/client/src/stylesheets/theme-dark.css
@@ -117,5 +117,5 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
 }
 
 span.fancytree-active {
-    color: var(--custom-color, var(--active-item-text-color));
+    color: var(--dark-theme-custom-color, var(--active-item-text-color));
 }
diff --git a/apps/client/src/stylesheets/theme-light.css b/apps/client/src/stylesheets/theme-light.css
index 34c4e8b4b..f421827d4 100644
--- a/apps/client/src/stylesheets/theme-light.css
+++ b/apps/client/src/stylesheets/theme-light.css
@@ -99,10 +99,7 @@ html {
 .use-note-color {
     --custom-color: var(--light-theme-custom-color);
 }
-<<<<<<< HEAD
 
 span.fancytree-active {
-    color: var(--custom-color, var(--active-item-text-color));
+    color: var(--light-theme-custom-color, var(--active-item-text-color));
 }
-=======
->>>>>>> a47ea0d653757e0336f693072bc1cd7df6772f9f