Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/app/core/services/config.service.ts
This commit is contained in:
mustafahlvc 2017-10-10 16:40:29 +03:00
commit c025563145

View File

@ -29,8 +29,8 @@ export class FuseConfigService
},
colorClasses : {
toolbar: 'mat-white-500-bg',
navbar : 'mat-fuse-dark-500-bg',
footer : 'mat-fuse-dark-700-bg'
navbar : 'mat-fuse-dark-700-bg',
footer : 'mat-fuse-dark-900-bg'
},
customScrollbars: true,
routerAnimation : 'fadeIn' // fadeIn, slideUp, slideDown, slideRight, slideLeft