diff --git a/package-lock.json b/package-lock.json index 0260a0f6..2a06e75c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fuse2", - "version": "1.0.5", + "version": "1.0.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -4001,6 +4001,14 @@ } } }, + "string_decoder": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, "string-width": { "version": "1.0.2", "bundled": true, @@ -4011,14 +4019,6 @@ "strip-ansi": "3.0.1" } }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, "stringstream": { "version": "0.0.5", "bundled": true, @@ -5917,6 +5917,11 @@ "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=", "dev": true }, + "md2": { + "version": "0.0.28", + "resolved": "https://registry.npmjs.org/md2/-/md2-0.0.28.tgz", + "integrity": "sha512-XQ71eTVKG3oRsGBj3lMLqL8p2inueqDXn++a2EntzWkUPlBZXPCPtlpfI9ER/LAlBKwJZQSqTzFItw7q9+vgvw==" + }, "md5.js": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", @@ -6168,14 +6173,6 @@ "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", "dev": true }, - "ng-pick-datetime": { - "version": "5.0.0-beta.4", - "resolved": "https://registry.npmjs.org/ng-pick-datetime/-/ng-pick-datetime-5.0.0-beta.4.tgz", - "integrity": "sha1-GT+giu6j4gK75GmUzfJeg3XG7dU=", - "requires": { - "date-fns": "1.28.5" - } - }, "ngx-color-picker": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-4.3.1.tgz", @@ -8688,6 +8685,15 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -8715,15 +8721,6 @@ } } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", diff --git a/package.json b/package.json index b525382a..e26b2eff 100644 --- a/package.json +++ b/package.json @@ -35,8 +35,8 @@ "hammerjs": "2.0.8", "highlight.js": "9.12.0", "intl": "1.2.5", + "md2": "0.0.28", "moment": "2.18.1", - "ng-pick-datetime": "5.0.0-beta.4", "ngx-color-picker": "4.3.1", "ngx-cookie-service": "1.0.7", "ngx-perfect-scrollbar": "4.5.6", diff --git a/src/app/core/modules/shared.module.ts b/src/app/core/modules/shared.module.ts index 2b2cbfd9..e2c5e7d6 100644 --- a/src/app/core/modules/shared.module.ts +++ b/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 diff --git a/src/app/core/scss/partials/_colors.scss b/src/app/core/scss/partials/_colors.scss index 6a92fe6d..7d61345f 100644 --- a/src/app/core/scss/partials/_colors.scss +++ b/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); } diff --git a/src/app/core/scss/partials/plugins/_plugins.scss b/src/app/core/scss/partials/plugins/_plugins.scss index 531cb638..6e4ef192 100644 --- a/src/app/core/scss/partials/plugins/_plugins.scss +++ b/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"; diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html index e6a8b468..d713ac37 100644 --- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html +++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html @@ -7,10 +7,6 @@
- - @@ -19,6 +15,7 @@ +
@@ -142,10 +139,11 @@
- today - - + +
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss index ef5a5c03..4bf9dae0 100644 --- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss +++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss @@ -15,6 +15,25 @@ .due-date { + md2-datepicker { + min-width: initial; + + .md2-datepicker-trigger { + padding: 0; + + .md2-datepicker-button { + display: block; + position: relative; + top: 0; + left: 0; + line-height: normal; + } + + .md2-datepicker-input { + display: none; + } + } + } } } @@ -49,6 +68,24 @@ .due-date { + md2-datepicker { + width: 180px; + min-width: 180px; + + .md2-datepicker-trigger { + padding-top: 5px; + padding-bottom: 5px; + + .md2-datepicker-button { + top: 0; + } + + .md2-datepicker-input { + min-width: initial; + } + } + } + .remove-due-date { } } diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts index 7bc13456..1951a62e 100644 --- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts +++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts @@ -53,15 +53,6 @@ export class FuseScrumboardCardDialogComponent implements OnInit, OnDestroy }); } - /** - * Add Due date - */ - addDueDate() - { - this.card.due = new Date(); - this.updateCard(); - } - /** * Remove Due date */