From 338e7d0115e56fc6e591dbfc9d14116e5a4e5ed0 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Thu, 3 Mar 2022 17:47:31 +0200
Subject: [PATCH] Change sidebar animation sticky to true. Remove fix position
 from navbar

---
 src/app/app.component.html |  4 +---
 src/app/app.component.ts   | 10 +++++-----
 src/app/openaireLibrary    |  2 +-
 src/assets/dashboard-theme |  2 +-
 src/assets/openaire-theme  |  2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 3b175e8..f4dd12e 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -4,10 +4,8 @@
 <div *ngIf="!loading">
   <div class="sidebar_main_swipe" [class.sidebar_main_active]="open && hasSidebar"
        [class.sidebar_mini]="!open && hasSidebar" [class.stakeholderPage]="isFrontPage">
-    <div *ngIf="hasHeader" class="uk-position-fixed uk-width-1-1" style="z-index: 981">
-      <navbar *ngIf="properties" [properties]="properties" portal="monitor_dashboard" [header]="menuHeader"
+    <navbar *ngIf="properties && hasHeader" [properties]="properties" portal="monitor_dashboard" [header]="menuHeader"
               [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user" [offCanvasFlip]="true"></navbar>
-    </div>
     <dashboard-sidebar *ngIf="stakeholder && isFrontPage && hasSidebar" [items]="sideBarItems" [activeItem]="activeTopic?activeTopic.alias:null"></dashboard-sidebar>
     <dashboard-sidebar *ngIf="hasAdminMenu" [items]="adminMenuItems" [specialMenuItem]="specialSideBarMenuItem"></dashboard-sidebar>
     <router-outlet></router-outlet>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 4c3047a..d6d0a4e 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -49,7 +49,7 @@ export class AppComponent implements OnInit, OnDestroy {
     logoSmallUrl: null,
     position: 'center',
     badge: true,
-    stickyAnimation: false,
+    stickyAnimation: true,
     menuPosition: "center"
   };
   
@@ -283,7 +283,7 @@ export class AppComponent implements OnInit, OnDestroy {
           logoSmallUrl: StringUtils.getLogoUrl(this.stakeholder),
           position: 'center',
           badge: true,
-          stickyAnimation: false,
+          stickyAnimation: true,
           menuPosition: "center"
         };
         this.menuItems.push({
@@ -327,7 +327,7 @@ export class AppComponent implements OnInit, OnDestroy {
           logoSmallUrl: null,
           position: 'center',
           badge: false,
-          stickyAnimation: false,
+          stickyAnimation: true,
           menuPosition: "center"
         };
         this.menuItems.push({
@@ -356,7 +356,7 @@ export class AppComponent implements OnInit, OnDestroy {
           logoSmallUrl: "assets/common-assets/logo-small-monitor.png",
           position: 'left',
           badge: true,
-          stickyAnimation: false,
+          stickyAnimation: true,
           menuPosition: "center"
         };
         this.menuItems.push({
@@ -383,7 +383,7 @@ export class AppComponent implements OnInit, OnDestroy {
           logoSmallUrl: null,
           position: 'center',
           badge: false,
-          stickyAnimation: false,
+          stickyAnimation: true,
           menuPosition: "center"
         };
         this.adminMenuItems = [];
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 4698a5f..52f1abf 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 4698a5fafd51fa7d8a0969b0d4e2691cce53ccf4
+Subproject commit 52f1abfdbf8f6ba3a0467302eeec1c88842617cf
diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme
index c66881b..d2e5d94 160000
--- a/src/assets/dashboard-theme
+++ b/src/assets/dashboard-theme
@@ -1 +1 @@
-Subproject commit c66881b1d021db2ec99fb3e62fd179dcba6c0a10
+Subproject commit d2e5d945cb51f6079f496445ba8fdaadc15d3ea6
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index 60be89e..e541072 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit 60be89ef464a3eb6a485b1f68bd9f3dcde0393a0
+Subproject commit e5410728a16312eca7bd11ebb6b8dc8777c072a3