diff --git a/src/app/main/main.component.scss b/src/app/main/main.component.scss index 5f286a8d..28eda747 100644 --- a/src/app/main/main.component.scss +++ b/src/app/main/main.component.scss @@ -41,6 +41,7 @@ fuse-main { #wrapper { display: flex; + position: relative; flex: 1; overflow: hidden; diff --git a/src/app/main/navbar/navbar.component.scss b/src/app/main/navbar/navbar.component.scss index 7b38a824..d38c8bc3 100644 --- a/src/app/main/navbar/navbar.component.scss +++ b/src/app/main/navbar/navbar.component.scss @@ -39,6 +39,8 @@ fuse-navbar { &.folded { position: absolute; + top: 0; + bottom: 0; &.left-navbar { left: 0; diff --git a/src/app/main/quick-panel/quick-panel.component.html b/src/app/main/quick-panel/quick-panel.component.html index 96ca90ec..39d7f060 100644 --- a/src/app/main/quick-panel/quick-panel.component.html +++ b/src/app/main/quick-panel/quick-panel.component.html @@ -18,32 +18,6 @@ - -

- Events -

- - -

{{event.title}}

-

{{event.detail}}

-
-
- - - - -

- Notes -

- - -

{{note.title}}

-

{{note.detail}}

-
-
- - -

Quick Settings diff --git a/src/app/main/quick-panel/quick-panel.component.ts b/src/app/main/quick-panel/quick-panel.component.ts index 33ce41bf..25657a97 100644 --- a/src/app/main/quick-panel/quick-panel.component.ts +++ b/src/app/main/quick-panel/quick-panel.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { Http } from '@angular/http'; @Component({ selector : 'fuse-quick-panel', @@ -11,10 +10,8 @@ export class FuseQuickPanelComponent implements OnInit { date: Date; settings: any; - notes: any[]; - events: any[]; - constructor(private http: Http) + constructor() { this.date = new Date(); this.settings = { @@ -27,15 +24,6 @@ export class FuseQuickPanelComponent implements OnInit ngOnInit() { - this.http.get('api/quick-panel-notes') - .subscribe(response => { - this.notes = response.json().data; - }); - - this.http.get('api/quick-panel-events') - .subscribe(response => { - this.events = response.json().data; - }); }