From 19f880ed354581985d4018c5e8b2dcd09df424ae Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Tue, 10 Nov 2020 12:31:23 +0300 Subject: [PATCH] Removing !important statements from theme vars Signed-off-by: Alex Andreev --- src/renderer/components/app.scss | 1 - src/renderer/theme.store.ts | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/renderer/components/app.scss b/src/renderer/components/app.scss index 5d3b65f5e9..b7c492c9f5 100755 --- a/src/renderer/components/app.scss +++ b/src/renderer/components/app.scss @@ -23,7 +23,6 @@ --font-weight-thin: 300; --font-weight-normal: 400; --font-weight-bold: 500; - --mainBackground: #1e2124; --main-layout-header: 40px; --drag-region-height: 22px } diff --git a/src/renderer/theme.store.ts b/src/renderer/theme.store.ts index e96bc1f873..4b8dc5fffd 100644 --- a/src/renderer/theme.store.ts +++ b/src/renderer/theme.store.ts @@ -48,6 +48,7 @@ export class ThemeStore { await this.loadTheme(themeId); this.applyTheme(); } catch (err) { + logger.error(err); userStore.resetTheme(); } }, { @@ -79,7 +80,7 @@ export class ThemeStore { } return existingTheme; } catch (err) { - logger.error(`Can't load theme "${themeId}": ${err}`); + throw new Error(`Can't load theme "${themeId}": ${err}`); } } @@ -90,7 +91,7 @@ export class ThemeStore { document.head.prepend(this.styles); } const cssVars = Object.entries(theme.colors).map(([cssName, color]) => { - return `--${cssName}: ${color} !important;` + return `--${cssName}: ${color};`; }); this.styles.textContent = `:root {\n${cssVars.join("\n")}}`; // Adding universal theme flag which can be used in component styles