purchasing/fuse-angular
3
0
Fork 0
mirror of https://github.com/richard-loafle/fuse-angular.git synced 2025-12-09 03:26:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Navbar toggle button should be right aligned if right navbar selected

Browse Source 
Navbar classes actually moved to the navbar from fuse-sidebar
Search icon color
This commit is contained in:
Sercan Yemen
2018-06-12 10:28:08 +03:00
parent 9c88524185
commit 43189728e5
10 changed files with 35 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/layout/components/toolbar/toolbar.component.html
View File

@@ -6,13 +6,12 @@
<div fxFlex="1 0 auto" fxLayout="row" fxLayoutAlign="start center">
<button mat-icon-button class="toggle-button-navbar"
*ngIf="!noNav"
(click)="toggleSidebarOpen('navbar')" fxHide.gt-md>
<mat-icon>menu</mat-icon>
<button mat-icon-button class="navbar-toggle-button"
*ngIf="!hiddenNavbar && !rightNavbar" (click)="toggleSidebarOpen('navbar')" fxHide.gt-md>
<mat-icon class="secondary-text">menu</mat-icon>
</button>
<div class="toolbar-separator" fxHide.gt-md></div>
<div class="toolbar-separator" *ngIf="!hiddenNavbar && !rightNavbar" fxHide.gt-md></div>
<div fxLayout="row" fxLayoutAlign="start center" *ngIf="horizontalNav">
<div class="logo ml-16">
@@ -97,6 +96,13 @@
<mat-icon class="icon">format_list_bulleted</mat-icon>
</button>
<div class="toolbar-separator" *ngIf="!hiddenNavbar && rightNavbar" fxHide fxShow.gt-xs></div>
<button mat-icon-button class="navbar-toggle-button"
*ngIf="!hiddenNavbar && rightNavbar" (click)="toggleSidebarOpen('navbar')" fxHide.gt-md>
<mat-icon class="secondary-text">menu</mat-icon>
</button>
</div>
</div>

2
src/app/layout/components/toolbar/toolbar.component.scss
View File

@@ -45,7 +45,7 @@
}
}
.toggle-button-navbar {
.navbar-toggle-button {
min-width: 56px;
height: 56px;
}

10
src/app/layout/components/toolbar/toolbar.component.ts
View File

@@ -18,9 +18,10 @@ import { navigation } from 'app/navigation/navigation';
export class ToolbarComponent implements OnInit, OnDestroy
{
horizontalNav: boolean;
horizontalNavbar: boolean;
rightNavbar: boolean;
hiddenNavbar: boolean;
languages: any;
noNav: boolean;
navigation: any;
selectedLanguage: any;
showLoadingBar: boolean;
@@ -123,8 +124,9 @@ export class ToolbarComponent implements OnInit, OnDestroy
this._fuseConfigService.config
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((settings) => {
this.horizontalNav = settings.layout.navbar.position === 'top';
this.noNav = settings.layout.navbar.position === 'none';
this.horizontalNavbar = settings.layout.navbar.position === 'top';
this.rightNavbar = settings.layout.navbar.position === 'right';
this.hiddenNavbar = settings.layout.navbar.hidden === true;
});
// Set the selected language from default languages