Compare commits

..

8 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
70 changed files with 871 additions and 639 deletions

690
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@@ -4,6 +4,7 @@ export * from './demo/demo.module';
export * from './highlight/highlight.module';
export * from './material-color-picker/material-color-picker.module';
export * from './navigation/navigation.module';
export * from './progress-bar/progress-bar.module';
export * from './search-bar/search-bar.module';
export * from './shortcuts/shortcuts.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({
providedIn: 'root'
})
export class FuseLoadingBarService
export class FuseProgressBarService
{
// Private
private _bufferValue: BehaviorSubject<number>;
private _mode: BehaviorSubject<string>;
private _value: BehaviorSubject<number>;
private _visible: BehaviorSubject<boolean>;
/**
@@ -28,9 +31,50 @@ export class FuseLoadingBarService
// @ 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>
{
// Return the _visible as observable
return this._visible.asObservable();
}
@@ -45,24 +89,23 @@ export class FuseLoadingBarService
*/
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);
// Subscribe to the router events to show/hide the loading bar
this._router.events
.pipe(
filter((event) => event instanceof NavigationStart)
)
.pipe(filter((event) => event instanceof NavigationStart))
.subscribe(() => {
this.showLoadingBar();
this.show();
});
this._router.events
.pipe(
filter((event) => event instanceof NavigationEnd)
)
.pipe(filter((event) => event instanceof NavigationEnd))
.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);
}
/**
* Hide the loading bar
* Hide the progress bar
*/
hideLoadingBar(): void
hide(): void
{
// Hide
this._visible.next(false);
}
}

View File

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

View File

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

View File

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

View File

@@ -10,4 +10,15 @@ body {
padding: 0;
overflow: hidden;
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;
> .content {
overflow: 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 {
overflow: auto;
-webkit-overflow-scrolling: touch;
}
}
}
@@ -346,6 +348,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
.content {
overflow: auto;
-webkit-overflow-scrolling: touch;
}
}
@@ -358,6 +361,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
> .content {
flex: 1 1 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 {
overflow: auto;
-webkit-overflow-scrolling: touch;
}
}
}
@@ -500,12 +505,14 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
.content {
overflow: auto;
-webkit-overflow-scrolling: touch;
}
}
> .center {
flex: 1 1 auto;
overflow: auto;
-webkit-overflow-scrolling: touch;
}
}
@@ -528,12 +535,14 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too
.content {
overflow: auto;
-webkit-overflow-scrolling: touch;
}
}
> .center {
flex: 1 1 auto;
overflow: auto;
-webkit-overflow-scrolling: touch;
}
}
}

View File

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

View File

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

View File

@@ -1,22 +1,30 @@
<!-- PROGRESS BAR -->
<fuse-progress-bar></fuse-progress-bar>
<!-- / PROGRESS BAR -->
<!-- VERTICAL LAYOUT 1 -->
<ng-container *ngIf="fuseConfig.layout.style === 'vertical-layout-1'">
<vertical-layout-1></vertical-layout-1>
</ng-container>
<!-- / VERTICAL LAYOUT 1 -->
<!-- VERTICAL LAYOUT 2 -->
<ng-container *ngIf="fuseConfig.layout.style === 'vertical-layout-2'">
<vertical-layout-2></vertical-layout-2>
</ng-container>
<!-- / VERTICAL LAYOUT 2 -->
<!-- VERTICAL LAYOUT 3 -->
<ng-container *ngIf="fuseConfig.layout.style === 'vertical-layout-3'">
<vertical-layout-3></vertical-layout-3>
</ng-container>
<!-- / VERTICAL LAYOUT 3 -->
<!-- HORIZONTAL LAYOUT 1 -->
<ng-container *ngIf="fuseConfig.layout.style === 'horizontal-layout-1'">
<horizontal-layout-1></horizontal-layout-1>
</ng-container>
<!-- / HORIZONTAL LAYOUT 1 -->
<!-- THEME OPTIONS PANEL -->
<button mat-icon-button class="mat-primary-bg mat-elevation-z2 theme-options-button"
@@ -28,4 +36,5 @@
<fuse-sidebar name="themeOptionsPanel" class="theme-options-sidebar" position="right" [invisibleOverlay]="true">
<fuse-theme-options></fuse-theme-options>
</fuse-sidebar>
</fuse-sidebar>
<!-- / THEME OPTIONS PANEL -->

