Merge branch 'master' into skeleton

This commit is contained in:
Sercan Yemen 2017-08-30 11:50:56 +03:00
commit 2b91119d00
15 changed files with 239 additions and 147 deletions

1
.npmrc Normal file
View File

@ -0,0 +1 @@
save-prefix=''

128
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "fuse2", "name": "fuse2",
"version": "1.0.0", "version": "1.0.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -16,17 +16,17 @@
} }
}, },
"@angular/animations": { "@angular/animations": {
"version": "4.3.5", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.5.tgz", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.6.tgz",
"integrity": "sha1-hapFTIh8x8zhFjfqX26a+tiEkOE=", "integrity": "sha1-v5KD7HyMmLMvVp2E3NoQiQ/cAmI=",
"requires": { "requires": {
"tslib": "1.7.1" "tslib": "1.7.1"
} }
}, },
"@angular/cdk": { "@angular/cdk": {
"version": "2.0.0-beta.8", "version": "2.0.0-beta.10",
"resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-2.0.0-beta.8.tgz", "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-2.0.0-beta.10.tgz",
"integrity": "sha512-OOtK+AA14cmRG9AbUgvoKC9Tooz0N37GTaRSV+xziC8GxXHgwvTu4PFSFHlBnHPipOYC/tB2oP39j3KuurEMPA==", "integrity": "sha512-G0RvzxItfPy8JEdnyV/10GryE3zHehm3bUJ7U9dwYKhAzhye+MX0P6rs8VEmbClJb5SuZDr0ZZ53vbHhHsUh6A==",
"requires": { "requires": {
"tslib": "1.7.1" "tslib": "1.7.1"
} }
@ -103,41 +103,32 @@
} }
}, },
"@angular/common": { "@angular/common": {
"version": "4.3.5", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.5.tgz", "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.6.tgz",
"integrity": "sha1-X2sRNH6uHfw0YjzP1MBsj0xIji0=", "integrity": "sha1-7TfpMHx1Bt2DR5fBps9nXlK1tu4=",
"requires": { "requires": {
"tslib": "1.7.1" "tslib": "1.7.1"
} }
}, },
"@angular/compiler": { "@angular/compiler": {
"version": "4.3.5", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.5.tgz", "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.6.tgz",
"integrity": "sha1-UNPJhmV77/H+9Pbdmj+ljiSr1Ug=", "integrity": "sha1-vhcN8Ji3HoNczt8WjV+3sj5QRbg=",
"requires": { "requires": {
"tslib": "1.7.1" "tslib": "1.7.1"
} }
}, },
"@angular/compiler-cli": { "@angular/compiler-cli": {
"version": "4.3.5", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.3.5.tgz", "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.3.6.tgz",
"integrity": "sha1-JOmbNsCQk2P/gke/MxqLiert/mM=", "integrity": "sha1-avpq72jdaB5hs5i+TWJw5choCxI=",
"dev": true, "dev": true,
"requires": { "requires": {
"@angular/tsc-wrapped": "4.3.5", "@angular/tsc-wrapped": "4.3.6",
"minimist": "1.2.0", "minimist": "1.2.0",
"reflect-metadata": "0.1.10" "reflect-metadata": "0.1.10"
}, },
"dependencies": { "dependencies": {
"@angular/tsc-wrapped": {
"version": "4.3.5",
"resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.5.tgz",
"integrity": "sha1-lf2qgTz8VyYvx+9f6nJtYorvq6w=",
"dev": true,
"requires": {
"tsickle": "0.21.6"
}
},
"minimist": { "minimist": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
@ -147,72 +138,84 @@
} }
}, },
"@angular/core": { "@angular/core": {
"version": "4.3.5", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.5.tgz", "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.6.tgz",
"integrity": "sha1-vR79vx68+5wnojjiqkxIFZsIlbs=", "integrity": "sha1-u6xj1o0Pe8s4nRKzQghlK+MofpY=",
"requires": { "requires": {
"tslib": "1.7.1" "tslib": "1.7.1"
} }
}, },
"@angular/flex-layout": { "@angular/flex-layout": {
"version": "2.0.0-beta.8", "version": "2.0.0-beta.9",
"resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-2.0.0-beta.8.tgz", "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-2.0.0-beta.9.tgz",
"integrity": "sha1-uc9XhlqTyhWP5W2FCVJCPySNEDs=" "integrity": "sha1-PlT4mOgF0LFCbRXmE520FdBO518=",
"requires": {
"tslib": "1.7.1"
}
}, },
"@angular/forms": { "@angular/forms": {
"version": "4.3.5", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.5.tgz", "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.6.tgz",
"integrity": "sha1-UZqtCtgqG4cBmTf6k/wUdzRzd4c=", "integrity": "sha1-DyDEWXwWoVJ0XXzZVVmFWgpcZoc=",
"requires": { "requires": {
"tslib": "1.7.1" "tslib": "1.7.1"
} }
}, },
"@angular/http": { "@angular/http": {
"version": "4.3.5", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.5.tgz", "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.6.tgz",
"integrity": "sha1-gdSwdhyO8DXLC3NjAMI382KG8fA=", "integrity": "sha1-Vjgn0afV6J47fYa3f7vTZ7LAhZE=",
"requires": { "requires": {
"tslib": "1.7.1" "tslib": "1.7.1"
} }
}, },
"@angular/language-service": { "@angular/language-service": {
"version": "4.3.5", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-4.3.5.tgz", "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-4.3.6.tgz",
"integrity": "sha1-ttiC6kDRjVE/w6A1p5h1Ap/jjwE=", "integrity": "sha1-cc8tu0ZhVo89EqnA5LngQ++TvTo=",
"dev": true "dev": true
}, },
"@angular/material": { "@angular/material": {
"version": "2.0.0-beta.8", "version": "2.0.0-beta.10",
"resolved": "https://registry.npmjs.org/@angular/material/-/material-2.0.0-beta.8.tgz", "resolved": "https://registry.npmjs.org/@angular/material/-/material-2.0.0-beta.10.tgz",
"integrity": "sha512-4+OecvjU15i+l/vXBP2qEHdlsU9taK6kBhsWKsxNLK3+TAVoV5qjc2rjOucHtTwI/oOjyBXnLJP6pl4tuLEUQw==", "integrity": "sha512-KAQ2t9wenI55oXkjjT6E4VGUSVu7AZmR+ytnaP96VBFk18wxcGnVaTbQmCvVm/vkbcdeoSF09D6ic94DHAE+1A==",
"requires": { "requires": {
"tslib": "1.7.1" "tslib": "1.7.1"
} }
}, },
"@angular/platform-browser": { "@angular/platform-browser": {
"version": "4.3.5", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.5.tgz", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.6.tgz",
"integrity": "sha1-wNA0CUmcwp+BZ3qrYjyQhnYNhO8=", "integrity": "sha1-YVKx87eNAkb8XhUOL3ue1DN+O6Y=",
"requires": { "requires": {
"tslib": "1.7.1" "tslib": "1.7.1"
} }
}, },
"@angular/platform-browser-dynamic": { "@angular/platform-browser-dynamic": {
"version": "4.3.5", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.5.tgz", "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.6.tgz",
"integrity": "sha1-Sml7OwrsgFsziE/UqbNHMGW6seA=", "integrity": "sha1-nqv4JvEZyY+Fwqlu3LGKsAtO+xw=",
"requires": { "requires": {
"tslib": "1.7.1" "tslib": "1.7.1"
} }
}, },
"@angular/router": { "@angular/router": {
"version": "4.3.5", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.5.tgz", "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.6.tgz",
"integrity": "sha1-GICCdHvJtpdPnUs/VVe0NGRdI80=", "integrity": "sha1-ZAM+20/NoIoyPnUztKGCDA8o0TA=",
"requires": { "requires": {
"tslib": "1.7.1" "tslib": "1.7.1"
} }
}, },
"@angular/tsc-wrapped": {
"version": "4.3.6",
"resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.6.tgz",
"integrity": "sha1-GqZuCrLEeZpK0UtnXhOVOqX81DY=",
"dev": true,
"requires": {
"tsickle": "0.21.6"
}
},
"@ngtools/json-schema": { "@ngtools/json-schema": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz", "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz",
@ -255,18 +258,18 @@
"dev": true "dev": true
}, },
"@types/jasminewd2": { "@types/jasminewd2": {
"version": "2.0.2", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.2.tgz", "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.3.tgz",
"integrity": "sha1-X2jh5pe/ELxv2Mvy4Aaj1nEsW2Q=", "integrity": "sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/jasmine": "2.5.54" "@types/jasmine": "2.5.54"
} }
}, },
"@types/node": { "@types/node": {
"version": "6.0.87", "version": "6.0.88",
"resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.87.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.88.tgz",
"integrity": "sha512-Xo0pYENOBaGtJUhi50KH6gdBNQmZQQxAwBArsJpBd15ncoz+LZD5Ev14vuezcw62CsQ1q6bM++7jA6jfwaAbfQ==", "integrity": "sha512-bYDPZTX0/s1aihdjLuAgogUAT5M+TpoWChEMea2p0yOcfn5bu3k6cJb9cp6nw268XeSNIGGr+4+/8V5K6BGzLQ==",
"dev": true "dev": true
}, },
"@types/q": { "@types/q": {
@ -6192,6 +6195,11 @@
"resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-4.3.1.tgz", "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-4.3.1.tgz",
"integrity": "sha512-/Gn3XvOgaAK/ZnXA0ej9ivYm6uIvHwvZaSzx04ZUtG1Vw5RCKzw84dK0Ru9Ylnnq1xJU4WmdA63REkJb8cvYXg==" "integrity": "sha512-/Gn3XvOgaAK/ZnXA0ej9ivYm6uIvHwvZaSzx04ZUtG1Vw5RCKzw84dK0Ru9Ylnnq1xJU4WmdA63REkJb8cvYXg=="
}, },
"ngx-cookie-service": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-1.0.7.tgz",
"integrity": "sha1-NdQzt3WloqgIxUl19Pr1AKzFL2g="
},
"ngx-perfect-scrollbar": { "ngx-perfect-scrollbar": {
"version": "4.5.6", "version": "4.5.6",
"resolved": "https://registry.npmjs.org/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-4.5.6.tgz", "resolved": "https://registry.npmjs.org/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-4.5.6.tgz",
@ -7415,7 +7423,7 @@
"integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=", "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "6.0.87", "@types/node": "6.0.88",
"@types/q": "0.0.32", "@types/q": "0.0.32",
"@types/selenium-webdriver": "2.53.42", "@types/selenium-webdriver": "2.53.42",
"blocking-proxy": "0.0.5", "blocking-proxy": "0.0.5",

View File

@ -1,7 +1,7 @@
{ {
"name": "fuse2", "name": "fuse2",
"version": "1.0.1", "version": "1.0.2",
"license": "MIT", "license": "",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
@ -12,44 +12,45 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "4.3.5", "@angular/animations": "4.3.6",
"@angular/cdk": "^2.0.0-beta.8", "@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.5", "@angular/common": "4.3.6",
"@angular/compiler": "4.3.5", "@angular/compiler": "4.3.6",
"@angular/core": "4.3.5", "@angular/core": "4.3.6",
"@angular/flex-layout": "2.0.0-beta.8", "@angular/flex-layout": "2.0.0-beta.9",
"@angular/forms": "4.3.5", "@angular/forms": "4.3.6",
"@angular/http": "4.3.5", "@angular/http": "4.3.6",
"@angular/material": "^2.0.0-beta.8", "@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.5", "@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.5", "@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.5", "@angular/router": "4.3.6",
"@swimlane/ngx-charts": "^6.0.2", "@swimlane/ngx-charts": "6.0.2",
"@swimlane/ngx-datatable": "^9.3.1", "@swimlane/ngx-datatable": "9.3.1",
"@swimlane/ngx-dnd": "^3.0.0", "@swimlane/ngx-dnd": "3.0.0",
"angular-calendar": "^0.19.0", "angular-calendar": "0.19.0",
"angular-in-memory-web-api": "^0.3.2", "angular-in-memory-web-api": "0.3.2",
"classlist.js": "^1.1.20150312", "classlist.js": "1.1.20150312",
"core-js": "^2.5.0", "core-js": "2.5.0",
"d3": "^4.10.0", "d3": "4.10.0",
"hammerjs": "^2.0.8", "hammerjs": "2.0.8",
"highlight.js": "^9.12.0", "highlight.js": "9.12.0",
"intl": "^1.2.5", "intl": "1.2.5",
"moment": "^2.18.1", "moment": "2.18.1",
"ngx-color-picker": "^4.3.1", "ngx-color-picker": "4.3.1",
"ngx-perfect-scrollbar": "^4.5.6", "ngx-cookie-service": "1.0.7",
"rxjs": "^5.4.3", "ngx-perfect-scrollbar": "4.5.6",
"web-animations-js": "^2.3.1", "rxjs": "5.4.3",
"zone.js": "^0.8.17" "web-animations-js": "2.3.1",
"zone.js": "0.8.17"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "^1.3.2", "@angular/cli": "^1.3.2",
"@angular/compiler-cli": "4.3.5", "@angular/compiler-cli": "4.3.6",
"@angular/language-service": "4.3.5", "@angular/language-service": "4.3.6",
"@ngtools/webpack": "^1.6.2", "@ngtools/webpack": "^1.6.2",
"@types/jasmine": "^2.5.54", "@types/jasmine": "^2.5.54",
"@types/jasminewd2": "^2.0.2", "@types/jasminewd2": "^2.0.2",
"@types/node": "^6.0.87", "@types/node": "^6.0.88",
"codelyzer": "~3.0.1", "codelyzer": "~3.0.1",
"jasmine-core": "~2.6.2", "jasmine-core": "~2.6.2",
"jasmine-spec-reporter": "~4.1.0", "jasmine-spec-reporter": "~4.1.0",

View File

@ -9,6 +9,7 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
text-align: center;
.time { .time {
display: flex; display: flex;

View File

@ -4,6 +4,7 @@ import { Subscription } from 'rxjs/Subscription';
import { ObservableMedia } from '@angular/flex-layout'; import { ObservableMedia } from '@angular/flex-layout';
import { FuseMatchMedia } from '../../services/match-media.service'; import { FuseMatchMedia } from '../../services/match-media.service';
import { FuseConfigService } from '../../services/config.service'; import { FuseConfigService } from '../../services/config.service';
import { CookieService } from 'ngx-cookie-service';
@Component({ @Component({
selector : 'fuse-shortcuts', selector : 'fuse-shortcuts',
@ -29,7 +30,8 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy
private observableMedia: ObservableMedia, private observableMedia: ObservableMedia,
private fuseMatchMedia: FuseMatchMedia, private fuseMatchMedia: FuseMatchMedia,
private fuseNavigationService: FuseNavigationService, private fuseNavigationService: FuseNavigationService,
private fuseConfig: FuseConfigService private fuseConfig: FuseConfigService,
private cookieService: CookieService
) )
{ {
this.filteredNavigationItems = this.navigationItems = this.fuseNavigationService.getFlatNavigation(); this.filteredNavigationItems = this.navigationItems = this.fuseNavigationService.getFlatNavigation();
@ -44,6 +46,14 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy
} }
ngOnInit() ngOnInit()
{
const cookieExists = this.cookieService.check('FUSE2.shortcuts');
if ( cookieExists )
{
this.shortcutItems = JSON.parse(this.cookieService.get('FUSE2.shortcuts'));
}
else
{ {
// User's shortcut items // User's shortcut items
this.shortcutItems = [ this.shortcutItems = [
@ -72,6 +82,7 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy
'url' : '/apps/todo' 'url' : '/apps/todo'
} }
]; ];
}
this.matchMediaSubscription = this.matchMediaSubscription =
this.fuseMatchMedia.onMediaChange.subscribe(() => { this.fuseMatchMedia.onMediaChange.subscribe(() => {
@ -115,12 +126,18 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy
if ( this.shortcutItems[i].url === itemToToggle.url ) if ( this.shortcutItems[i].url === itemToToggle.url )
{ {
this.shortcutItems.splice(i, 1); this.shortcutItems.splice(i, 1);
// Save to the cookies
this.cookieService.set('FUSE2.shortcuts', JSON.stringify(this.shortcutItems));
return; return;
} }
} }
this.shortcutItems.push(itemToToggle); this.shortcutItems.push(itemToToggle);
// Save to the cookies
this.cookieService.set('FUSE2.shortcuts', JSON.stringify(this.shortcutItems));
} }
isInShortcuts(navigationItem) isInShortcuts(navigationItem)

View File

@ -35,13 +35,17 @@ export class FuseMdSidenavHelperDirective implements OnInit, AfterViewInit, OnDe
{ {
this.isLockedOpen = true; this.isLockedOpen = true;
this.mdSidenav.mode = 'side'; this.mdSidenav.mode = 'side';
setTimeout(() => {
this.mdSidenav.open(); this.mdSidenav.open();
});
} }
else else
{ {
this.isLockedOpen = false; this.isLockedOpen = false;
this.mdSidenav.mode = 'over'; this.mdSidenav.mode = 'over';
setTimeout(() => {
this.mdSidenav.close(); this.mdSidenav.close();
});
} }
this.matchMediaSubscription = this.fuseMatchMedia.onMediaChange.subscribe(() => { this.matchMediaSubscription = this.fuseMatchMedia.onMediaChange.subscribe(() => {

View File

@ -32,7 +32,7 @@ import {
MdTableModule, MdTableModule,
MdTabsModule MdTabsModule
} from '@angular/material'; } from '@angular/material';
import { CdkTableModule } from '@angular/cdk'; import { CdkTableModule } from '@angular/cdk/table';
@NgModule({ @NgModule({
imports: [ imports: [

View File

@ -20,6 +20,7 @@ import { FuseMdSidenavHelperService } from '../directives/md-sidenav-helper/md-s
import { FuseHljsComponent } from '../components/hljs/hljs.component'; import { FuseHljsComponent } from '../components/hljs/hljs.component';
import { FuseIfOnDomDirective } from '../directives/fuse-if-on-dom/fuse-if-on-dom.directive'; import { FuseIfOnDomDirective } from '../directives/fuse-if-on-dom/fuse-if-on-dom.directive';
import { FuseMaterialColorPickerComponent } from '../components/material-color-picker/material-color-picker.component'; import { FuseMaterialColorPickerComponent } from '../components/material-color-picker/material-color-picker.component';
import { CookieService } from 'ngx-cookie-service';
@NgModule({ @NgModule({
declarations : [ declarations : [
@ -65,6 +66,7 @@ import { FuseMaterialColorPickerComponent } from '../components/material-color-p
FuseConfirmDialogComponent FuseConfirmDialogComponent
], ],
providers : [ providers : [
CookieService,
FuseNavigationService, FuseNavigationService,
FuseMatchMedia, FuseMatchMedia,
FuseNavbarService, FuseNavbarService,

View File

@ -28,6 +28,7 @@
@import "partials/navigation"; @import "partials/navigation";
@import "partials/forms"; @import "partials/forms";
@import "partials/toolbar"; @import "partials/toolbar";
@import "partials/print";
// Plugins // Plugins
@import "partials/plugins/plugins"; @import "partials/plugins/plugins";

View File

@ -144,7 +144,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
&.md-stop-transition { &.md-stop-transition {
~ .mat-sidenav-content { ~ .mat-sidenav-content,
~ .mat-drawer-content {
transition: none; transition: none;
} }
} }
@ -161,7 +162,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
} }
} }
> .mat-sidenav-content { > .mat-sidenav-content,
> .mat-drawer-content {
display: flex; display: flex;
flex: 1; flex: 1;
height: auto; height: auto;
@ -229,7 +231,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
&.md-is-locked-open { &.md-is-locked-open {
~ .mat-sidenav-content { ~ .mat-sidenav-content,
~ .mat-drawer-content {
margin-left: 0 !important; margin-left: 0 !important;
.center { .center {
@ -252,7 +255,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
&.md-is-locked-open { &.md-is-locked-open {
~ .mat-sidenav-content { ~ .mat-sidenav-content,
~ .mat-drawer-content {
margin-right: 0 !important; margin-right: 0 !important;
.center { .center {
@ -301,7 +305,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
> md-sidenav-container { > md-sidenav-container {
flex: 1 0 auto; flex: 1 0 auto;
> .mat-sidenav-content { > .mat-sidenav-content,
> .mat-drawer-content {
flex: 1 0 auto; flex: 1 0 auto;
max-height: none; max-height: none;
@ -325,7 +330,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
} }
} }
> .mat-sidenav-content { > .mat-sidenav-content,
> .mat-drawer-content {
display: flex; display: flex;
height: auto; height: auto;
@ -368,7 +374,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
&.md-stop-transition { &.md-stop-transition {
~ .mat-sidenav-content { ~ .mat-sidenav-content,
~ .mat-drawer-content {
transition: none; transition: none;
} }
} }
@ -378,7 +385,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
} }
} }
> .mat-sidenav-content { > .mat-sidenav-content,
> .mat-drawer-content {
display: flex; display: flex;
flex: 1; flex: 1;
height: auto; height: auto;
@ -472,7 +480,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
> md-sidenav-container { > md-sidenav-container {
flex: 1 0 auto !important; flex: 1 0 auto !important;
> .mat-sidenav-content { > .mat-sidenav-content,
> .mat-drawer-content {
flex: 1 0 auto; flex: 1 0 auto;
> .center { > .center {
@ -499,7 +508,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png');
> md-sidenav-container { > md-sidenav-container {
> .mat-sidenav-content { > .mat-sidenav-content,
> .mat-drawer-content {
.center { .center {
margin: 0 16px; margin: 0 16px;

View File

@ -0,0 +1,51 @@
/*----------------------------------------------------------------*/
/* Print
/*----------------------------------------------------------------*/
@media all {
/* Never show page break in normal view */
.page-break {
display: none;
}
}
@media print {
/* Page Styles */
@page {
//margin: 0.5cm;
}
/* Page break */
.page-break {
display: block;
break-after: always;
page-break-after: always;
}
/* General styles */
fuse-root {
fuse-navbar,
fuse-toolbar,
fuse-footer,
fuse-quick-panel,
fuse-theme-options,
.ps > .ps__scrollbar-x-rail,
.ps > .ps__scrollbar-y-rail {
display: none !important;
}
.ps {
overflow: visible !important;
}
}
/* Printable page specific styles */
.printable {
overflow: visible !important;
height: auto !important;
}
}

View File

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { NavigationStart, Router } from '@angular/router'; import { NavigationStart, Router } from '@angular/router';
import { Platform } from '@angular/cdk'; import { Platform } from '@angular/cdk/platform';
@Injectable() @Injectable()
export class FuseConfigService export class FuseConfigService
@ -12,6 +12,7 @@ export class FuseConfigService
/** /**
* @param router * @param router
* @param platform
*/ */
constructor( constructor(
private router: Router, private router: Router,

View File

@ -3,6 +3,8 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { Animations } from '../../core/animations'; import { Animations } from '../../core/animations';
import { FuseConfigService } from '../../core/services/config.service'; import { FuseConfigService } from '../../core/services/config.service';
import { Subscription } from 'rxjs/Subscription'; import { Subscription } from 'rxjs/Subscription';
import 'rxjs/add/operator/filter';
import 'rxjs/add/operator/map';
@Component({ @Component({
selector : 'fuse-content', selector : 'fuse-content',

View File

@ -23,7 +23,8 @@ fuse-main {
display: flex; display: flex;
flex: 1; flex: 1;
> .mat-sidenav-content { > .mat-sidenav-content,
> .mat-drawer-content {
display: flex; display: flex;
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;

View File

@ -4,13 +4,5 @@
// The list of which env maps to which file can be found in `.angular-cli.json`. // The list of which env maps to which file can be found in `.angular-cli.json`.
export const environment = { export const environment = {
production: false, production: false
firebase : {
apiKey : 'AIzaSyDYFfhaC5QaKPgPhh8YqohjhfUpcYlg33c',
// authDomain : '<your-project-authdomain>',
databaseURL: 'https://fuse2-demo.firebaseio.com/',
projectId : 'fuse2-demo'
// storageBucket : '<your-storage-bucket>',
// messagingSenderId: '<your-messaging-sender-id>'
}
}; };