Compare commits

..

4 Commits

Author SHA1 Message Date
Sercan Yemen
251732f221 Updated changelog 2018-07-12 13:59:51 +03:00
Sercan Yemen
1c34a65034 Increased Fuse version 2018-07-12 13:30:17 +03:00
Sercan Yemen
b8803a055f Removed side panel from auth pages
Updated the changelog
Theme options button adjustments
2018-07-12 13:27:26 +03:00
Sercan Yemen
6b8cd41d5e Added SidePanel to the layouts for controlling the chat bar and possible other bar properties via FuseConfig 2018-07-12 13:19:34 +03:00
31 changed files with 367 additions and 106 deletions

2
package-lock.json generated
View File

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

View File

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

View File

@@ -132,6 +132,23 @@
</div>
<!-- SIDE PANEL -->
<div class="group" formGroupName="sidepanel">
<h2>Side Panel</h2>
<mat-slide-toggle formControlName="hidden">
Hide
</mat-slide-toggle>
<h3 class="mt-24">Position:</h3>
<mat-radio-group fxLayout="column" fxLayoutAlign="start start" formControlName="position">
<mat-radio-button class="mb-12" value="left">Left</mat-radio-button>
<mat-radio-button class="mb-12" value="right">Right</mat-radio-button>
</mat-radio-group>
</div>
</ng-container>
<!-- VERTICAL LAYOUT #2 -->
@@ -226,6 +243,23 @@
</div>
<!-- SIDE PANEL -->
<div class="group" formGroupName="sidepanel">
<h2>Side Panel</h2>
<mat-slide-toggle formControlName="hidden">
Hide
</mat-slide-toggle>
<h3 class="mt-24">Position:</h3>
<mat-radio-group fxLayout="column" fxLayoutAlign="start start" formControlName="position">
<mat-radio-button class="mb-12" value="left">Left</mat-radio-button>
<mat-radio-button class="mb-12" value="right">Right</mat-radio-button>
</mat-radio-group>
</div>
</ng-container>
<!-- VERTICAL LAYOUT #3 -->
@@ -318,6 +352,23 @@
</div>
<!-- SIDE PANEL -->
<div class="group" formGroupName="sidepanel">
<h2>Side Panel</h2>
<mat-slide-toggle formControlName="hidden">
Hide
</mat-slide-toggle>
<h3 class="mt-24">Position:</h3>
<mat-radio-group fxLayout="column" fxLayoutAlign="start start" formControlName="position">
<mat-radio-button class="mb-12" value="left">Left</mat-radio-button>
<mat-radio-button class="mb-12" value="right">Right</mat-radio-button>
</mat-radio-group>
</div>
</ng-container>
<!-- HORIZONTAL LAYOUT #1 -->
@@ -405,6 +456,23 @@
</div>
<!-- SIDE PANEL -->
<div class="group" formGroupName="sidepanel">
<h2>Side Panel</h2>
<mat-slide-toggle formControlName="hidden">
Hide
</mat-slide-toggle>
<h3 class="mt-24">Position:</h3>
<mat-radio-group fxLayout="column" fxLayoutAlign="start start" formControlName="position">
<mat-radio-button class="mb-12" value="left">Left</mat-radio-button>
<mat-radio-button class="mb-12" value="right">Right</mat-radio-button>
</mat-radio-group>
</div>
</ng-container>
</ng-container>

View File

