Resize and top components work

eic · Oct 4, 2024 · a3deeef · a3deeef
1 parent afb8f8b
commit a3deeef
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/firebird-ng/src/app/pages/main-display/main-display.component.html b/firebird-ng/src/app/pages/main-display/main-display.component.html
@@ -23,13 +23,13 @@
   <div class="handler"></div>
 
   <div class="box main">
-    <app-loader [loaded]="loaded" [progress]="loadingProgress"></app-loader>
-    <!--<app-nav></app-nav>-->
-    <!-- UI menu at the bottom -->
-    <!--<app-ui-menu></app-ui-menu>-->
-    <app-experiment-info experiment="ePIC" experimentTagline="EPIC experiment at EIC"></app-experiment-info>
-    <!-- Phoenix menu at the top right -->
-    <app-phoenix-menu [rootNode]="phoenixMenuRoot"></app-phoenix-menu>
+<!--    <app-loader [loaded]="loaded" [progress]="loadingProgress"></app-loader>-->
+<!--    &lt;!&ndash;<app-nav></app-nav>&ndash;&gt;-->
+<!--    &lt;!&ndash; UI menu at the bottom &ndash;&gt;-->
+<!--    &lt;!&ndash;<app-ui-menu></app-ui-menu>&ndash;&gt;-->
+<!--    <app-experiment-info experiment="ePIC" experimentTagline="EPIC experiment at EIC"></app-experiment-info>-->
+<!--    &lt;!&ndash; Phoenix menu at the top right &ndash;&gt;-->
+<!--    <app-phoenix-menu [rootNode]="phoenixMenuRoot"></app-phoenix-menu>-->
 
     <app-ui-menu-wrapper >
       <!-- Event selector -->

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
@@ -15,6 +15,8 @@
   display: flex;
   height: 100vh;
   flex-direction: row;
+  padding-top: 65px;
+  margin-top: -65px;
 }
 
 .sidebar {
@@ -24,6 +26,14 @@
   box-sizing: border-box;
   overflow: auto;
   height: 100vh;
+  padding-top: 65px;
+  margin-top: -65px;
+}
+
+#eventDisplay {
+  // height: auto;
+  padding-top: 65px;
+  margin-top: -120px;
 }
 
 .box {
@@ -57,7 +67,7 @@
 }
 
 .full-width {
-  flex-basis: 100%;
+  // flex-basis: 100%;
 }
 
 .toggle-btn {

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
@@ -513,6 +513,7 @@ export class MainDisplayComponent implements OnInit {
       const headerHeight = document?.getElementById('main-top-navbar')?.offsetHeight ?? 0;
       const footerHeight = document?.getElementById('bottom-controls')?.offsetHeight ?? 0;
       const sidePanelWidth = document?.getElementById('side-panel')?.offsetWidth ?? 0;
+
 
       const adjustedWidth = rendererElement.offsetWidth - sidePanelWidth;
       const adjustedHeight = rendererElement.offsetHeight - headerHeight - footerHeight;