Merge remote-tracking branch 'origin/ui-ux' into ui-ux

eic · Oct 30, 2024 · 289e911 · 289e911
2 parents 8b082c8 + a1311f1
commit 289e911
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 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
@@ -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
@@ -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/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
@@ -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;