Compare commits

...

6 Commits

Author SHA1 Message Date
Sercan Yemen
4be77a19ed Removed unnecessary lines from angular-cli.json file 2018-03-09 20:17:38 +03:00
Sercan Yemen
8374c7d059 Merge branch 'master' into skeleton 2018-03-09 20:14:36 +03:00
Sercan Yemen
7db4715eb2 Increased the Fuse version number 2018-03-09 20:14:25 +03:00
Sercan Yemen
e57061b133 Replaced the project name in angular-cli.json 2018-03-09 20:07:42 +03:00
Sercan Yemen
da615585d0 Merge branch 'master' into skeleton 2018-03-09 20:03:43 +03:00
Sercan Yemen
096e1b47d2 Fixed: Sidebar folded doesn't push the content if activated programmatically 2018-03-09 20:03:12 +03:00
5 changed files with 28 additions and 29 deletions

View File

@@ -1,7 +1,7 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "fuse2"
"name": "fuse"
},
"apps": [
{
@@ -39,25 +39,19 @@
{
"project": "src/tsconfig.app.json",
"exclude": [
"**/node_modules/**",
"**/src/app/fuse-fake-db/**/*",
"**/src/assets/angular-material-examples/**/*"
"**/node_modules/**"
]
},
{
"project": "src/tsconfig.spec.json",
"exclude": [
"**/node_modules/**",
"**/src/app/fuse-fake-db/**/*",
"**/src/assets/angular-material-examples/**/*"
"**/node_modules/**"
]
},
{
"project": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**",
"**/src/app/fuse-fake-db/**/*",
"**/src/assets/angular-material-examples/**/*"
"**/node_modules/**"
]
}
],

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "fuse",
"version": "5.2.8",
"version": "5.2.9",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "fuse",
"version": "5.2.8",
"version": "5.2.9",
"license": "https://themeforest.net/licenses/terms/regular",
"scripts": {
"ng": "ng",

View File

@@ -38,13 +38,31 @@ export class FuseSidebarComponent implements OnInit, OnDestroy
// Folded
@HostBinding('class.folded')
@Input()
folded: boolean;
set folded(value)
{
this._folded = value;
if ( value )
{
this.fold();
}
else
{
this.unfold();
}
}
get folded()
{
return this._folded;
}
// Folded unfolded
@HostBinding('class.unfolded')
unfolded: boolean;
// Private
private _folded = false;
private _wasActive: boolean;
private _backdrop: HTMLElement | null = null;
private _player: AnimationPlayer;
@@ -270,8 +288,6 @@ export class FuseSidebarComponent implements OnInit, OnDestroy
*/
fold(): void
{
this.folded = true;
// Add a css class to the body
this.renderer.addClass(this.document.body, 'fuse-sidebar-folded');
}
@@ -281,8 +297,6 @@ export class FuseSidebarComponent implements OnInit, OnDestroy
*/
unfold(): void
{
this.folded = false;
// Remove the css class from the body
this.renderer.removeClass(this.document.body, 'fuse-sidebar-folded');
}
@@ -292,14 +306,7 @@ export class FuseSidebarComponent implements OnInit, OnDestroy
*/
toggleFold(): void
{
if ( this.folded )
{
this.unfold();
}
else
{
this.fold();
}
this.folded = !this.folded;
}
/**

View File

@@ -10,14 +10,12 @@
</div>
<button mat-button class="toggle-button-navbar mat-icon-button"
(click)="toggleSidebarFolded('navbar')"
fxHide.lt-lg>
(click)="toggleSidebarFolded('navbar')" fxHide.lt-lg>
<mat-icon>menu</mat-icon>
</button>
<button mat-button class="toggle-button-navbar mat-icon-button"
(click)="toggleSidebarOpened('navbar')"
fxHide.gt-md>
(click)="toggleSidebarOpened('navbar')" fxHide.gt-md>
<mat-icon>arrow_back</mat-icon>
</button>