diff options
author | kytwb <kytwb@pm.me> | 2022-01-02 20:45:58 +0100 |
---|---|---|
committer | kytwb <kytwb@pm.me> | 2022-01-02 20:45:58 +0100 |
commit | c7dd7be2879635bb74e90cc88b8018193bc14d33 (patch) | |
tree | 715568cd061f81ee544d5663903b5709f02dab5b /src/features | |
parent | Iterate on settings appearance (diff) | |
download | ferdium-app-c7dd7be2879635bb74e90cc88b8018193bc14d33.tar.gz ferdium-app-c7dd7be2879635bb74e90cc88b8018193bc14d33.tar.zst ferdium-app-c7dd7be2879635bb74e90cc88b8018193bc14d33.zip |
Handle invalid accent color, fix loader styling
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/appearance/index.ts | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/features/appearance/index.ts b/src/features/appearance/index.ts index ea19b9759..9c0268707 100644 --- a/src/features/appearance/index.ts +++ b/src/features/appearance/index.ts | |||
@@ -26,11 +26,12 @@ function darkenAbsolute(originalColor, absoluteChange) { | |||
26 | } | 26 | } |
27 | 27 | ||
28 | function generateAccentStyle(accentColorStr) { | 28 | function generateAccentStyle(accentColorStr) { |
29 | let accentColor = color(DEFAULT_APP_SETTINGS.accentColor); | 29 | let accentColor; |
30 | try { | 30 | try { |
31 | accentColor = color(accentColorStr); | 31 | accentColor = color(accentColorStr); |
32 | } catch { | 32 | } catch { |
33 | // Ignore invalid accent color. | 33 | accentColorStr = DEFAULT_APP_SETTINGS.accentColor; |
34 | accentColor = color(accentColorStr); | ||
34 | } | 35 | } |
35 | const darkerColorStr = darkenAbsolute(accentColor, 5).hex(); | 36 | const darkerColorStr = darkenAbsolute(accentColor, 5).hex(); |
36 | return ` | 37 | return ` |
@@ -69,7 +70,8 @@ function generateAccentStyle(accentColorStr) { | |||
69 | .theme__dark .franz-form__button, | 70 | .theme__dark .franz-form__button, |
70 | .franz-form__button, | 71 | .franz-form__button, |
71 | .ferdi__fab, | 72 | .ferdi__fab, |
72 | .franz-form .franz-form__slider-wrapper .slider::-webkit-slider-thumb { | 73 | .franz-form .franz-form__slider-wrapper .slider::-webkit-slider-thumb, |
74 | span.loader div > div > div { | ||
73 | background: ${accentColorStr}; | 75 | background: ${accentColorStr}; |
74 | } | 76 | } |
75 | 77 | ||