From a1311f1db00aed2024e0e590afd2dabe21cb4c22 Mon Sep 17 00:00:00 2001 From: "sqrd.max" Date: Wed, 30 Oct 2024 02:04:20 +0200 Subject: [PATCH] Try to make theming work --- .../display-shell/display-shell.component.scss | 3 --- .../event-selector/event-selector.component.scss | 6 +++--- .../menu-toggle/menu-toggle.component.scss | 16 ++++++++-------- .../main-display/main-display.component.scss | 1 + .../pages/main-display/main-display.component.ts | 1 + 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/firebird-ng/src/app/components/display-shell/display-shell.component.scss b/firebird-ng/src/app/components/display-shell/display-shell.component.scss index c00a782..8dbc652 100644 --- a/firebird-ng/src/app/components/display-shell/display-shell.component.scss +++ b/firebird-ng/src/app/components/display-shell/display-shell.component.scss @@ -14,8 +14,6 @@ flex-direction: row; align-items: center; min-height: 50px; - //background-color: #2e2e2e; - border-bottom: 1px solid #1c1c1c; box-sizing: border-box; } @@ -41,7 +39,6 @@ .central-pane { flex: 1; - //background-color: #424242; overflow: auto; } diff --git a/firebird-ng/src/app/components/event-selector/event-selector.component.scss b/firebird-ng/src/app/components/event-selector/event-selector.component.scss index e1afa73..4faec41 100644 --- a/firebird-ng/src/app/components/event-selector/event-selector.component.scss +++ b/firebird-ng/src/app/components/event-selector/event-selector.component.scss @@ -4,8 +4,8 @@ padding: 5px 10px; font-size: 12px; border: 1px solid rgba(88, 88, 88, 0.08); - box-shadow: var(--phoenix-icon-shadow); - background-color: var(--phoenix-background-color-tertiary); - color: var(--phoenix-text-color-secondary); + box-shadow: var(--icon-shadow); + background-color: var(--tertiary-background-color); + color: var(--secondary-text-color); } } diff --git a/firebird-ng/src/app/components/menu-toggle/menu-toggle.component.scss b/firebird-ng/src/app/components/menu-toggle/menu-toggle.component.scss index 2727a9b..bb48b83 100644 --- a/firebird-ng/src/app/components/menu-toggle/menu-toggle.component.scss +++ b/firebird-ng/src/app/components/menu-toggle/menu-toggle.component.scss @@ -37,11 +37,11 @@ } } } -.menu-toggle-icon{ - color: var(--text-color); - transition: background-color 0.3s, color 0.3s; -} - -.button_theme:hover { - color: var(--accent-color); -} +//.menu-toggle-icon{ +// color: var(--text-color); +// transition: background-color 0.3s, color 0.3s; +//} +// +//.button_theme:hover { +// color: var(--accent-color); +//} diff --git a/firebird-ng/src/app/pages/main-display/main-display.component.scss b/firebird-ng/src/app/pages/main-display/main-display.component.scss index 72ea135..cbba160 100644 --- a/firebird-ng/src/app/pages/main-display/main-display.component.scss +++ b/firebird-ng/src/app/pages/main-display/main-display.component.scss @@ -10,6 +10,7 @@ display: flex; align-items: center; justify-content: center; + color: var(--text-color); //background-color: #2e2e2e; flex-wrap: wrap; } diff --git a/firebird-ng/src/app/pages/main-display/main-display.component.ts b/firebird-ng/src/app/pages/main-display/main-display.component.ts index 89c8f1b..62a7dbb 100644 --- a/firebird-ng/src/app/pages/main-display/main-display.component.ts +++ b/firebird-ng/src/app/pages/main-display/main-display.component.ts @@ -111,6 +111,7 @@ export class MainDisplayComponent implements OnInit, AfterViewInit { private beamAnimationTime: number = 1000; isLeftPaneOpen: boolean = false; + isDarkTheme = false; isPhoenixMenuOpen: boolean = false; isSmallScreen: boolean = window.innerWidth < 768;