Merge pull request #28 from DominikNoga/Feature/fixHeaderAndHistory

fixed the header and history display is working again
DominikNoga · May 26, 2024 · e735369 · e735369
2 parents 94bda48 + d6feccd
commit e735369
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/ISD-conference-web-app-frontend/src/app/components/isd-ui/burger/burger.component.scss b/ISD-conference-web-app-frontend/src/app/components/isd-ui/burger/burger.component.scss
@@ -14,6 +14,7 @@ $burger-gap: .5rem;
     @include simpleFlexLayout($gap: $burger-gap);
     @include hoverEffect();
     z-index: 1000;
+
     .bar {
         @include basicBoxShadow(.5rem, .2);
         width: 2rem;

diff --git a/ISD-conference-web-app-frontend/src/app/components/isd-ui/header/header.component.scss b/ISD-conference-web-app-frontend/src/app/components/isd-ui/header/header.component.scss
@@ -37,8 +37,6 @@ background-color: $white-darker;
         }
     }
 
-
-
     .burger-wrapper {
         background-color: $primary-bg-color;
         display: grid;
@@ -48,7 +46,7 @@ background-color: $white-darker;
     }
 
     .triangle {
-        $triangle-size: calc($logo-size + 3rem);
+        $triangle-size: calc($logo-size + 2rem);
         width: 0; 
         height: 0; 
         border-left: $triangle-size solid  $primary-bg-color; 

diff --git a/...nd/src/app/components/pagesHelperComponents/history-page/carousel/carousel.component.html b/...nd/src/app/components/pagesHelperComponents/history-page/carousel/carousel.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="events && events.length > 0" class="carousel-container">
-    <div class="history-tile fade" *ngFor="let event of events; let i=index " [ngClass]="{'tile-active':selectedIndex===i}">
+    <div class="history-tile fade2" *ngFor="let event of events; let i=index " [ngClass]="{'tile-active':selectedIndex===i}">
         <h2>{{ event.title }}</h2>
         <p class="event-paragraph" *ngIf="event.topic"><fa-icon [icon]="lightbulbIcon"></fa-icon><span>{{ event.topic }}</span></p>
         <p class="event-paragraph"><fa-icon [icon]="locationIcon"></fa-icon> <span>{{ event.location }}</span></p>

diff --git a/...nd/src/app/components/pagesHelperComponents/history-page/carousel/carousel.component.scss b/...nd/src/app/components/pagesHelperComponents/history-page/carousel/carousel.component.scss
@@ -54,7 +54,7 @@
 opacity:1;
     }
 
-    .fade{
+    .fade2{
         animation-name: fade;
         animation-duration: 0.5s;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ @@
     opacity:1;
         }
-        .fade{
+        .fade2{
             animation-name: fade;
             animation-duration: 0.5s;
         }
@@ Expand Down @@