Compare commits

..

16 Commits

Author SHA1 Message Date
Sercan Yemen
798e2632bc Updated changelog 2018-07-13 18:58:02 +03:00
Sercan Yemen
19c960cc4c (Navbar) Moved navbar style into the variants
(AppComponent) Moved boxed class to the body
Fixed: Horizontal layout navbar covers entire screen
2018-07-13 18:55:45 +03:00
Sercan Yemen
8dfc3e854b Added comments to the app.component.html 2018-07-13 18:47:29 +03:00
Sercan Yemen
04b80ca168 Updated changelog 2018-07-13 14:43:03 +03:00
Sercan Yemen
54451bb19e (FuseProgressBar) Added new component and its service
(LoadingBarService) Removed due to the new progress bar service
Added documentation for the FuseProgressBar
2018-07-13 14:16:05 +03:00
Sercan Yemen
5e98d986e2 (AppComponent) Property order fix 2018-07-13 12:54:02 +03:00
Sercan Yemen
293192557f Updated Angular and various other packages
Increased the Fuse version number
2018-07-13 12:23:56 +03:00
Sercan Yemen
d61549d9e6 Fixed: Scrolling is not smooth on iOS devices 2018-07-13 12:23:30 +03:00
Sercan Yemen
b2ceb02709 Updated changelog and nav badge 2018-07-12 17:49:16 +03:00
Sercan Yemen
ffbd000fe2 (Chat Panel) Style and logic tweaks 2018-07-12 17:45:46 +03:00
Sercan Yemen
b6ebd2b839 (Navbar) Fixed: IE11 issues
(Chat Panel) Fixed: IE11 issues
2018-07-12 16:04:56 +03:00
Sercan Yemen
4d4d52ba05 (Navbar) Fixed: Style variant 2 doesn't scroll on Firefox, IE & Edge
(Chat Panel) Fixed: Doesn't scroll on Firefox, IE & Edge
Increased Fuse version
2018-07-12 15:48:55 +03:00
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
91 changed files with 1407 additions and 771 deletions

690
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{ {
"name": "fuse", "name": "fuse",
"version": "6.2.1", "version": "6.2.4",
"license": "https://themeforest.net/licenses/terms/regular", "license": "https://themeforest.net/licenses/terms/regular",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
@@ -19,19 +19,19 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@agm/core": "1.0.0-beta.3", "@agm/core": "1.0.0-beta.3",
"@angular/animations": "6.0.7", "@angular/animations": "6.0.9",
"@angular/cdk": "6.3.3", "@angular/cdk": "6.3.3",
"@angular/common": "6.0.7", "@angular/common": "6.0.9",
"@angular/compiler": "6.0.7", "@angular/compiler": "6.0.9",
"@angular/core": "6.0.7", "@angular/core": "6.0.9",
"@angular/flex-layout": "6.0.0-beta.16", "@angular/flex-layout": "6.0.0-beta.16",
"@angular/forms": "6.0.7", "@angular/forms": "6.0.9",
"@angular/http": "6.0.7", "@angular/http": "6.0.9",
"@angular/material": "6.3.3", "@angular/material": "6.3.3",
"@angular/material-moment-adapter": "6.3.3", "@angular/material-moment-adapter": "6.3.3",
"@angular/platform-browser": "6.0.7", "@angular/platform-browser": "6.0.9",
"@angular/platform-browser-dynamic": "6.0.7", "@angular/platform-browser-dynamic": "6.0.9",
"@angular/router": "6.0.7", "@angular/router": "6.0.9",
"@ngrx/effects": "6.0.1", "@ngrx/effects": "6.0.1",
"@ngrx/router-store": "6.0.1", "@ngrx/router-store": "6.0.1",
"@ngrx/store": "6.0.1", "@ngrx/store": "6.0.1",
@@ -52,7 +52,7 @@
"moment": "2.22.2", "moment": "2.22.2",
"ng2-charts": "1.6.0", "ng2-charts": "1.6.0",
"ngrx-store-freeze": "0.2.4", "ngrx-store-freeze": "0.2.4",
"ngx-color-picker": "6.4.0", "ngx-color-picker": "6.5.0",
"ngx-cookie-service": "1.0.10", "ngx-cookie-service": "1.0.10",
"perfect-scrollbar": "1.4.0", "perfect-scrollbar": "1.4.0",
"prismjs": "1.15.0", "prismjs": "1.15.0",
@@ -63,13 +63,13 @@
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "6.0.8", "@angular/cli": "6.0.8",
"@angular/compiler-cli": "6.0.7", "@angular/compiler-cli": "6.0.9",
"@angular/language-service": "6.0.7", "@angular/language-service": "6.0.9",
"@angular-devkit/build-angular": "0.6.8", "@angular-devkit/build-angular": "0.6.8",
"@angularclass/hmr": "2.1.3", "@angularclass/hmr": "2.1.3",
"@types/jasmine": "2.8.8", "@types/jasmine": "2.8.8",
"@types/jasminewd2": "2.0.3", "@types/jasminewd2": "2.0.3",
"@types/lodash": "4.14.110", "@types/lodash": "4.14.111",
"@types/node": "8.9.5", "@types/node": "8.9.5",
"codelyzer": "4.2.1", "codelyzer": "4.2.1",
"jasmine-core": "2.99.1", "jasmine-core": "2.99.1",

View File

@@ -4,4 +4,5 @@
background: #263238; background: #263238;
cursor: text; cursor: text;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
} }

View File

@@ -4,6 +4,7 @@ export * from './demo/demo.module';
export * from './highlight/highlight.module'; export * from './highlight/highlight.module';
export * from './material-color-picker/material-color-picker.module'; export * from './material-color-picker/material-color-picker.module';
export * from './navigation/navigation.module'; export * from './navigation/navigation.module';
export * from './progress-bar/progress-bar.module';
export * from './search-bar/search-bar.module'; export * from './search-bar/search-bar.module';
export * from './shortcuts/shortcuts.module'; export * from './shortcuts/shortcuts.module';
export * from './sidebar/sidebar.module'; export * from './sidebar/sidebar.module';

View File

@@ -0,0 +1,5 @@
<ng-container *ngIf="visible">
<mat-progress-bar color="accent" [bufferValue]="bufferValue" [mode]="mode" [value]="value"></mat-progress-bar>
</ng-container>

View File

@@ -0,0 +1,17 @@
@import "src/@fuse/scss/fuse";
fuse-progress-bar {
position: absolute;
top: 0;
left: 0;
right: 0;
width: 100%;
z-index: 99998;
mat-progress-bar {
.mat-progress-bar-buffer {
background-color: #C5C6CB !important;
}
}
}

View File

