Pārlūkot izejas kodu

minor styling enhancments

tigger 1 nedēļu atpakaļ
vecāks
revīzija
f892cbc53f
2 mainītis faili ar 21 papildinājumiem un 20 dzēšanām
  1. 14 14
      src/app/app.component.html
  2. 7 6
      src/app/app.component.scss

+ 14 - 14
src/app/app.component.html

@@ -100,21 +100,21 @@
           {path:'/settings',icon:'settings',title:{key:'settings',default:'Settings'}}
         ]}"/>
       </mat-sidenav>
-      <mat-sidenav-content class="sidenav-content">
-        @if (loginService?.user) {
-          <mat-toolbar class="toolbar">
-            <div class="toolbar-container">
-              <!--<button mat-icon-button aria-label="menu">
-                <mat-icon>menu</mat-icon>
-              </button>-->
-              <h2 id="title">{{pbTitle.getTitle()}}</h2>
-              <div class="right-toolbar-panel">
-                <ng-container *ngTemplateOutlet="toolbarItems"/>
-              </div>
+      <mat-sidenav-content>
+        <mat-toolbar class="toolbar">
+          <div class="toolbar-container">
+            <!--<button mat-icon-button aria-label="menu">
+              <mat-icon>menu</mat-icon>
+            </button>-->
+            <h2 id="title">{{pbTitle.getTitle()}}</h2>
+            <div class="right-toolbar-panel">
+              <ng-container *ngTemplateOutlet="toolbarItems"/>
             </div>
-          </mat-toolbar>
-        }
-        <router-outlet></router-outlet>
+          </div>
+        </mat-toolbar>
+        <div class="program-content">
+          <router-outlet></router-outlet>
+        </div>
       </mat-sidenav-content>
     </mat-sidenav-container>
   </div>

+ 7 - 6
src/app/app.component.scss

@@ -31,17 +31,18 @@ $footer-height: 30px;
 .container > .main {
     flex-grow: 4;
     margin: 5px;
-    height: calc(100vh - $footer-height);
     max-width: 1920px;
-    overflow-y: auto;
 }
 
-.container > .main > mat-sidenav-container {
-    min-height: 100%;
+.container .main mat-sidenav-content {
+    height: calc(100vh - $footer-height);
+    display: flex;
+    flex-direction: column;
 }
 
-.container .main .sidenav-content {
-    height: calc(100vh - $footer-height);
+.container .main mat-sidenav-content .program-content {
+    flex-grow: 1;
+    overflow: auto;
 }
 
 .container > .right {