diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json index 179ae916f..6c56cb46a 100644 --- a/ng6-seed/package-lock.json +++ b/ng6-seed/package-lock.json @@ -7188,22 +7188,9 @@ "dev": true }, "ng-pick-datetime": { - "version": "5.2.6", - "resolved": "https://registry.npmjs.org/ng-pick-datetime/-/ng-pick-datetime-5.2.6.tgz", - "integrity": "sha512-5vXK+qCKn2Jn1GvcZTd7bYkkiNIrpEk147l/wSRlgitZHIiswsNCNfceNCSvZvgrQL2WncNvGKzDX8zM4sXu3Q==", - "requires": { - "@angular/cdk": "^5.2.0" - }, - "dependencies": { - "@angular/cdk": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.5.tgz", - "integrity": "sha512-GN8m1d+VcCE9+Bgwv06Y8YJKyZ0i9ZIq2ZPBcJYt+KVgnVVRg4JkyUNxud07LNsvzOX22DquHqmIZiC4hAG7Ag==", - "requires": { - "tslib": "^1.7.1" - } - } - } + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/ng-pick-datetime/-/ng-pick-datetime-6.0.16.tgz", + "integrity": "sha512-96rHNg+tGXmzJHvGoH2O8dF+MF7N4rKIehsi8Px3IZUOZM4qA6PE1w8SQzDvHQTIp/1NpiICvmt6BZK5IaDsFg==" }, "ng2-charts": { "version": "1.6.0", diff --git a/ng6-seed/src/app/dashboard/dashboard.component.scss b/ng6-seed/src/app/dashboard/dashboard.component.scss index f13f963e8..02efbd61c 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.scss +++ b/ng6-seed/src/app/dashboard/dashboard.component.scss @@ -3,7 +3,7 @@ $blue: #05abe0; $grey: #343434; $p: 12px; mat-card-title{ - background-color:#f44336 !important; + background-color:#E00201 !important; color:#fff; padding-bottom: 1rem; margin-bottom: 0px; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss index 41ca2a034..2d0c755e6 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss @@ -31,12 +31,12 @@ color: #ffffff; margin-top:4px; margin-bottom:4px; - width: 60px; - height: 60px; + width: 95px; + height: 95px; justify-content:center; text-align: center; border-radius: 50%; - line-height: 60px; + line-height: 95px; } .fullPD{ background:#009688; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss index f7963f6f7..da56e3a1e 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss @@ -42,12 +42,12 @@ color: #ffffff; margin-top:4px; margin-bottom:4px; - width: 60px; - height: 60px; + width: 95px; + height: 95px; justify-content:center; text-align: center; border-radius: 50%; - line-height: 60px; + line-height: 95px; } .fullPD{ background:#009688; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss index 67347bd56..5f4ab542d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss @@ -30,12 +30,12 @@ color: #ffffff; margin-top:4px; margin-bottom:4px; - width: 60px; - height: 60px; + width: 95px; + height: 95px; justify-content:center; text-align: center; border-radius: 50%; - line-height: 60px; + line-height: 95px; } .fullPD{ background:#009688; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss index 67347bd56..5f4ab542d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss @@ -30,12 +30,12 @@ color: #ffffff; margin-top:4px; margin-bottom:4px; - width: 60px; - height: 60px; + width: 95px; + height: 95px; justify-content:center; text-align: center; border-radius: 50%; - line-height: 60px; + line-height: 95px; } .fullPD{ background:#009688; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss index c7faca5e9..ed717c562 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss @@ -21,12 +21,12 @@ color: #ffffff; margin-top:4px; margin-bottom:4px; - width: 60px; - height: 60px; + width: 95px; + height: 95px; justify-content:center; text-align: center; border-radius: 50%; - line-height: 60px; + line-height: 95px; } .fullPD{ background:#009688; diff --git a/ng6-seed/src/app/session/login/login-component.html b/ng6-seed/src/app/session/login/login-component.html index 1d73fff24..61229ce5e 100644 --- a/ng6-seed/src/app/session/login/login-component.html +++ b/ng6-seed/src/app/session/login/login-component.html @@ -33,18 +33,19 @@