@@ -0,0 +1,93 @@
import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { FuseProgressBarService } from '@fuse/components/progress-bar/progress-bar.service';
@Component({
selector : 'fuse-progress-bar',
templateUrl : './progress-bar.component.html',
styleUrls : ['./progress-bar.component.scss'],
encapsulation: ViewEncapsulation.None
})
export class FuseProgressBarComponent implements OnInit, OnDestroy
{
bufferValue: number;
mode: 'determinate' | 'indeterminate' | 'buffer' | 'query';
value: number;
visible: boolean;
// Private
private _unsubscribeAll: Subject<any>;
/**
* Constructor
*
* @param {FuseProgressBarService} _fuseProgressBarService
*/
constructor(
private _fuseProgressBarService: FuseProgressBarService
)
{
// Set the defaults
// Set the private defaults
this._unsubscribeAll = new Subject();
}
// -----------------------------------------------------------------------------------------------------
// @ Lifecycle hooks
// -----------------------------------------------------------------------------------------------------
/**
* On init
*/
ngOnInit(): void
{
// Subscribe to the progress bar service properties
// Buffer value
this._fuseProgressBarService.bufferValue
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((bufferValue) => {
this.bufferValue = bufferValue;
});
// Mode
this._fuseProgressBarService.mode
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((mode) => {
this.mode = mode;
});
// Value
this._fuseProgressBarService.value
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((value) => {
this.value = value;
});
// Visible
this._fuseProgressBarService.visible
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((visible) => {
this.visible = visible;
});
}
/**
* On destroy
*/
ngOnDestroy(): void
{
// Unsubscribe from all subscriptions
this._unsubscribeAll.next();
this._unsubscribeAll.complete();
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
}

View File

@@ -0,0 +1,27 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { MatButtonModule, MatIconModule, MatProgressBarModule } from '@angular/material';
import { FuseProgressBarComponent } from './progress-bar.component';
@NgModule({
declarations: [
FuseProgressBarComponent
],
imports : [
CommonModule,
RouterModule,
MatButtonModule,
MatIconModule,
MatProgressBarModule
],
exports : [
FuseProgressBarComponent
]
})
export class FuseProgressBarModule
{
}

View File

@@ -6,9 +6,12 @@ import { filter } from 'rxjs/operators';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class FuseLoadingBarService export class FuseProgressBarService
{ {
// Private // Private
private _bufferValue: BehaviorSubject<number>;
private _mode: BehaviorSubject<string>;
private _value: BehaviorSubject<number>;
private _visible: BehaviorSubject<boolean>; private _visible: BehaviorSubject<boolean>;
/** /**
@@ -28,9 +31,50 @@ export class FuseLoadingBarService
// @ Accessors // @ Accessors
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
/**
* Buffer value
*/
get bufferValue(): Observable<any>
{
return this._bufferValue.asObservable();
}
setBufferValue(value: number): void
{
this._bufferValue.next(value);
}
/**
* Mode
*/
get mode(): Observable<any>
{
return this._mode.asObservable();
}
setMode(value: 'determinate' | 'indeterminate' | 'buffer' | 'query'): void
{
this._mode.next(value);
}
/**
* Value
*/
get value(): Observable<any>
{
return this._value.asObservable();
}
setValue(value: number): void
{
this._value.next(value);
}
/**
* Visible
*/
get visible(): Observable<any> get visible(): Observable<any>
{ {
// Return the _visible as observable
return this._visible.asObservable(); return this._visible.asObservable();
} }
@@ -45,24 +89,23 @@ export class FuseLoadingBarService
*/ */
private _init(): void private _init(): void
{ {
// Initialize the behavior subject // Initialize the behavior subjects
this._bufferValue = new BehaviorSubject(0);
this._mode = new BehaviorSubject('indeterminate');
this._value = new BehaviorSubject(0);
this._visible = new BehaviorSubject(false); this._visible = new BehaviorSubject(false);
// Subscribe to the router events to show/hide the loading bar // Subscribe to the router events to show/hide the loading bar
this._router.events this._router.events
.pipe( .pipe(filter((event) => event instanceof NavigationStart))
filter((event) => event instanceof NavigationStart)
)
.subscribe(() => { .subscribe(() => {
this.showLoadingBar(); this.show();
}); });
this._router.events this._router.events
.pipe( .pipe(filter((event) => event instanceof NavigationEnd))
filter((event) => event instanceof NavigationEnd)
)
.subscribe(() => { .subscribe(() => {
this.hideLoadingBar(); this.hide();
}); });
} }
@@ -71,20 +114,18 @@ export class FuseLoadingBarService
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
/** /**
* Show the loading bar * Show the progress bar
*/ */
showLoadingBar(): void show(): void
{ {
// Show
this._visible.next(true); this._visible.next(true);
} }
/** /**
* Hide the loading bar * Hide the progress bar
*/ */
hideLoadingBar(): void hide(): void
{ {
// Hide
this._visible.next(false); this._visible.next(false);
} }
} }

View File

@@ -9,6 +9,7 @@ fuse-sidebar {
bottom: 0; bottom: 0;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch;
width: 280px; width: 280px;
min-width: 280px; min-width: 280px;
max-width: 280px; max-width: 280px;

View File

@@ -132,6 +132,23 @@
</div> </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>
<!-- VERTICAL LAYOUT #2 --> <!-- VERTICAL LAYOUT #2 -->
@@ -226,6 +243,23 @@
</div> </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>
<!-- VERTICAL LAYOUT #3 --> <!-- VERTICAL LAYOUT #3 -->
@@ -318,6 +352,23 @@
</div> </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>
<!-- HORIZONTAL LAYOUT #1 --> <!-- HORIZONTAL LAYOUT #1 -->
@@ -405,6 +456,23 @@
</div> </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>
</ng-container> </ng-container>

View File

@@ -19,6 +19,7 @@
flex: 1 0 auto; flex: 1 0 auto;
padding: 40px 24px 24px 24px; padding: 40px 24px 24px 24px;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
.header { .header {
display: flex; display: flex;

View File

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

View File

@@ -6,6 +6,11 @@
} }
} }
// Fix: "Smooth scrolling for iOS"
.mat-dialog-container {
-webkit-overflow-scrolling: touch;
}
// Fix: "Inconsistent font sizes across elements" // Fix: "Inconsistent font sizes across elements"
.mat-form-field-wrapper { .mat-form-field-wrapper {
font-size: 16px; font-size: 16px;

View File

@@ -10,4 +10,15 @@ body {
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;
background: #F5F5F5; background: #F5F5F5;
}
body {
// Boxed
&.boxed {
max-width: 1200px;
margin: 0 auto;
@include mat-elevation(8);
}
} }

View File

@@ -143,8 +143,9 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
flex: 1 1 auto; flex: 1 1 auto;
> .content { > .content {
overflow: auto;
flex: 1 1 auto; flex: 1 1 auto;
overflow: auto;
-webkit-overflow-scrolling: touch;
} }
} }
} }
@@ -166,6 +167,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
.tab-content { .tab-content {
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
} }
} }
} }
@@ -346,6 +348,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
.content { .content {
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
} }
} }
@@ -358,6 +361,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
> .content { > .content {
flex: 1 1 auto; flex: 1 1 auto;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
} }
} }
} }
@@ -379,6 +383,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
.tab-content { .tab-content {
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
} }
} }
} }
@@ -500,12 +505,14 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
.content { .content {
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
} }
} }
> .center { > .center {
flex: 1 1 auto; flex: 1 1 auto;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
} }
} }
@@ -528,12 +535,14 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
.content { .content {
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
} }
} }
> .center { > .center {
flex: 1 1 auto; flex: 1 1 auto;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
} }
} }
} }

View File

