diff --git a/package-lock.json b/package-lock.json index 9236e029..d3cca102 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fuse2", - "version": "1.0.1", + "version": "1.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -16,17 +16,17 @@ } }, "@angular/animations": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.5.tgz", - "integrity": "sha1-hapFTIh8x8zhFjfqX26a+tiEkOE=", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.6.tgz", + "integrity": "sha1-v5KD7HyMmLMvVp2E3NoQiQ/cAmI=", "requires": { "tslib": "1.7.1" } }, "@angular/cdk": { - "version": "2.0.0-beta.8", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-2.0.0-beta.8.tgz", - "integrity": "sha512-OOtK+AA14cmRG9AbUgvoKC9Tooz0N37GTaRSV+xziC8GxXHgwvTu4PFSFHlBnHPipOYC/tB2oP39j3KuurEMPA==", + "version": "2.0.0-beta.10", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-2.0.0-beta.10.tgz", + "integrity": "sha512-G0RvzxItfPy8JEdnyV/10GryE3zHehm3bUJ7U9dwYKhAzhye+MX0P6rs8VEmbClJb5SuZDr0ZZ53vbHhHsUh6A==", "requires": { "tslib": "1.7.1" } @@ -103,41 +103,32 @@ } }, "@angular/common": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.5.tgz", - "integrity": "sha1-X2sRNH6uHfw0YjzP1MBsj0xIji0=", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.6.tgz", + "integrity": "sha1-7TfpMHx1Bt2DR5fBps9nXlK1tu4=", "requires": { "tslib": "1.7.1" } }, "@angular/compiler": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.5.tgz", - "integrity": "sha1-UNPJhmV77/H+9Pbdmj+ljiSr1Ug=", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.6.tgz", + "integrity": "sha1-vhcN8Ji3HoNczt8WjV+3sj5QRbg=", "requires": { "tslib": "1.7.1" } }, "@angular/compiler-cli": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.3.5.tgz", - "integrity": "sha1-JOmbNsCQk2P/gke/MxqLiert/mM=", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.3.6.tgz", + "integrity": "sha1-avpq72jdaB5hs5i+TWJw5choCxI=", "dev": true, "requires": { - "@angular/tsc-wrapped": "4.3.5", + "@angular/tsc-wrapped": "4.3.6", "minimist": "1.2.0", "reflect-metadata": "0.1.10" }, "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": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", @@ -147,9 +138,9 @@ } }, "@angular/core": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.5.tgz", - "integrity": "sha1-vR79vx68+5wnojjiqkxIFZsIlbs=", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.6.tgz", + "integrity": "sha1-u6xj1o0Pe8s4nRKzQghlK+MofpY=", "requires": { "tslib": "1.7.1" } @@ -163,59 +154,68 @@ } }, "@angular/forms": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.5.tgz", - "integrity": "sha1-UZqtCtgqG4cBmTf6k/wUdzRzd4c=", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.6.tgz", + "integrity": "sha1-DyDEWXwWoVJ0XXzZVVmFWgpcZoc=", "requires": { "tslib": "1.7.1" } }, "@angular/http": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.5.tgz", - "integrity": "sha1-gdSwdhyO8DXLC3NjAMI382KG8fA=", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.6.tgz", + "integrity": "sha1-Vjgn0afV6J47fYa3f7vTZ7LAhZE=", "requires": { "tslib": "1.7.1" } }, "@angular/language-service": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-4.3.5.tgz", - "integrity": "sha1-ttiC6kDRjVE/w6A1p5h1Ap/jjwE=", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-4.3.6.tgz", + "integrity": "sha1-cc8tu0ZhVo89EqnA5LngQ++TvTo=", "dev": true }, "@angular/material": { - "version": "2.0.0-beta.8", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-2.0.0-beta.8.tgz", - "integrity": "sha512-4+OecvjU15i+l/vXBP2qEHdlsU9taK6kBhsWKsxNLK3+TAVoV5qjc2rjOucHtTwI/oOjyBXnLJP6pl4tuLEUQw==", + "version": "2.0.0-beta.10", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-2.0.0-beta.10.tgz", + "integrity": "sha512-KAQ2t9wenI55oXkjjT6E4VGUSVu7AZmR+ytnaP96VBFk18wxcGnVaTbQmCvVm/vkbcdeoSF09D6ic94DHAE+1A==", "requires": { "tslib": "1.7.1" } }, "@angular/platform-browser": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.5.tgz", - "integrity": "sha1-wNA0CUmcwp+BZ3qrYjyQhnYNhO8=", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.6.tgz", + "integrity": "sha1-YVKx87eNAkb8XhUOL3ue1DN+O6Y=", "requires": { "tslib": "1.7.1" } }, "@angular/platform-browser-dynamic": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.5.tgz", - "integrity": "sha1-Sml7OwrsgFsziE/UqbNHMGW6seA=", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.6.tgz", + "integrity": "sha1-nqv4JvEZyY+Fwqlu3LGKsAtO+xw=", "requires": { "tslib": "1.7.1" } }, "@angular/router": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.5.tgz", - "integrity": "sha1-GICCdHvJtpdPnUs/VVe0NGRdI80=", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.6.tgz", + "integrity": "sha1-ZAM+20/NoIoyPnUztKGCDA8o0TA=", "requires": { "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": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz", @@ -258,9 +258,9 @@ "dev": true }, "@types/jasminewd2": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.2.tgz", - "integrity": "sha1-X2jh5pe/ELxv2Mvy4Aaj1nEsW2Q=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.3.tgz", + "integrity": "sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==", "dev": true, "requires": { "@types/jasmine": "2.5.54" @@ -1183,6 +1183,7 @@ "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "dev": true, + "optional": true, "requires": { "align-text": "0.1.4", "lazy-cache": "1.0.4" @@ -1192,7 +1193,8 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true + "dev": true, + "optional": true } } }, @@ -7942,6 +7944,7 @@ "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "dev": true, + "optional": true, "requires": { "align-text": "0.1.4" } @@ -9193,48 +9196,28 @@ "camelcase": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" }, "cliui": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - } + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=" }, "uglify-js": { "version": "2.8.29", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "requires": { - "source-map": "0.5.6", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - } + "dev": true }, "wordwrap": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" }, "yargs": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=" } } }, @@ -9947,7 +9930,8 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true + "dev": true, + "optional": true }, "wordwrap": { "version": "0.0.3", diff --git a/package.json b/package.json index fa2258f0..ebfe1c25 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "fuse2", - "version": "1.0.1", - "license": "MIT", + "version": "1.0.2", + "license": "", "scripts": { "ng": "ng", "start": "ng serve", @@ -12,41 +12,41 @@ }, "private": true, "dependencies": { - "@angular/animations": "4.3.5", - "@angular/cdk": "^2.0.0-beta.8", - "@angular/common": "4.3.5", - "@angular/compiler": "4.3.5", - "@angular/core": "4.3.5", + "@angular/animations": "4.3.6", + "@angular/cdk": "2.0.0-beta.10", + "@angular/common": "4.3.6", + "@angular/compiler": "4.3.6", + "@angular/core": "4.3.6", "@angular/flex-layout": "2.0.0-beta.9", - "@angular/forms": "4.3.5", - "@angular/http": "4.3.5", - "@angular/material": "^2.0.0-beta.8", - "@angular/platform-browser": "4.3.5", - "@angular/platform-browser-dynamic": "4.3.5", - "@angular/router": "4.3.5", - "@swimlane/ngx-charts": "^6.0.2", - "@swimlane/ngx-datatable": "^9.3.1", - "@swimlane/ngx-dnd": "^3.0.0", - "angular-calendar": "^0.19.0", - "angular-in-memory-web-api": "^0.3.2", - "classlist.js": "^1.1.20150312", - "core-js": "^2.5.0", - "d3": "^4.10.0", - "hammerjs": "^2.0.8", - "highlight.js": "^9.12.0", - "intl": "^1.2.5", - "moment": "^2.18.1", - "ngx-color-picker": "^4.3.1", - "ngx-cookie-service": "^1.0.7", - "ngx-perfect-scrollbar": "^4.5.6", - "rxjs": "^5.4.3", - "web-animations-js": "^2.3.1", - "zone.js": "^0.8.17" + "@angular/forms": "4.3.6", + "@angular/http": "4.3.6", + "@angular/material": "2.0.0-beta.10", + "@angular/platform-browser": "4.3.6", + "@angular/platform-browser-dynamic": "4.3.6", + "@angular/router": "4.3.6", + "@swimlane/ngx-charts": "6.0.2", + "@swimlane/ngx-datatable": "9.3.1", + "@swimlane/ngx-dnd": "3.0.0", + "angular-calendar": "0.19.0", + "angular-in-memory-web-api": "0.3.2", + "classlist.js": "1.1.20150312", + "core-js": "2.5.0", + "d3": "4.10.0", + "hammerjs": "2.0.8", + "highlight.js": "9.12.0", + "intl": "1.2.5", + "moment": "2.18.1", + "ngx-color-picker": "4.3.1", + "ngx-cookie-service": "1.0.7", + "ngx-perfect-scrollbar": "4.5.6", + "rxjs": "5.4.3", + "web-animations-js": "2.3.1", + "zone.js": "0.8.17" }, "devDependencies": { "@angular/cli": "^1.3.2", - "@angular/compiler-cli": "4.3.5", - "@angular/language-service": "4.3.5", + "@angular/compiler-cli": "4.3.6", + "@angular/language-service": "4.3.6", "@ngtools/webpack": "^1.6.2", "@types/jasmine": "^2.5.54", "@types/jasminewd2": "^2.0.2", diff --git a/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts b/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts index 5d1fe774..f0e8a398 100644 --- a/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts +++ b/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts @@ -35,13 +35,17 @@ export class FuseMdSidenavHelperDirective implements OnInit, AfterViewInit, OnDe { this.isLockedOpen = true; this.mdSidenav.mode = 'side'; - this.mdSidenav.open(); + setTimeout(() => { + this.mdSidenav.open(); + }); } else { this.isLockedOpen = false; this.mdSidenav.mode = 'over'; - this.mdSidenav.close(); + setTimeout(() => { + this.mdSidenav.close(); + }); } this.matchMediaSubscription = this.fuseMatchMedia.onMediaChange.subscribe(() => { diff --git a/src/app/core/modules/material.module.ts b/src/app/core/modules/material.module.ts index adeef984..dd36d87c 100644 --- a/src/app/core/modules/material.module.ts +++ b/src/app/core/modules/material.module.ts @@ -32,7 +32,7 @@ import { MdTableModule, MdTabsModule } from '@angular/material'; -import { CdkTableModule } from '@angular/cdk'; +import { CdkTableModule } from '@angular/cdk/table'; @NgModule({ imports: [ diff --git a/src/app/core/scss/partials/_page-layouts.scss b/src/app/core/scss/partials/_page-layouts.scss index 3bf274b5..87322fce 100644 --- a/src/app/core/scss/partials/_page-layouts.scss +++ b/src/app/core/scss/partials/_page-layouts.scss @@ -144,7 +144,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png'); &.md-stop-transition { - ~ .mat-sidenav-content { + ~ .mat-sidenav-content, + ~ .mat-drawer-content { 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; flex: 1; height: auto; @@ -229,7 +231,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png'); &.md-is-locked-open { - ~ .mat-sidenav-content { + ~ .mat-sidenav-content, + ~ .mat-drawer-content { margin-left: 0 !important; .center { @@ -252,7 +255,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png'); &.md-is-locked-open { - ~ .mat-sidenav-content { + ~ .mat-sidenav-content, + ~ .mat-drawer-content { margin-right: 0 !important; .center { @@ -301,7 +305,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png'); > md-sidenav-container { flex: 1 0 auto; - > .mat-sidenav-content { + > .mat-sidenav-content, + > .mat-drawer-content { flex: 1 0 auto; 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; height: auto; @@ -368,7 +374,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png'); &.md-stop-transition { - ~ .mat-sidenav-content { + ~ .mat-sidenav-content, + ~ .mat-drawer-content { 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; flex: 1; height: auto; @@ -472,7 +480,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png'); > md-sidenav-container { flex: 1 0 auto !important; - > .mat-sidenav-content { + > .mat-sidenav-content, + > .mat-drawer-content { flex: 1 0 auto; > .center { @@ -499,7 +508,8 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png'); > md-sidenav-container { - > .mat-sidenav-content { + > .mat-sidenav-content, + > .mat-drawer-content { .center { margin: 0 16px; diff --git a/src/app/core/services/config.service.ts b/src/app/core/services/config.service.ts index 7c49fa93..8d73e08a 100644 --- a/src/app/core/services/config.service.ts +++ b/src/app/core/services/config.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { NavigationStart, Router } from '@angular/router'; -import { Platform } from '@angular/cdk'; +import { Platform } from '@angular/cdk/platform'; @Injectable() export class FuseConfigService diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.html b/src/app/main/content/apps/calendar/event-form/event-form.component.html index afd93db7..e7e219a6 100644 --- a/src/app/main/content/apps/calendar/event-form/event-form.component.html +++ b/src/app/main/content/apps/calendar/event-form/event-form.component.html @@ -58,29 +58,23 @@
- - - - + + + + + +
- - - - - + + + + + diff --git a/src/app/main/content/apps/chat/chat.component.scss b/src/app/main/content/apps/chat/chat.component.scss index add7d911..e642757d 100644 --- a/src/app/main/content/apps/chat/chat.component.scss +++ b/src/app/main/content/apps/chat/chat.component.scss @@ -19,7 +19,8 @@ width: 100%; background: transparent; - .mat-sidenav-content { + > .mat-sidenav-content, + > .mat-drawer-content { display: flex; flex: 1 0 auto; min-height: 100%; diff --git a/src/app/main/content/apps/contacts/contact-form/contact-form.component.html b/src/app/main/content/apps/contacts/contact-form/contact-form.component.html index 4e930385..498e54d1 100644 --- a/src/app/main/content/apps/contacts/contact-form/contact-form.component.html +++ b/src/app/main/content/apps/contacts/contact-form/contact-form.component.html @@ -69,14 +69,11 @@
- - - - - + + + + +
diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts b/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts index 710c4d98..f8624b9a 100644 --- a/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts +++ b/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { ContactsService } from '../contacts.service'; -import { DataSource } from '@angular/cdk'; import { Observable } from 'rxjs/Observable'; import { FuseContactsContactFormDialogComponent } from '../contact-form/contact-form.component'; import { MdDialog, MdDialogRef } from '@angular/material'; import { FuseConfirmDialogComponent } from '../../../../../core/components/confirm-dialog/confirm-dialog.component'; import { FormGroup } from '@angular/forms'; +import { DataSource } from '@angular/cdk/collections'; @Component({ selector : 'fuse-contacts-contact-list', diff --git a/src/app/main/content/apps/dashboards/project/project.component.ts b/src/app/main/content/apps/dashboards/project/project.component.ts index 7ccf16ed..6e81ed55 100644 --- a/src/app/main/content/apps/dashboards/project/project.component.ts +++ b/src/app/main/content/apps/dashboards/project/project.component.ts @@ -3,7 +3,7 @@ import { ProjectsDashboardService } from './projects.service'; import * as shape from 'd3-shape'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { Observable } from 'rxjs/Observable'; -import { DataSource } from '@angular/cdk'; +import { DataSource } from '@angular/cdk/collections'; @Component({ selector : 'fuse-project', diff --git a/src/app/main/content/apps/file-manager/file-list/file-list.component.ts b/src/app/main/content/apps/file-manager/file-list/file-list.component.ts index a0d8dca7..56e21283 100644 --- a/src/app/main/content/apps/file-manager/file-list/file-list.component.ts +++ b/src/app/main/content/apps/file-manager/file-list/file-list.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { FileManagerService } from '../file-manager.service'; -import { DataSource } from '@angular/cdk'; import { Observable } from 'rxjs/Observable'; +import { DataSource } from '@angular/cdk/collections'; @Component({ selector : 'fuse-file-list', diff --git a/src/app/main/content/apps/file-manager/file-manager.component.scss b/src/app/main/content/apps/file-manager/file-manager.component.scss index 7e0555a0..73462f07 100644 --- a/src/app/main/content/apps/file-manager/file-manager.component.scss +++ b/src/app/main/content/apps/file-manager/file-manager.component.scss @@ -19,7 +19,8 @@ } } - .mat-sidenav-content { + > .mat-sidenav-content, + > .mat-drawer-content { z-index: 1; .center { @@ -30,7 +31,7 @@ min-height: 160px; max-height: 160px; - @include media-breakpoint-down('sm'){ + @include media-breakpoint-down('sm') { height: 120px; min-height: 120px; max-height: 120px; diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.html b/src/app/main/content/apps/todo/todo-details/todo-details.component.html index 23b9397d..d17658e9 100644 --- a/src/app/main/content/apps/todo/todo-details/todo-details.component.html +++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.html @@ -70,25 +70,18 @@
- - - - - + + + + + + + + + + + - - - - -
diff --git a/src/app/main/content/pages/search/tabs/table/table.component.ts b/src/app/main/content/pages/search/tabs/table/table.component.ts index 54b25be5..ea3f081a 100644 --- a/src/app/main/content/pages/search/tabs/table/table.component.ts +++ b/src/app/main/content/pages/search/tabs/table/table.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { SearchService } from '../../search.service'; -import { DataSource } from '@angular/cdk'; +import { DataSource } from '@angular/cdk/collections'; @Component({ selector : 'fuse-search-table', diff --git a/src/app/main/main.component.scss b/src/app/main/main.component.scss index 28eda747..9fb34571 100644 --- a/src/app/main/main.component.scss +++ b/src/app/main/main.component.scss @@ -23,7 +23,8 @@ fuse-main { display: flex; flex: 1; - > .mat-sidenav-content { + > .mat-sidenav-content, + > .mat-drawer-content { display: flex; flex: 1; overflow: hidden;