View File

@@ -22,8 +22,8 @@ import { locale as navigationTurkish } from 'app/navigation/i18n/tr';
})
export class AppComponent implements OnInit, OnDestroy
{
navigation: any;
fuseConfig: any;
navigation: any;
// Private
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
if ( this._platform.ANDROID || this._platform.IOS )
{
this.document.body.className += ' is-mobile';
this.document.body.classList.add('is-mobile');
}
// Set the private defaults
@@ -96,6 +96,15 @@ export class AppComponent implements OnInit, OnDestroy
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((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 { FuseSharedModule } from '@fuse/shared.module';
import { FuseSidebarModule, FuseThemeOptionsModule } from '@fuse/components';
import { FuseProgressBarModule, FuseSidebarModule, FuseThemeOptionsModule } from '@fuse/components';
import { fuseConfig } from 'app/fuse-config';
@@ -72,6 +72,7 @@ const appRoutes: Routes = [
// Fuse modules
FuseModule.forRoot(fuseConfig),
FuseProgressBarModule,
FuseSharedModule,
FuseSidebarModule,
FuseThemeOptionsModule,

View File

@@ -46,11 +46,11 @@ chat-panel {
position: relative;
z-index: 5;
padding: 16px 0;
overflow: auto;
width: 72px;
min-width: 72px;
max-width: 72px;
background-color: #F9F9F9;
overflow: auto;
-webkit-overflow-scrolling: touch;
// Perfect scrollbar
@@ -169,8 +169,9 @@ chat-panel {
.messages {
position: relative;
overflow: auto;
padding: 16px 0 40px 40px;
overflow: auto;
-webkit-overflow-scrolling: touch;
.message-row {
position: relative;

View File

@@ -1,3 +1,16 @@
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,7 +1,3 @@
navbar {
display: flex;
flex-direction: column;
flex: 1 1 auto;
width: 100%;
height: 100%;
}

View File

@@ -1,4 +1,4 @@
import { Component, Input, ViewEncapsulation } from '@angular/core';
import { Component, ElementRef, Input, Renderer2, ViewEncapsulation } from '@angular/core';
@Component({
selector : 'navbar',
@@ -8,16 +8,46 @@ import { Component, Input, ViewEncapsulation } from '@angular/core';
})
export class NavbarComponent
{
// Variant
@Input()
variant;
// Private
_variant: string;
/**
* Constructor
*
* @param {ElementRef} _elementRef
* @param {Renderer2} _renderer
*/
constructor()
constructor(
private _elementRef: ElementRef,
private _renderer: Renderer2
)
{
// Set the defaults
this.variant = 'vertical-style-1';
// Set the private defaults
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

@@ -68,6 +68,24 @@ fuse-sidebar {
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 {
display: flex;
flex-direction: column;
@@ -117,6 +135,7 @@ navbar {
.navbar-scroll-container {
overflow-y: auto;
-webkit-overflow-scrolling: touch;
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%);
@@ -155,14 +174,4 @@ navbar {
}
}
}
&.right-navbar {
.toggle-sidebar-opened {
mat-icon {
transform: rotate(180deg);
}
}
}
}

View File

@@ -30,6 +30,24 @@ fuse-sidebar {
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 {
display: flex;
flex-direction: column;
@@ -68,17 +86,8 @@ navbar {
.navbar-content {
flex: 1 1 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-progress-bar *ngIf="showLoadingBar" class="loading-bar" color="accent" mode="indeterminate"></mat-progress-bar>
<div fxFlex fxFill fxLayout="row" fxLayoutAlign="start center">
<div fxFlex="1 0 auto" fxLayout="row" fxLayoutAlign="start center">

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
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 { FuseSharedModule } from '@fuse/shared.module';
@@ -16,7 +16,6 @@ import { ToolbarComponent } from 'app/layout/components/toolbar/toolbar.componen
MatButtonModule,
MatIconModule,
MatMenuModule,
MatProgressBarModule,
MatToolbarModule,
FuseSharedModule,

View File

@@ -12,7 +12,7 @@
</ng-container>
<!-- / SIDE PANEL -->
<div id="main" [ngClass]="{'boxed':fuseConfig.layout.width === 'boxed'}">
<div id="main">
<!-- TOOLBAR: Above -->
<ng-container *ngIf="fuseConfig.layout.toolbar.position === 'above'">

View File

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

View File

@@ -12,7 +12,7 @@
</ng-container>
<!-- / SIDE PANEL -->
<div id="main" [ngClass]="{'boxed':fuseConfig.layout.width === 'boxed'}">
<div id="main">
<!-- TOOLBAR: Above -->
<ng-container *ngIf="fuseConfig.layout.toolbar.position === 'above'">

View File

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

View File

@@ -12,7 +12,7 @@
</ng-container>
<!-- / SIDE PANEL -->
<div id="main" [ngClass]="{'boxed':fuseConfig.layout.width === 'boxed'}">
<div id="main">
<!-- TOOLBAR: Above fixed -->
<ng-container *ngIf="fuseConfig.layout.toolbar.position === 'above-fixed'">

View File

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

View File

@@ -12,7 +12,7 @@
</ng-container>
<!-- / SIDE PANEL -->
<div id="main" [ngClass]="{'boxed':fuseConfig.layout.width === 'boxed'}">
<div id="main">
<!-- TOOLBAR: Above fixed -->
<ng-container *ngIf="fuseConfig.layout.toolbar.position === 'above-fixed'">

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -19,6 +19,58 @@
<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 -->
<!-- --------------------------------------------------------------------------------------------- -->

View File

@@ -43,9 +43,10 @@
display: flex !important;
flex: 1;
max-height: 400px;
overflow: auto;
min-width: 400px;
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 { DocsComponentsMaterialColorPickerComponent } from 'app/main/documentation/components/material-color-picker/material-color-picker.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 { DocsComponentsSidebarComponent } from 'app/main/documentation/components/sidebar/sidebar.component';
import { DocsComponentsShortcutsComponent } from 'app/main/documentation/components/shortcuts/shortcuts.component';
@@ -37,6 +38,10 @@ const routes = [
path : 'navigation',
component: DocsComponentsNavigationComponent
},
{
path : 'progress-bar',
component: DocsComponentsProgressBarComponent
},
{
path : 'search-bar',
component: DocsComponentsSearchBarComponent
@@ -62,6 +67,7 @@ const routes = [
DocsComponentsHighlightComponent,
DocsComponentsMaterialColorPickerComponent,
DocsComponentsNavigationComponent,
DocsComponentsProgressBarComponent,
DocsComponentsSearchBarComponent,
DocsComponentsSidebarComponent,
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 { 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';
const routes = [
@@ -14,10 +13,6 @@ const routes = [
path : 'fuse-config',
component: FuseConfigServiceDocsComponent
},
{
path : 'fuse-loading-bar',
component: FuseLoadingBarServiceDocsComponent
},
{
path : 'fuse-splash-screen',
component: FuseSplashScreenServiceDocsComponent
@@ -27,7 +22,6 @@ const routes = [
@NgModule({
declarations: [
FuseConfigServiceDocsComponent,
FuseLoadingBarServiceDocsComponent,
FuseSplashScreenServiceDocsComponent
],
imports : [

View File

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

View File

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

View File

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

View File

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

View File

@@ -849,7 +849,7 @@ export const navigation: FuseNavigation[] = [
icon : 'update',
url : '/documentation/changelog',
badge: {
title: '6.2.3',
title: '6.2.4',
bg : '#EC0C8E',
fg : '#FFFFFF'
}
@@ -960,6 +960,12 @@ export const navigation: FuseNavigation[] = [
type : 'item',
url : '/documentation/components/navigation'
},
{
id : 'progress-bar',
title: 'Progress Bar',
type : 'item',
url : '/documentation/components/progress-bar'
},
{
id : 'search-bar',
title: 'Search Bar',
@@ -1057,12 +1063,6 @@ export const navigation: FuseNavigation[] = [
type : 'item',
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',
title: 'Fuse Splash Screen',