@@ -146,6 +146,7 @@ owl-date-time {
padding: .25em; padding: .25em;
background-color: rgba(0, 0, 0, .1); background-color: rgba(0, 0, 0, .1);
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch;
} }
.owl-calendar-wrapper { .owl-calendar-wrapper {

View File

@@ -11,6 +11,7 @@
height: 140px; height: 140px;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
-webkit-overflow-scrolling: touch;
> hr { > hr {
display: none; display: none;

View File

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

View File

@@ -1,29 +1,40 @@
<!-- PROGRESS BAR -->
<fuse-progress-bar></fuse-progress-bar>
<!-- / PROGRESS BAR -->
<!-- VERTICAL LAYOUT 1 --> <!-- VERTICAL LAYOUT 1 -->
<ng-container *ngIf="fuseConfig.layout.style === 'vertical-layout-1'"> <ng-container *ngIf="fuseConfig.layout.style === 'vertical-layout-1'">
<vertical-layout-1></vertical-layout-1> <vertical-layout-1></vertical-layout-1>
</ng-container> </ng-container>
<!-- / VERTICAL LAYOUT 1 -->
<!-- VERTICAL LAYOUT 2 --> <!-- VERTICAL LAYOUT 2 -->
<ng-container *ngIf="fuseConfig.layout.style === 'vertical-layout-2'"> <ng-container *ngIf="fuseConfig.layout.style === 'vertical-layout-2'">
<vertical-layout-2></vertical-layout-2> <vertical-layout-2></vertical-layout-2>
</ng-container> </ng-container>
<!-- / VERTICAL LAYOUT 2 -->
<!-- VERTICAL LAYOUT 3 --> <!-- VERTICAL LAYOUT 3 -->
<ng-container *ngIf="fuseConfig.layout.style === 'vertical-layout-3'"> <ng-container *ngIf="fuseConfig.layout.style === 'vertical-layout-3'">
<vertical-layout-3></vertical-layout-3> <vertical-layout-3></vertical-layout-3>
</ng-container> </ng-container>
<!-- / VERTICAL LAYOUT 3 -->
<!-- HORIZONTAL LAYOUT 1 --> <!-- HORIZONTAL LAYOUT 1 -->
<ng-container *ngIf="fuseConfig.layout.style === 'horizontal-layout-1'"> <ng-container *ngIf="fuseConfig.layout.style === 'horizontal-layout-1'">
<horizontal-layout-1></horizontal-layout-1> <horizontal-layout-1></horizontal-layout-1>
</ng-container> </ng-container>
<!-- / HORIZONTAL LAYOUT 1 -->
<!-- THEME OPTIONS PANEL --> <!-- THEME OPTIONS PANEL -->
<button mat-icon-button class="mat-primary-bg mat-elevation-z2 theme-options-button" <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')"> (click)="toggleSidebarOpen('themeOptionsPanel')">
<mat-icon>settings</mat-icon> <mat-icon>settings</mat-icon>
</button> </button>
<fuse-sidebar name="themeOptionsPanel" class="theme-options-sidebar" position="right" [invisibleOverlay]="true"> <fuse-sidebar name="themeOptionsPanel" class="theme-options-sidebar" position="right" [invisibleOverlay]="true">
<fuse-theme-options></fuse-theme-options> <fuse-theme-options></fuse-theme-options>
</fuse-sidebar> </fuse-sidebar>
<!-- / THEME OPTIONS PANEL -->

View File

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

View File

@@ -22,8 +22,8 @@ import { locale as navigationTurkish } from 'app/navigation/i18n/tr';
}) })
export class AppComponent implements OnInit, OnDestroy export class AppComponent implements OnInit, OnDestroy
{ {
navigation: any;
fuseConfig: any; fuseConfig: any;
navigation: any;
// Private // Private
private _unsubscribeAll: Subject<any>; private _unsubscribeAll: Subject<any>;
@@ -75,7 +75,7 @@ export class AppComponent implements OnInit, OnDestroy
// Add is-mobile class to the body if the platform is mobile // Add is-mobile class to the body if the platform is mobile
if ( this._platform.ANDROID || this._platform.IOS ) if ( this._platform.ANDROID || this._platform.IOS )
{ {
this.document.body.className += ' is-mobile'; this.document.body.classList.add('is-mobile');
} }
// Set the private defaults // Set the private defaults
@@ -96,6 +96,15 @@ export class AppComponent implements OnInit, OnDestroy
.pipe(takeUntil(this._unsubscribeAll)) .pipe(takeUntil(this._unsubscribeAll))
.subscribe((config) => { .subscribe((config) => {
this.fuseConfig = config; this.fuseConfig = config;
if ( this.fuseConfig.layout.width === 'boxed' )
{
this.document.body.classList.add('boxed');
}
else
{
this.document.body.classList.remove('boxed');
}
}); });
} }

View File