@@ -62,24 +62,28 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy
// noinspection TypeScriptValidateTypes
this.form = this._formBuilder.group({
layout : this._formBuilder.group({
style : new FormControl(),
width : new FormControl(),
navbar : this._formBuilder.group({
style : new FormControl(),
width : new FormControl(),
navbar : this._formBuilder.group({
background: new FormControl(),
folded : new FormControl(),
hidden : new FormControl(),
position : new FormControl(),
variant : new FormControl()
}),
toolbar: this._formBuilder.group({
toolbar : this._formBuilder.group({
background: new FormControl(),
hidden : new FormControl(),
position : new FormControl()
}),
footer : this._formBuilder.group({
footer : this._formBuilder.group({
background: new FormControl(),
hidden : new FormControl(),
position : new FormControl()
}),
sidepanel: this._formBuilder.group({
hidden: new FormControl(),
position : new FormControl()
})
}),
customScrollbars: new FormControl()

View File

@@ -19,6 +19,10 @@ export interface FuseConfig
background: string,
hidden: boolean,
position: 'above' | 'above-static' | 'above-fixed' | 'below' | 'below-static' | 'below-fixed'
},
sidepanel: {
hidden: boolean,
position: 'left' | 'right'
}
};
customScrollbars: boolean;

View File

@@ -20,6 +20,8 @@
<!-- THEME OPTIONS PANEL -->
<button mat-icon-button class="mat-primary-bg mat-elevation-z2 theme-options-button"
[ngClass]="{'right-side-panel': fuseConfig.layout.sidepanel.position === 'right',
'side-panel-hidden': fuseConfig.layout.sidepanel.hidden === true}"
(click)="toggleSidebarOpen('themeOptionsPanel')">
<mat-icon>settings</mat-icon>
</button>

View File

@@ -11,7 +11,7 @@
.theme-options-button {
position: absolute;
top: 160px;
right: 70px;
right: 0;
width: 48px;
height: 48px;
line-height: 48px;
@@ -23,8 +23,15 @@
opacity: .90;
z-index: 998;
@include media-breakpoint-down('md') {
right: 0;
&.right-side-panel {
@include media-breakpoint-up('lg') {
right: 70px;
}
}
&.side-panel-hidden {
right: 0 !important;
}
mat-icon {

View File

@@ -10,24 +10,28 @@ import { FuseConfig } from '@fuse/types';
export const fuseConfig: FuseConfig = {
layout : {
style : 'vertical-layout-1',
width : 'fullwidth',
navbar : {
style : 'vertical-layout-1',
width : 'fullwidth',
navbar : {
background: 'mat-fuse-dark-700-bg',
folded : false,
hidden : false,
position : 'left',
variant : 'vertical-style-1'
},
toolbar: {
toolbar : {
background: 'mat-white-500-bg',
hidden : false,
position : 'below-static'
},
footer : {
footer : {
background: 'mat-fuse-dark-900-bg',
hidden : false,
position : 'below-fixed'
},
sidepanel: {
hidden : false,
position: 'right'
}
},
customScrollbars: true

View File

@@ -22,7 +22,7 @@
<mat-icon class="secondary-text s-20">arrow_forward</mat-icon>
</button>
<button mat-icon-button class="toggle-sidebar-folded mr-8" (click)="toggleSidebarOpen()" fxHide.gt-md>
<button mat-icon-button class="toggle-sidebar-open mr-8" (click)="toggleSidebarOpen()" fxHide.gt-md>
<mat-icon class="secondary-text">arrow_forward</mat-icon>
</button>

View File

@@ -10,6 +10,11 @@ chat-panel {
z-index: 99;
overflow: hidden;
@include media-breakpoint-down('xs') {
max-width: none !important;
width: 100% !important;
}
.header {
height: 64px;
max-height: 64px;
@@ -26,6 +31,7 @@ chat-panel {
transition: opacity 300ms ease-in-out;
}
}
}
#contacts-list {
@@ -350,6 +356,20 @@ fuse-sidebar {
width: 100vw !important;
}
&.left-chat-panel {
.header {
.toggle-sidebar-folded,
.toggle-sidebar-open {
mat-icon {
transform: rotate(180deg);
}
}
}
}
// Folded
&.folded {

View File

@@ -142,14 +142,6 @@ export class ChatPanelComponent implements OnInit, AfterViewInit, OnDestroy
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Toggle sidebar folded status
*/
toggleSidebarFolded(): void
{
this._fuseSidebarService.getSidebar('chatPanel').toggleFold();
}
/**
* Fold the temporarily unfolded sidebar back
*/

View File

@@ -1,3 +1,17 @@
<!-- SIDE PANEL -->
<ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'left'">
<!-- CHAT PANEL -->
<fuse-sidebar name="chatPanel" position="left" class="chat-panel left-chat-panel"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
</ng-container>
<!-- / SIDE PANEL -->
<div id="main" [ngClass]="{'boxed':fuseConfig.layout.width === 'boxed'}">
<!-- TOOLBAR: Above -->
@@ -55,13 +69,19 @@
</div>
<!-- CHAT PANEL -->
<fuse-sidebar class="chat-panel" name="chatPanel" position="right"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
<!-- SIDE PANEL -->
<ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'right'">
<!-- CHAT PANEL -->
<fuse-sidebar name="chatPanel" position="right" class="chat-panel right-chat-panel"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
</ng-container>
<!-- / SIDE PANEL -->
<!-- QUICK PANEL -->
<fuse-sidebar name="quickPanel" position="right" class="quick-panel">

View File

@@ -1,3 +1,17 @@
<!-- SIDE PANEL -->
<ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'left'">
<!-- CHAT PANEL -->
<fuse-sidebar name="chatPanel" position="left" class="chat-panel left-chat-panel"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
</ng-container>
<!-- / SIDE PANEL -->
<div id="main" [ngClass]="{'boxed':fuseConfig.layout.width === 'boxed'}">
<!-- TOOLBAR: Above -->
@@ -67,13 +81,19 @@
</div>
<!-- CHAT PANEL -->
<fuse-sidebar class="chat-panel" name="chatPanel" position="right"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
<!-- SIDE PANEL -->
<ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'right'">
<!-- CHAT PANEL -->
<fuse-sidebar name="chatPanel" position="right" class="chat-panel right-chat-panel"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
</ng-container>
<!-- / SIDE PANEL -->
<!-- QUICK PANEL -->
<fuse-sidebar name="quickPanel" position="right" class="quick-panel">

View File

@@ -1,3 +1,17 @@
<!-- SIDE PANEL -->
<ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'left'">
<!-- CHAT PANEL -->
<fuse-sidebar name="chatPanel" position="left" class="chat-panel left-chat-panel"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
</ng-container>
<!-- / SIDE PANEL -->
<div id="main" [ngClass]="{'boxed':fuseConfig.layout.width === 'boxed'}">
<!-- TOOLBAR: Above fixed -->
@@ -67,13 +81,19 @@
</div>
<!-- CHAT PANEL -->
<fuse-sidebar class="chat-panel" name="chatPanel" position="right"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
<!-- SIDE PANEL -->
<ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'right'">
<!-- CHAT PANEL -->
<fuse-sidebar name="chatPanel" position="right" class="chat-panel right-chat-panel"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
</ng-container>
<!-- / SIDE PANEL -->
<!-- QUICK PANEL -->
<fuse-sidebar name="quickPanel" position="right" class="quick-panel">

View File

@@ -1,3 +1,17 @@
<!-- SIDE PANEL -->
<ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'left'">
<!-- CHAT PANEL -->
<fuse-sidebar name="chatPanel" position="left" class="chat-panel left-chat-panel"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
</ng-container>
<!-- / SIDE PANEL -->
<div id="main" [ngClass]="{'boxed':fuseConfig.layout.width === 'boxed'}">
<!-- TOOLBAR: Above fixed -->
@@ -53,13 +67,19 @@
</div>
<!-- CHAT PANEL -->
<fuse-sidebar class="chat-panel" name="chatPanel" position="right"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
<!-- SIDE PANEL -->
<ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'right'">
<!-- CHAT PANEL -->
<fuse-sidebar name="chatPanel" position="right" class="chat-panel right-chat-panel"
[folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
lockedOpen="gt-md">
<chat-panel></chat-panel>
</fuse-sidebar>
<!-- / CHAT PANEL -->
</ng-container>
<!-- / SIDE PANEL -->
<!-- QUICK PANEL -->
<fuse-sidebar name="quickPanel" position="right" class="quick-panel">

View File

@@ -19,6 +19,43 @@
<div class="changelog">
<!-- --------------------------------------------------------------------------------------------- -->
<!-- @ v6.2.2 -->
<!-- --------------------------------------------------------------------------------------------- -->
<div class="entry">
<div class="title">
<span class="version">v6.2.2</span>
<span class="date">(2018-07-12)</span>
</div>
<div class="groups">
<div class="fixed">
<span class="title">Fixed</span>
<ul>
<li>Added the missing 'is-mobile' check back to the AppComponent</li>
<li>Scrollbar styles are being modified in some mobile devices</li>
<li>(Chat Panel) Mobile scrolling and layout issues</li>
<li>
(Navbar) Added classes to the Fuse Sidebar components that contains the navbar to
prevent style leak
</li>
<li>(Toolbar) Removed unnecessary chat panel toggle method</li>
</ul>
</div>
<div class="improved">
<span class="title">Improved</span>
<ul>
<li>(Skeleton) Removed chat panel from skeleton as it's more like an app</li>
</ul>
</div>
</div>
</div>
<!-- --------------------------------------------------------------------------------------------- -->
<!-- @ v6.2.1 -->
<!-- --------------------------------------------------------------------------------------------- -->
@@ -31,26 +68,27 @@
<div class="groups">
<div class="new">
<span class="title">New</span>
<ul>
<li>
(Layout) Added SidePanel position to the layout for controlling Chat Panel and possible
other panels
</li>
</ul>
</div>
<div class="fixed">
<span class="title">Fixed</span>
<ul>
<ul>
<li>Added the missing 'is-mobile' check back to the AppComponent</li>
<li>Scrollbar styles are being modified in some mobile devices</li>
<li>(Chat Panel) Mobile scrolling and layout issues</li>
<li>
(Navbar) Added classes to the Fuse Sidebar components that contains the navbar to
prevent style leak
</li>
<li>(Toolbar) Removed unnecessary chat panel toggle method</li>
</ul>
<li>(Chat Panel) Mobile width issues</li>
</ul>
</div>
<div class="improved">
<span class="title">Improved</span>
<ul>
<li>(Skeleton) Removed chat panel from skeleton as it's more like an app</li>
<li>Removed chat panel from auth pages using layout options</li>
</ul>
</div>

View File

@@ -28,13 +28,16 @@ export class ForgotPassword2Component implements OnInit
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -28,13 +28,16 @@ export class ForgotPasswordComponent implements OnInit
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -28,13 +28,16 @@ export class LockComponent implements OnInit
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -28,13 +28,16 @@ export class Login2Component implements OnInit
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -28,13 +28,16 @@ export class LoginComponent implements OnInit
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -23,13 +23,16 @@ export class MailConfirmComponent
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -27,13 +27,16 @@ export class Register2Component implements OnInit, OnDestroy
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -27,13 +27,16 @@ export class RegisterComponent implements OnInit, OnDestroy
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -27,13 +27,16 @@ export class ResetPassword2Component implements OnInit, OnDestroy
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -27,13 +27,16 @@ export class ResetPasswordComponent implements OnInit, OnDestroy
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -34,13 +34,16 @@ export class ComingSoonComponent implements OnInit, OnDestroy
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -21,13 +21,16 @@ export class Error404Component
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -21,13 +21,16 @@ export class Error500Component
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -23,13 +23,16 @@ export class MaintenanceComponent
// Configure the layout
this._fuseConfigService.config = {
layout: {
navbar : {
navbar : {
hidden: true
},
toolbar: {
toolbar : {
hidden: true
},
footer : {
footer : {
hidden: true
},
sidepanel: {
hidden: true
}
}

View File

@@ -849,7 +849,7 @@ export const navigation: FuseNavigation[] = [
icon : 'update',
url : '/documentation/changelog',
badge: {
title: '6.2.0',
title: '6.2.2',
bg : '#EC0C8E',
fg : '#FFFFFF'
}