From aad014ed2961ce660e8a4d6474a6197bee41f69c Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 6 May 2021 21:17:40 +0800
Subject: ...

---
 FrontEnd/src/app/palette.ts               | 7 +++++--
 FrontEnd/src/app/views/common/common.sass | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'FrontEnd/src')

diff --git a/FrontEnd/src/app/palette.ts b/FrontEnd/src/app/palette.ts
index 63a70c4e..98e7d814 100644
--- a/FrontEnd/src/app/palette.ts
+++ b/FrontEnd/src/app/palette.ts
@@ -34,7 +34,10 @@ export function generatePaletteColor(color: string): PaletteColor {
   const c = Color(color);
   return {
     color: c.toString(),
-    inactive: (c.isLight() ? darkenBy(c, 0.2) : lightenBy(c, 0.2)).toString(),
+    inactive: (c.lightness() > 60
+      ? darkenBy(c, 0.1)
+      : lightenBy(c, 0.2)
+    ).toString(),
     lighter: lightenBy(c, 0.1).fade(0.1).toString(),
     darker: darkenBy(c, 0.1).toString(),
   };
@@ -58,7 +61,7 @@ export function generatePalette(options: {
     primaryEnhance: generatePaletteColor(pe.toString()),
     secondary: generatePaletteColor(s.toString()),
     textPrimary: generatePaletteColor("#111111"),
-    textOnPrimary: generatePaletteColor(p.isLight() ? "black" : "white"),
+    textOnPrimary: generatePaletteColor(p.lightness() > 60 ? "black" : "white"),
     danger: generatePaletteColor("red"),
     success: generatePaletteColor("green"),
   };
diff --git a/FrontEnd/src/app/views/common/common.sass b/FrontEnd/src/app/views/common/common.sass
index 3561c3da..1a49357c 100644
--- a/FrontEnd/src/app/views/common/common.sass
+++ b/FrontEnd/src/app/views/common/common.sass
@@ -50,6 +50,9 @@
     text-decoration: none
     margin: 0 1em
 
+    &:hover
+      color: var(--tl-text-on-primary-color)
+
     &.active
       color: var(--tl-text-on-primary-color)
 
-- 
cgit v1.2.3