@@ -11,7 +11,7 @@ import 'hammerjs';
import { FuseModule } from '@fuse/fuse.module'; import { FuseModule } from '@fuse/fuse.module';
import { FuseSharedModule } from '@fuse/shared.module'; import { FuseSharedModule } from '@fuse/shared.module';
import { FuseSidebarModule, FuseThemeOptionsModule } from '@fuse/components'; import { FuseProgressBarModule, FuseSidebarModule, FuseThemeOptionsModule } from '@fuse/components';
import { fuseConfig } from 'app/fuse-config'; import { fuseConfig } from 'app/fuse-config';
@@ -72,6 +72,7 @@ const appRoutes: Routes = [
// Fuse modules // Fuse modules
FuseModule.forRoot(fuseConfig), FuseModule.forRoot(fuseConfig),
FuseProgressBarModule,
FuseSharedModule, FuseSharedModule,
FuseSidebarModule, FuseSidebarModule,
FuseThemeOptionsModule, FuseThemeOptionsModule,

View File

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

View File

@@ -2,7 +2,8 @@
<ng-container *ngIf="selectedContact === null"> <ng-container *ngIf="selectedContact === null">
<div class="title ml-16" fxLayout="row" fxLayoutAlign="start center"> <div class="title ml-16" fxLayout="row" fxLayoutAlign="start center"
(click)="unfoldSidebarTemporarily()">
<mat-icon class="s-32 white-fg">chat</mat-icon> <mat-icon class="s-32 white-fg">chat</mat-icon>
<h3 class="ml-12">Team Chat</h3> <h3 class="ml-12">Team Chat</h3>
</div> </div>
@@ -18,17 +19,19 @@
</ng-container> </ng-container>
<button mat-icon-button class="toggle-sidebar-folded mr-8" (click)="foldSidebarTemporarily()" fxHide fxShow.gt-md> <button mat-icon-button class="toggle-sidebar-folded mr-8" (click)="foldSidebarTemporarily();resetChat();"
<mat-icon class="secondary-text s-20">arrow_forward</mat-icon> fxHide fxShow.gt-md>
<mat-icon class="secondary-text s-20">close</mat-icon>
</button> </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();resetChat();"
<mat-icon class="secondary-text">arrow_forward</mat-icon> fxHide.gt-md>
<mat-icon class="secondary-text">close</mat-icon>
</button> </button>
</div> </div>
<div> <div class="content">
<!-- Contacts --> <!-- Contacts -->
<div id="contacts-list" fusePerfectScrollbar [fusePerfectScrollbarOptions]="{suppressScrollX: true}"> <div id="contacts-list" fusePerfectScrollbar [fusePerfectScrollbarOptions]="{suppressScrollX: true}">
@@ -37,7 +40,7 @@
class="contacts-list-item" class="contacts-list-item"
[ngClass]="contact.status" [ngClass]="contact.status"
[class.active]="contact.id === selectedContact?.id" [class.active]="contact.id === selectedContact?.id"
(click)="goToChat(contact)"> (click)="toggleChat(contact)">
<img class="avatar" [src]="contact.avatar" <img class="avatar" [src]="contact.avatar"
[matTooltip]="contact.name" [matTooltip]="contact.name"
@@ -78,7 +81,7 @@
</ng-container> </ng-container>
<ng-container *ngIf="chat && chat.dialog && chat.dialog.length === 0"> <ng-container *ngIf="selectedContact && chat && chat.dialog && chat.dialog.length === 0">
<div class="no-messages-icon"> <div class="no-messages-icon">
<mat-icon class="s-128">chat</mat-icon> <mat-icon class="s-128">chat</mat-icon>
@@ -87,11 +90,29 @@
<div class="no-messages secondary-text"> <div class="no-messages secondary-text">
Start a conversation by typing your message below. Start a conversation by typing your message below.
</div> </div>
</ng-container>
<ng-container *ngIf="!selectedContact">
<div class="no-contact-selected">
<div class="no-contact-icon">
<mat-icon class="s-128">chat</mat-icon>
</div>
<div class="no-contact secondary-text">
Select a contact to start a conversation.
</div>
</div>
</ng-container> </ng-container>
</div> </div>
<div class="reply-form" fxFlex="0 0 auto" fxLayout="row" fxLayoutAlign="center center"> <div class="reply-form" fxFlex="0 0 auto" fxLayout="row" fxLayoutAlign="center center"
*ngIf="selectedContact">
<form #replyForm="ngForm" <form #replyForm="ngForm"
(ngSubmit)="reply($event)" (ngSubmit)="reply($event)"

View File

@@ -10,12 +10,20 @@ chat-panel {
z-index: 99; z-index: 99;
overflow: hidden; overflow: hidden;
@include media-breakpoint-down('xs') {
max-width: none !important;
width: 100% !important;
}
.header { .header {
position: relative;
height: 64px; height: 64px;
max-height: 64px; max-height: 64px;
min-height: 64px; min-height: 64px;
z-index: 10;
.title { .title {
cursor: pointer;
mat-icon { mat-icon {
margin-left: 4px; margin-left: 4px;
@@ -26,14 +34,23 @@ chat-panel {
transition: opacity 300ms ease-in-out; transition: opacity 300ms ease-in-out;
} }
} }
}
.content {
flex: 1 1 100%;
min-height: 0;
} }
#contacts-list { #contacts-list {
padding: 8px 0; position: relative;
overflow: auto; z-index: 5;
padding: 16px 0;
width: 72px; width: 72px;
min-width: 72px; min-width: 72px;
max-width: 72px; max-width: 72px;
background-color: #F9F9F9;
overflow: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
// Perfect scrollbar // Perfect scrollbar
@@ -55,8 +72,24 @@ chat-panel {
cursor: pointer; cursor: pointer;
&.active { &.active {
background-color: mat-color(mat-palette($mat-grey, 300)); position: relative;
@include mat-elevation(2); background-color: mat-color(mat-palette($mat-indigo, 50));
.status-icon {
border-color: mat-color(mat-palette($mat-indigo, 50));
}
&:after {
position: absolute;
top: 8px;
right: 0;
bottom: 8px;
content: "";
width: 4px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
background-color: mat-color(mat-palette($mat-indigo));
}
} }
&.offline { &.offline {
@@ -76,14 +109,17 @@ chat-panel {
.avatar { .avatar {
margin: 0; margin: 0;
width: 32px;
height: 32px;
min-width: 32px;
} }
.unread-count { .unread-count {
position: absolute; position: absolute;
min-width: 18px; min-width: 18px;
height: 18px; height: 18px;
top: 4px; top: 8px;
left: 10px; left: 12px;
border-radius: 9px; border-radius: 9px;
padding: 0 5px; padding: 0 5px;
font-size: 11px; font-size: 11px;
@@ -100,9 +136,9 @@ chat-panel {
position: absolute; position: absolute;
width: 12px; width: 12px;
height: 12px; height: 12px;
bottom: 3px; bottom: 10px;
left: 44px; left: 44px;
border: 2px solid white; border: 2px solid #F9F9F9;
border-radius: 50%; border-radius: 50%;
&.online { &.online {
@@ -125,12 +161,17 @@ chat-panel {
} }
#chat { #chat {
background-color: mat-color(mat-palette($mat-grey, 300)); position: relative;
z-index: 7;
flex: 1 1 100%;
background-color: white;
box-shadow: -1px 0 2px 0 rgba(0, 0, 0, 0.25);
.messages { .messages {
position: relative; position: relative;
overflow: auto;
padding: 16px 0 40px 40px; padding: 16px 0 40px 40px;
overflow: auto;
-webkit-overflow-scrolling: touch;
.message-row { .message-row {
position: relative; position: relative;
@@ -152,6 +193,7 @@ chat-panel {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 12px; padding: 12px;
max-width: 100%;
.message { .message {
white-space: pre-wrap; white-space: pre-wrap;
@@ -165,6 +207,7 @@ chat-panel {
font-size: 11px; font-size: 11px;
margin-top: 8px; margin-top: 8px;
top: 100%; top: 100%;
left: 0;
color: $black-87-opacity; color: $black-87-opacity;
white-space: nowrap; white-space: nowrap;
} }
@@ -212,7 +255,7 @@ chat-panel {
.bubble { .bubble {
margin-left: auto; margin-left: auto;
background-color: #FFFFFF; background-color: #E0E0E0;
color: $black-87-opacity; color: $black-87-opacity;
border-top-left-radius: 20px; border-top-left-radius: 20px;
@@ -292,12 +335,34 @@ chat-panel {
padding: 0 16px 24px 16px; padding: 0 16px 24px 16px;
text-align: center; text-align: center;
} }
.no-contact-selected {
position: absolute;
top: 50%;
right: 0;
left: 0;
transform: translateY(-50%);
padding: 0 24px;
text-align: center;
.no-contact-icon {
mat-icon {
color: rgba(0, 0, 0, 0.06);
}
}
.no-contact {
margin-top: 24px;
}
}
} }
.reply-form { .reply-form {
position: relative; position: relative;
.message-text { .message-text {
background-color: #E0E0E0;
padding: 16px 8px; padding: 16px 8px;
.mat-form-field-wrapper { .mat-form-field-wrapper {
@@ -350,6 +415,20 @@ fuse-sidebar {
width: 100vw !important; width: 100vw !important;
} }
&.left-chat-panel {
.header {
.toggle-sidebar-folded,
.toggle-sidebar-open {
mat-icon {
transform: rotate(180deg);
}
}
}
}
// Folded // Folded
&.folded { &.folded {

View File

@@ -142,14 +142,6 @@ export class ChatPanelComponent implements OnInit, AfterViewInit, OnDestroy
// @ Public methods // @ Public methods
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
/**
* Toggle sidebar folded status
*/
toggleSidebarFolded(): void
{
this._fuseSidebarService.getSidebar('chatPanel').toggleFold();
}
/** /**
* Fold the temporarily unfolded sidebar back * Fold the temporarily unfolded sidebar back
*/ */
@@ -214,27 +206,52 @@ export class ChatPanelComponent implements OnInit, AfterViewInit, OnDestroy
} }
/** /**
* Go to chat with the contact * Toggle chat with the contact
* *
* @param contact * @param contact
*/ */
goToChat(contact): void toggleChat(contact): void
{ {
// Unfold the sidebar temporarily // If the contact equals to the selectedContact,
this.unfoldSidebarTemporarily(); // that means we will deselect the contact and
// unload the chat
if ( this.selectedContact && contact.id === this.selectedContact.id )
{
// Reset
this.resetChat();
}
// Otherwise, we will select the contact, open
// the sidebar and start the chat
else
{
// Unfold the sidebar temporarily
this.unfoldSidebarTemporarily();
// Set the selected contact // Set the selected contact
this.selectedContact = contact; this.selectedContact = contact;
// Load the chat // Load the chat
this._chatPanelService.getChat(contact.id).then((chat) => { this._chatPanelService.getChat(contact.id).then((chat) => {
// Set the chat // Set the chat
this.chat = chat; this.chat = chat;
// Prepare the chat for the replies // Prepare the chat for the replies
this._prepareChatForReplies(); this._prepareChatForReplies();
}); });
}
}
/**
* Remove the selected contact and unload the chat
*/
resetChat(): void
{
// Set the selected contact as null
this.selectedContact = null;
// Set the chat as null
this.chat = null;
} }
/** /**

View File

@@ -1,3 +1,16 @@
navbar-horizontal-style-1 { navbar-horizontal-style-1 {
} }
navbar {
&.horizontal-style-1 {
display: flex;
flex-direction: column;
flex: 1 1 auto;
width: 100%;
height: 56px;
max-height: 56px;
min-height: 56px;
}
}

View File

@@ -1,6 +1,3 @@
navbar { navbar {
display: flex;
flex-direction: column;
flex: 1 1 auto;
width: 100%;
} }

View File

@@ -1,4 +1,4 @@
import { Component, Input, ViewEncapsulation } from '@angular/core'; import { Component, ElementRef, Input, Renderer2, ViewEncapsulation } from '@angular/core';
@Component({ @Component({
selector : 'navbar', selector : 'navbar',
@@ -8,16 +8,46 @@ import { Component, Input, ViewEncapsulation } from '@angular/core';
}) })
export class NavbarComponent export class NavbarComponent
{ {
// Variant // Private
@Input() _variant: string;
variant;
/** /**
* Constructor * Constructor
*
* @param {ElementRef} _elementRef
* @param {Renderer2} _renderer
*/ */
constructor() constructor(
private _elementRef: ElementRef,
private _renderer: Renderer2
)
{ {
// Set the defaults // Set the private defaults
this.variant = 'vertical-style-1'; this._variant = 'vertical-style-1';
}
// -----------------------------------------------------------------------------------------------------
// @ Accessors
// -----------------------------------------------------------------------------------------------------
/**
* Variant
*/
get variant(): string
{
return this._variant;
}
@Input()
set variant(value: string)
{
// Remove the old class name
this._renderer.removeClass(this._elementRef.nativeElement, this.variant);
// Store the variant value
this._variant = value;
// Add the new class name
this._renderer.addClass(this._elementRef.nativeElement, value);
} }
} }

View File

@@ -41,6 +41,8 @@ fuse-sidebar {
position: relative; position: relative;
top: auto; top: auto;
padding: 0; padding: 0;
transform: translateX(0);
left: auto;
.avatar { .avatar {
width: 40px; width: 40px;
@@ -66,6 +68,24 @@ fuse-sidebar {
navbar { navbar {
&.vertical-style-1 {
display: flex;
flex-direction: column;
flex: 1 1 auto;
width: 100%;
height: 100%;
&.right-navbar {
.toggle-sidebar-opened {
mat-icon {
transform: rotate(180deg);
}
}
}
}
navbar-vertical-style-1 { navbar-vertical-style-1 {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -79,11 +99,13 @@ navbar {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
min-height: 64px; min-height: 64px;
max-height: 64px;
height: 64px; height: 64px;
padding: 12px 12px 12px 20px; padding: 12px 12px 12px 20px;
@include media-breakpoint('xs') { @include media-breakpoint('xs') {
min-height: 56px; min-height: 56px;
max-height: 56px;
height: 56px; height: 56px;
} }
@@ -113,6 +135,7 @@ navbar {
.navbar-scroll-container { .navbar-scroll-container {
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch;
background: linear-gradient(rgba(0, 0, 0, 0) 30%, rgba(0, 0, 0, 0) 30%), background: linear-gradient(rgba(0, 0, 0, 0) 30%, rgba(0, 0, 0, 0) 30%),
linear-gradient(rgba(0, 0, 0, 0.25) 0, rgba(0, 0, 0, 0) 40%); linear-gradient(rgba(0, 0, 0, 0.25) 0, rgba(0, 0, 0, 0) 40%);
@@ -134,6 +157,8 @@ navbar {
top: 92px; top: 92px;
border-radius: 50%; border-radius: 50%;
padding: 8px; padding: 8px;
transform: translateX(-50%);
left: 50%;
.avatar { .avatar {
width: 72px; width: 72px;
@@ -149,14 +174,4 @@ navbar {
} }
} }
} }
&.right-navbar {
.toggle-sidebar-opened {
mat-icon {
transform: rotate(180deg);
}
}
}
} }

View File

@@ -30,6 +30,24 @@ fuse-sidebar {
navbar { navbar {
&.vertical-style-2 {
display: flex;
flex-direction: column;
flex: 1 1 auto;
width: 100%;
height: 100%;
&.right-navbar {
.toggle-sidebar-opened {
mat-icon {
transform: rotate(180deg);
}
}
}
}
navbar-vertical-style-2 { navbar-vertical-style-2 {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -68,17 +86,8 @@ navbar {
.navbar-content { .navbar-content {
flex: 1 1 auto; flex: 1 1 auto;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch;
} }
} }
&.right-navbar {
.toggle-sidebar-opened {
mat-icon {
transform: rotate(180deg);
}
}
}
} }

View File

@@ -1,7 +1,5 @@
<mat-toolbar class="p-0 mat-elevation-z1"> <mat-toolbar class="p-0 mat-elevation-z1">
<mat-progress-bar *ngIf="showLoadingBar" class="loading-bar" color="accent" mode="indeterminate"></mat-progress-bar>
<div fxFlex fxFill fxLayout="row" fxLayoutAlign="start center"> <div fxFlex fxFill fxLayout="row" fxLayoutAlign="start center">
<div fxFlex="1 0 auto" fxLayout="row" fxLayoutAlign="start center"> <div fxFlex="1 0 auto" fxLayout="row" fxLayoutAlign="start center">

View File

@@ -11,17 +11,9 @@
} }
.mat-toolbar { .mat-toolbar {
position: relative;
background: inherit; background: inherit;
color: inherit; color: inherit;
position: relative;
.loading-bar {
position: absolute;
top: 0;
left: 0;
right: 0;
width: 100%;
}
} }
.logo { .logo {

View File

@@ -8,7 +8,6 @@ import { FuseConfigService } from '@fuse/services/config.service';
import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service'; import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service';
import { navigation } from 'app/navigation/navigation'; import { navigation } from 'app/navigation/navigation';
import { FuseLoadingBarService } from '@fuse/services/loading-bar.service';
@Component({ @Component({
selector : 'toolbar', selector : 'toolbar',
@@ -24,7 +23,6 @@ export class ToolbarComponent implements OnInit, OnDestroy
languages: any; languages: any;
navigation: any; navigation: any;
selectedLanguage: any; selectedLanguage: any;
showLoadingBar: boolean;
userStatusOptions: any[]; userStatusOptions: any[];
// Private // Private
@@ -34,13 +32,11 @@ export class ToolbarComponent implements OnInit, OnDestroy
* Constructor * Constructor
* *
* @param {FuseConfigService} _fuseConfigService * @param {FuseConfigService} _fuseConfigService
* @param {FuseLoadingBarService} _fuseLoadingBarService
* @param {FuseSidebarService} _fuseSidebarService * @param {FuseSidebarService} _fuseSidebarService
* @param {TranslateService} _translateService * @param {TranslateService} _translateService
*/ */
constructor( constructor(
private _fuseConfigService: FuseConfigService, private _fuseConfigService: FuseConfigService,
private _fuseLoadingBarService: FuseLoadingBarService,
private _fuseSidebarService: FuseSidebarService, private _fuseSidebarService: FuseSidebarService,
private _translateService: TranslateService private _translateService: TranslateService
) )
@@ -102,13 +98,6 @@ export class ToolbarComponent implements OnInit, OnDestroy
*/ */
ngOnInit(): void ngOnInit(): void
{ {
// Subscribe to the Fuse loading bar service
this._fuseLoadingBarService.visible
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((visible) => {
this.showLoadingBar = visible;
});
// Subscribe to the config changes // Subscribe to the config changes
this._fuseConfigService.config this._fuseConfigService.config
.pipe(takeUntil(this._unsubscribeAll)) .pipe(takeUntil(this._unsubscribeAll))

View File

@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { MatButtonModule, MatIconModule, MatMenuModule, MatProgressBarModule, MatToolbarModule } from '@angular/material'; import { MatButtonModule, MatIconModule, MatMenuModule, MatToolbarModule } from '@angular/material';
import { FuseSearchBarModule, FuseShortcutsModule } from '@fuse/components'; import { FuseSearchBarModule, FuseShortcutsModule } from '@fuse/components';
import { FuseSharedModule } from '@fuse/shared.module'; import { FuseSharedModule } from '@fuse/shared.module';
@@ -16,7 +16,6 @@ import { ToolbarComponent } from 'app/layout/components/toolbar/toolbar.componen
MatButtonModule, MatButtonModule,
MatIconModule, MatIconModule,
MatMenuModule, MatMenuModule,
MatProgressBarModule,
MatToolbarModule, MatToolbarModule,
FuseSharedModule, FuseSharedModule,

View File

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

View File

@@ -16,13 +16,6 @@ horizontal-layout-1 {
z-index: 1; z-index: 1;
min-width: 0; min-width: 0;
// Boxed
&.boxed {
max-width: 1200px;
margin: 0 auto;
@include mat-elevation(8);
}
// Container 1 // Container 1
> .container { > .container {
position: relative; position: relative;
@@ -49,6 +42,7 @@ horizontal-layout-1 {
transform: translateZ(0); transform: translateZ(0);
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch;
// Content component // Content component
content { content {

View File

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

View File

@@ -16,13 +16,6 @@ vertical-layout-1 {
z-index: 1; z-index: 1;
min-width: 0; min-width: 0;
// Boxed
&.boxed {
max-width: 1200px;
margin: 0 auto;
@include mat-elevation(8);
}
// Container 1 // Container 1
> .container { > .container {
position: relative; position: relative;
@@ -49,6 +42,7 @@ vertical-layout-1 {
transform: translateZ(0); transform: translateZ(0);
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch;
// Content component // Content component
content { content {

View File

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

View File

@@ -16,13 +16,6 @@ vertical-layout-2 {
z-index: 1; z-index: 1;
min-width: 0; min-width: 0;
// Boxed
&.boxed {
max-width: 1200px;
margin: 0 auto;
@include mat-elevation(8);
}
// Container 1 (Scrollable) // Container 1 (Scrollable)
> .container { > .container {
position: relative; position: relative;
@@ -32,6 +25,7 @@ vertical-layout-2 {
width: 100%; width: 100%;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch;
transform: translateZ(0); transform: translateZ(0);
// Container 2 // Container 2

View File

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

View File

@@ -16,13 +16,6 @@ vertical-layout-3 {
z-index: 1; z-index: 1;
min-width: 0; min-width: 0;
// Boxed
&.boxed {
max-width: 1200px;
margin: 0 auto;
@include mat-elevation(8);
}
// Container 1 (Scrollable) // Container 1 (Scrollable)
> .container { > .container {
position: relative; position: relative;
@@ -32,6 +25,7 @@ vertical-layout-3 {
width: 100%; width: 100%;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch;
transform: translateZ(0); transform: translateZ(0);
// Container 2 // Container 2

View File

@@ -149,6 +149,7 @@
left: 0; left: 0;
padding: 48px; padding: 48px;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
&.ng-animating { &.ng-animating {
overflow: hidden; overflow: hidden;

View File

@@ -33,6 +33,7 @@
#chat-content { #chat-content {
background: transparent; background: transparent;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
.message-row { .message-row {
padding: 16px; padding: 16px;
@@ -113,9 +114,10 @@
padding-right: 16px; padding-right: 16px;
textarea { textarea {
overflow: auto;
max-height: 80px; max-height: 80px;
transition: height 200ms ease; transition: height 200ms ease;
overflow: auto;
-webkit-overflow-scrolling: touch;
&.grow { &.grow {
height: 80px; height: 80px;

View File

@@ -42,6 +42,7 @@
.sidenav-content { .sidenav-content {
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
.contact-list, .chat-list { .contact-list, .chat-list {

View File

@@ -5,6 +5,7 @@
flex: 1; flex: 1;
flex-direction: column; flex-direction: column;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
mat-toolbar { mat-toolbar {

View File

@@ -5,6 +5,7 @@
flex: 1; flex: 1;
flex-direction: column; flex-direction: column;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
mat-toolbar { mat-toolbar {

View File

@@ -35,6 +35,7 @@
&.compact { &.compact {
padding: 0; padding: 0;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
.invoice-container { .invoice-container {
padding: 16px; padding: 16px;

View File

@@ -33,6 +33,7 @@
flex: 1 1 auto; flex: 1 1 auto;
border-bottom: 1px solid rgba(0, 0, 0, .12); border-bottom: 1px solid rgba(0, 0, 0, .12);
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
.mat-header-row { .mat-header-row {
min-height: 64px; min-height: 64px;

View File

@@ -32,6 +32,7 @@
flex: 1 1 auto; flex: 1 1 auto;
border-bottom: 1px solid rgba(0, 0, 0, .12); border-bottom: 1px solid rgba(0, 0, 0, .12);
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
.mat-header-row { .mat-header-row {
min-height: 64px; min-height: 64px;

View File

@@ -43,6 +43,7 @@
.content { .content {
flex: 1 1 auto; flex: 1 1 auto;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
} }
} }

View File

@@ -4,8 +4,9 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
overflow-y: auto;
padding: 24px; padding: 24px;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
.select-message-text { .select-message-text {
font-size: 24px; font-size: 24px;

View File

@@ -3,9 +3,10 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
overflow-y: auto;
padding: 0; padding: 0;
border-right: 1px solid rgba(0, 0, 0, .12); border-right: 1px solid rgba(0, 0, 0, .12);
overflow-y: auto;
-webkit-overflow-scrolling: touch;
.no-messages-text { .no-messages-text {
font-size: 24px; font-size: 24px;

View File

@@ -4,8 +4,9 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
overflow-y: auto;
padding: 24px; padding: 24px;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
.select-message-text { .select-message-text {
font-size: 24px; font-size: 24px;

View File

@@ -3,9 +3,10 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
overflow-y: auto;
padding: 0; padding: 0;
border-right: 1px solid rgba(0, 0, 0, .12); border-right: 1px solid rgba(0, 0, 0, .12);
overflow-y: auto;
-webkit-overflow-scrolling: touch;
.no-messages-text { .no-messages-text {
font-size: 24px; font-size: 24px;

View File

@@ -28,9 +28,10 @@
.list-content { .list-content {
position: relative; position: relative;
min-height: 0;
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: auto;
min-height: 0; -webkit-overflow-scrolling: touch;
.list-cards { .list-cards {
position: relative; position: relative;

View File

@@ -32,6 +32,7 @@
> .content { > .content {
flex: 1 1 auto; flex: 1 1 auto;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch;
} }
} }
} }

View File

@@ -6,6 +6,7 @@
#boards { #boards {
width: 100%; width: 100%;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch;
.board-list { .board-list {
padding: 32px 0; padding: 32px 0;

View File

@@ -5,6 +5,7 @@
flex: 1 0 auto; flex: 1 0 auto;
flex-direction: column; flex-direction: column;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch;
.todo-header { .todo-header {
padding: 24px; padding: 24px;

View File

@@ -2,10 +2,11 @@
display: flex; display: flex;
flex: 1 0 auto; flex: 1 0 auto;
flex-direction: column; flex-direction: column;
overflow-y: auto;
position: relative; position: relative;
padding: 0; padding: 0;
border-right: 1px solid rgba(0, 0, 0, .12); border-right: 1px solid rgba(0, 0, 0, .12);
overflow-y: auto;
-webkit-overflow-scrolling: touch;
.no-todos-text { .no-todos-text {
font-size: 24px; font-size: 24px;

View File

@@ -19,6 +19,127 @@
<div class="changelog"> <div class="changelog">
<!-- --------------------------------------------------------------------------------------------- -->
<!-- @ v6.2.4 -->
<!-- --------------------------------------------------------------------------------------------- -->
<div class="entry">
<div class="title">
<span class="version">v6.2.4</span>
<span class="date">(2018-07-14)</span>
</div>
<div class="groups">
<div class="breaking-changes">
<span class="title">Breaking Changes</span>
<ul>
<li>
(FuseLoadingBarService) Removed in favor of the new FuseProgressBar component
</li>
</ul>
</div>
<div class="new">
<span class="title">New</span>
<ul>
<li>Updated Angular to 6.0.9</li>
<li>Updated various other packages</li>
<li>
(FuseProgressBar) New component and its service for globally controlling a progress bar
</li>
</ul>
</div>
<div class="improved">
<span class="title">Improved</span>
<ul>
<li>(Navbar) Moved navbar styles to the variants for better granular control</li>
</ul>
</div>
<div class="fixed">
<span class="title">Fixed</span>
<ul>
<li>(Global) Scrolling is not smooth on iOS devices</li>
<li>(Horizontal Layout) Navbar covers the entire screen</li>
<li>(Boxed Layout) Boxed layout has alignment issues</li>
</ul>
</div>
</div>
</div>
<!-- --------------------------------------------------------------------------------------------- -->
<!-- @ v6.2.3 -->
<!-- --------------------------------------------------------------------------------------------- -->
<div class="entry">
<div class="title">
<span class="version">v6.2.3</span>
<span class="date">(2018-07-13)</span>
</div>
<div class="groups">
<div class="fixed">
<span class="title">Fixed</span>
<ul>
<li>(Navbar) Doesn't scroll on Firefox, IE & Edge</li>
<li>(Navbar) IE11 style fixes</li>
<li>(Chat Panel) IE11 style fixes</li>
</ul>
</div>
<div class="improved">
<span class="title">Improved</span>
<ul>
<li>(Chat Panel) Style and logic tweaks</li>
</ul>
</div>
</div>
</div>
<!-- --------------------------------------------------------------------------------------------- -->
<!-- @ 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 --> <!-- @ v6.2.1 -->
<!-- --------------------------------------------------------------------------------------------- --> <!-- --------------------------------------------------------------------------------------------- -->
@@ -31,26 +152,27 @@
<div class="groups"> <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"> <div class="fixed">
<span class="title">Fixed</span> <span class="title">Fixed</span>
<ul> <ul>
<ul> <li>(Chat Panel) Mobile width issues</li>
<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>
</ul> </ul>
</div> </div>
<div class="improved"> <div class="improved">
<span class="title">Improved</span> <span class="title">Improved</span>
<ul> <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> </ul>
</div> </div>

View File

@@ -43,9 +43,10 @@
display: flex !important; display: flex !important;
flex: 1; flex: 1;
max-height: 400px; max-height: 400px;
overflow: auto;
min-width: 400px; min-width: 400px;
margin-left: 24px; margin-left: 24px;
overflow: auto;
-webkit-overflow-scrolling: touch;
} }
} }
} }

View File

@@ -11,6 +11,7 @@ import { DocsComponentsCountdownComponent } from 'app/main/documentation/compone
import { DocsComponentsHighlightComponent } from 'app/main/documentation/components/highlight/highlight.component'; import { DocsComponentsHighlightComponent } from 'app/main/documentation/components/highlight/highlight.component';
import { DocsComponentsMaterialColorPickerComponent } from 'app/main/documentation/components/material-color-picker/material-color-picker.component'; import { DocsComponentsMaterialColorPickerComponent } from 'app/main/documentation/components/material-color-picker/material-color-picker.component';
import { DocsComponentsNavigationComponent } from 'app/main/documentation/components/navigation/navigation.component'; import { DocsComponentsNavigationComponent } from 'app/main/documentation/components/navigation/navigation.component';
import { DocsComponentsProgressBarComponent } from 'app/main/documentation/components/progress-bar/progress-bar.component';
import { DocsComponentsSearchBarComponent } from 'app/main/documentation/components/search-bar/search-bar.component'; import { DocsComponentsSearchBarComponent } from 'app/main/documentation/components/search-bar/search-bar.component';
import { DocsComponentsSidebarComponent } from 'app/main/documentation/components/sidebar/sidebar.component'; import { DocsComponentsSidebarComponent } from 'app/main/documentation/components/sidebar/sidebar.component';
import { DocsComponentsShortcutsComponent } from 'app/main/documentation/components/shortcuts/shortcuts.component'; import { DocsComponentsShortcutsComponent } from 'app/main/documentation/components/shortcuts/shortcuts.component';
@@ -37,6 +38,10 @@ const routes = [
path : 'navigation', path : 'navigation',
component: DocsComponentsNavigationComponent component: DocsComponentsNavigationComponent
}, },
{
path : 'progress-bar',
component: DocsComponentsProgressBarComponent
},
{ {
path : 'search-bar', path : 'search-bar',
component: DocsComponentsSearchBarComponent component: DocsComponentsSearchBarComponent
@@ -62,6 +67,7 @@ const routes = [
DocsComponentsHighlightComponent, DocsComponentsHighlightComponent,
DocsComponentsMaterialColorPickerComponent, DocsComponentsMaterialColorPickerComponent,
DocsComponentsNavigationComponent, DocsComponentsNavigationComponent,
DocsComponentsProgressBarComponent,
DocsComponentsSearchBarComponent, DocsComponentsSearchBarComponent,
DocsComponentsSidebarComponent, DocsComponentsSidebarComponent,
DocsComponentsShortcutsComponent, DocsComponentsShortcutsComponent,

View File

@@ -0,0 +1,83 @@
<div id="progress-bar" class="page-layout simple fullwidth docs">
<!-- HEADER -->
<div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
<div fxLayout="column" fxLayoutAlign="center start">
<div class="black-fg" fxLayout="row" fxLayoutAlign="start center">
<mat-icon class="secondary-text s-18">home</mat-icon>
<mat-icon class="secondary-text s-16">chevron_right</mat-icon>
<span class="secondary-text">Documentation</span>
<mat-icon class="secondary-text s-16">chevron_right</mat-icon>
<span class="secondary-text">Components</span>
</div>
<div class="h2 mt-16">Progress Bar</div>
</div>
</div>
<!-- / HEADER -->
<!-- CONTENT -->
<div class="content p-24">
<p>
<code>fuse-progress-bar</code> is a custom built Fuse component allows you to have a service controlled
progress bar. It internally uses <code>mat-progress-bar</code> and provides a global service to control it.
</p>
<p class="message-box info">
Due to the nature of global progress bars, <code>fuse-progress-bar</code> can only be used once in the
entire app and it's currently located at <code>app.component.html</code> file.
</p>
<div class="section-title">Usage</div>
<p class="py-8">
<fuse-highlight lang="html">
<textarea #source>
<fuse-progress-bar></fuse-progress-bar>
</textarea>
</fuse-highlight>
</p>
<div class="section-title">Service Usage</div>
<p class="mat-grey-200-bg py-8">
<fuse-highlight lang="typescript">
<textarea #source>
export class SomeComponent implements OnInit
{
/**
* Constructor
*/
constructor(
private _fuseProgressBarService: FuseProgressBarService
) {}
showcase()
{
// Show the progress bar
this._fuseProgressBarService.show();
// Hide the progress bar
this._fuseProgressBarService.hide();
// Set the mode
// mode: 'determinate' | 'indeterminate' | 'buffer' | 'query'
this._fuseProgressBarService.setMode(mode);
// Set the value
// value: number
this._fuseProgressBarService.setValue(value);
// Set the buffer value
// bufferValue: number
this._fuseProgressBarService.setBufferValue(bufferValue);
}
}
</textarea>
</fuse-highlight>
</p>
</div>
</div>

View File

@@ -0,0 +1,7 @@
:host {
.content{
max-width: 1100px;
}
}

View File

@@ -0,0 +1,17 @@
import { Component } from '@angular/core';
@Component({
selector : 'docs-components-progress-bar',
templateUrl: './progress-bar.component.html',
styleUrls : ['./progress-bar.component.scss']
})
export class DocsComponentsProgressBarComponent
{
/**
* Constructor
*/
constructor()
{
}
}

View File

@@ -1,66 +0,0 @@
<div id="fuse-loading-bar" class="page-layout simple fullwidth docs">
<!-- HEADER -->
<div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
<div fxLayout="column" fxLayoutAlign="center start">
<div class="black-fg" fxLayout="row" fxLayoutAlign="start center">
<mat-icon class="secondary-text s-18">home</mat-icon>
<mat-icon class="secondary-text s-16">chevron_right</mat-icon>
<span class="secondary-text">Documentation</span>
<mat-icon class="secondary-text s-16">chevron_right</mat-icon>
<span class="secondary-text">Services</span>
</div>
<div class="h2 mt-16">Fuse Loading Bar</div>
</div>
</div>
<!-- / HEADER -->
<!-- CONTENT -->
<div class="content p-24">
<p>
<code>Loading bar</code> is a custom Fuse service that allows to have a control on the loading bar that is
placed in the Toolbar by default.
</p>
<div class="section-title">Usage</div>
<p class="mat-grey-200-bg py-8">
<fuse-highlight lang="typescript">
<textarea #source>
export class SomeComponent implements OnInit
{
constructor(
private _fuseLoadingBarService: FuseLoadingBarService
) {}
ngOnInit()
{
// Subscribe to the Fuse loading bar service
this._fuseLoadingBarService.visible
.subscribe((visible) => {
this.showLoadingBar = visible;
});
}
showLoadingBar()
{
this._fuseLoadingBarService.showLoadingBar();
}
hideLoadingBar()
{
this._fuseLoadingBarService.hideLoadingBar();
}
}
</textarea>
</fuse-highlight>
</p>
</div>
</div>

View File

@@ -1,17 +0,0 @@
import { Component } from '@angular/core';
@Component({
selector : 'fuse-loading-bar-service-docs',
templateUrl: './fuse-loading-bar.component.html',
styleUrls : ['./fuse-loading-bar.component.scss']
})
export class FuseLoadingBarServiceDocsComponent
{
/**
* Constructor
*/
constructor()
{
}
}

View File

@@ -6,7 +6,6 @@ import { FuseSharedModule } from '@fuse/shared.module';
import { FuseHighlightModule } from '@fuse/components/index'; import { FuseHighlightModule } from '@fuse/components/index';
import { FuseConfigServiceDocsComponent } from 'app/main/documentation/services/fuse-config/fuse-config.component'; import { FuseConfigServiceDocsComponent } from 'app/main/documentation/services/fuse-config/fuse-config.component';
import { FuseLoadingBarServiceDocsComponent } from 'app/main/documentation/services/fuse-loading-bar/fuse-loading-bar.component';
import { FuseSplashScreenServiceDocsComponent } from 'app/main/documentation/services/fuse-splash-screen/fuse-splash-screen.component'; import { FuseSplashScreenServiceDocsComponent } from 'app/main/documentation/services/fuse-splash-screen/fuse-splash-screen.component';
const routes = [ const routes = [
@@ -14,10 +13,6 @@ const routes = [
path : 'fuse-config', path : 'fuse-config',
component: FuseConfigServiceDocsComponent component: FuseConfigServiceDocsComponent
}, },
{
path : 'fuse-loading-bar',
component: FuseLoadingBarServiceDocsComponent
},
{ {
path : 'fuse-splash-screen', path : 'fuse-splash-screen',
component: FuseSplashScreenServiceDocsComponent component: FuseSplashScreenServiceDocsComponent
@@ -27,7 +22,6 @@ const routes = [
@NgModule({ @NgModule({
declarations: [ declarations: [
FuseConfigServiceDocsComponent, FuseConfigServiceDocsComponent,
FuseLoadingBarServiceDocsComponent,
FuseSplashScreenServiceDocsComponent FuseSplashScreenServiceDocsComponent
], ],
imports : [ imports : [

View File

@@ -36,11 +36,13 @@
} }
#forgot-password-form-wrapper { #forgot-password-form-wrapper {
overflow: auto;
width: 400px; width: 400px;
min-width: 400px; min-width: 400px;
max-width: 400px; max-width: 400px;
background: #FFFFFF; background: #FFFFFF;
overflow: auto;
-webkit-overflow-scrolling: touch;
@include mat-elevation(16); @include mat-elevation(16);
@include media-breakpoint('sm') { @include media-breakpoint('sm') {

View File

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

View File

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

View File

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

View File

@@ -36,11 +36,13 @@
} }
#login-form-wrapper { #login-form-wrapper {
overflow: auto;
width: 400px; width: 400px;
min-width: 400px; min-width: 400px;
max-width: 400px; max-width: 400px;
background: #FFFFFF; background: #FFFFFF;
overflow: auto;
-webkit-overflow-scrolling: touch;
@include mat-elevation(16); @include mat-elevation(16);
@include media-breakpoint('sm') { @include media-breakpoint('sm') {

View File

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

View File

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

View File

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

View File

@@ -36,11 +36,13 @@
} }
#register-form-wrapper { #register-form-wrapper {
overflow: auto;
width: 400px; width: 400px;
min-width: 400px; min-width: 400px;
max-width: 400px; max-width: 400px;
background: #FFFFFF; background: #FFFFFF;
overflow: auto;
-webkit-overflow-scrolling: touch;
@include mat-elevation(16); @include mat-elevation(16);
@include media-breakpoint('sm') { @include media-breakpoint('sm') {

View File

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

View File

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

View File

@@ -36,11 +36,13 @@
} }
#reset-password-form-wrapper { #reset-password-form-wrapper {
overflow: auto;
width: 400px; width: 400px;
min-width: 400px; min-width: 400px;
max-width: 400px; max-width: 400px;
background: #FFFFFF; background: #FFFFFF;
overflow: auto;
-webkit-overflow-scrolling: touch;
@include mat-elevation(16); @include mat-elevation(16);
@include media-breakpoint('sm') { @include media-breakpoint('sm') {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -849,7 +849,7 @@ export const navigation: FuseNavigation[] = [
icon : 'update', icon : 'update',
url : '/documentation/changelog', url : '/documentation/changelog',
badge: { badge: {
title: '6.2.0', title: '6.2.4',
bg : '#EC0C8E', bg : '#EC0C8E',
fg : '#FFFFFF' fg : '#FFFFFF'
} }
@@ -960,6 +960,12 @@ export const navigation: FuseNavigation[] = [
type : 'item', type : 'item',
url : '/documentation/components/navigation' url : '/documentation/components/navigation'
}, },
{
id : 'progress-bar',
title: 'Progress Bar',
type : 'item',
url : '/documentation/components/progress-bar'
},
{ {
id : 'search-bar', id : 'search-bar',
title: 'Search Bar', title: 'Search Bar',
@@ -1057,12 +1063,6 @@ export const navigation: FuseNavigation[] = [
type : 'item', type : 'item',
url : '/documentation/services/fuse-config' url : '/documentation/services/fuse-config'
}, },
{
id : 'fuse-loading-bar',
title: 'Fuse Loading Bar',
type : 'item',
url : '/documentation/services/fuse-loading-bar'
},
{ {
id : 'fuse-splash-screen', id : 'fuse-splash-screen',
title: 'Fuse Splash Screen', title: 'Fuse Splash Screen',