Merge branch 'master' into skeleton

src/app/core/modules/shared.module.ts

@@ -20,9 +20,8 @@ import { FuseMdSidenavHelperService } from '../directives/md-sidenav-helper/md-s
 import { FuseHljsComponent } from '../components/hljs/hljs.component';
 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 { Md2Module } from 'md2';
 import { CookieService } from 'ngx-cookie-service';
-import { DateTimePickerModule } from 'ng-pick-datetime';
-
 
 @NgModule({
     declarations   : [
@@ -45,7 +44,7 @@ import { DateTimePickerModule } from 'ng-pick-datetime';
         ColorPickerModule,
         NgxDnDModule,
         NgxDatatableModule,
-        DateTimePickerModule
+        Md2Module
     ],
     exports        : [
         FlexLayoutModule,
@@ -64,7 +63,7 @@ import { DateTimePickerModule } from 'ng-pick-datetime';
         NgxDatatableModule,
         FuseIfOnDomDirective,
         FuseMaterialColorPickerComponent,
-        DateTimePickerModule
+        Md2Module
     ],
     entryComponents: [
         FuseConfirmDialogComponent

src/app/core/scss/partials/_colors.scss

@@ -54,7 +54,8 @@ $matColorHues: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, A100, A200, A400
         &.secondary-text,
         .secondary-text,
         .mat-icon,
-        .icon {
+        .icon,
+        .md2-datepicker-button {
             color: rgba(0, 0, 0, 0.54);
         }
 
@@ -79,7 +80,8 @@ $matColorHues: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, A100, A200, A400
     @else {
 
         .mat-icon,
-        .icon {
+        .icon,
+        .md2-datepicker-button {
             color: rgba(255, 255, 255, 1);
         }
 

src/app/core/scss/partials/plugins/_plugins.scss

@@ -2,4 +2,3 @@
 @import "perfect-scrollbar";
 @import "ngx-datatable";
 @import "ngx-color-picker";
-@import "ng-pick-datetime";