Change sidebar animation sticky to true. Remove fix position from navbar
This commit is contained in:
parent
9c67703a2d
commit
338e7d0115
|
@ -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>
|
||||
|
|
|
@ -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 = [];
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 4698a5fafd51fa7d8a0969b0d4e2691cce53ccf4
|
||||
Subproject commit 52f1abfdbf8f6ba3a0467302eeec1c88842617cf
|
|
@ -1 +1 @@
|
|||
Subproject commit c66881b1d021db2ec99fb3e62fd179dcba6c0a10
|
||||
Subproject commit d2e5d945cb51f6079f496445ba8fdaadc15d3ea6
|
|
@ -1 +1 @@
|
|||
Subproject commit 60be89ef464a3eb6a485b1f68bd9f3dcde0393a0
|
||||
Subproject commit e5410728a16312eca7bd11ebb6b8dc8777c072a3
|
Loading…
Reference in New Issue