From 6e219181da4da991fcebf584b53061fa4e6df9f0 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Wed, 12 Jul 2017 18:13:08 +0300 Subject: [PATCH] fuse2... --- src/app/core/services/layout.service.ts | 2 +- .../dashboards/project/project.component.html | 32 +++++++++++++++++++ .../dashboards/project/project.component.ts | 13 ++++++-- src/styles.scss | 4 +++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/src/app/core/services/layout.service.ts b/src/app/core/services/layout.service.ts index 57210abe..4950f7f9 100644 --- a/src/app/core/services/layout.service.ts +++ b/src/app/core/services/layout.service.ts @@ -43,7 +43,7 @@ export class LayoutService */ getSettings() { - return this.settings; + return {...this.settings}; } /** diff --git a/src/app/main/apps/dashboards/project/project.component.html b/src/app/main/apps/dashboards/project/project.component.html index c30714bb..e24cddf8 100644 --- a/src/app/main/apps/dashboards/project/project.component.html +++ b/src/app/main/apps/dashboards/project/project.component.html @@ -1,3 +1,35 @@ +Navigation: + + Left + Right + None + + +
+
+ +Toolbar: + + Below + Above + None + + +
+
+ +Footer: + + Below + Above + None + + +
+
+
+
+

project works!

diff --git a/src/app/main/apps/dashboards/project/project.component.ts b/src/app/main/apps/dashboards/project/project.component.ts index e5adc349..f9fece90 100644 --- a/src/app/main/apps/dashboards/project/project.component.ts +++ b/src/app/main/apps/dashboards/project/project.component.ts @@ -8,17 +8,26 @@ import { LayoutService } from '../../../../core/services/layout.service'; }) export class ProjectComponent implements OnInit { + layoutSettings: any; + constructor(private layoutService: LayoutService) { - this.layoutService.setSettings({ + /*this.layoutService.setSettings({ navigation: 'left', toolbar : 'above', footer : 'above' - }); + });*/ + // this.layoutSettings = Object.assign(this.layoutSettings, this.layoutService.getSettings()); + } + + onSettingsChanged() + { + this.layoutService.setSettings({...this.layoutSettings}); } ngOnInit() { + this.layoutSettings = this.layoutService.getSettings(); } } diff --git a/src/styles.scss b/src/styles.scss index 9288899a..b824164e 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -16,4 +16,8 @@ body { padding-left: 64px; } } + + > md-sidenav-container { + height: 100%; + } }