diff options
| author | crupest <crupest@outlook.com> | 2021-05-06 21:17:40 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2021-05-06 21:17:40 +0800 |
| commit | aad014ed2961ce660e8a4d6474a6197bee41f69c (patch) | |
| tree | 0f4996f7b6edbd00d1d38ea35c153e5db8ff6a22 /FrontEnd/src | |
| parent | a7d12775d7ea8f72122d5a35914c0fe566fcea73 (diff) | |
| download | timeline-aad014ed2961ce660e8a4d6474a6197bee41f69c.tar.gz timeline-aad014ed2961ce660e8a4d6474a6197bee41f69c.tar.bz2 timeline-aad014ed2961ce660e8a4d6474a6197bee41f69c.zip | |
...
Diffstat (limited to 'FrontEnd/src')
| -rw-r--r-- | FrontEnd/src/app/palette.ts | 7 | ||||
| -rw-r--r-- | FrontEnd/src/app/views/common/common.sass | 3 |
2 files changed, 8 insertions, 2 deletions
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)
|