From 0c27746465405a3b44d90891954e0f937a147dbd Mon Sep 17 00:00:00 2001 From: apapachristou Date: Thu, 19 Sep 2019 13:00:00 +0300 Subject: [PATCH] Changes color palette --- .../export-method-dialog.component.scss | 2 +- .../dataset-profile-listing.component.scss | 3 +- .../editor/dmp-profile-editor.component.scss | 3 +- .../dmp-profile-listing.component.scss | 3 +- .../user/listing/user-listing.component.scss | 3 +- .../dataset-info-counter.component.css | 6 +- .../dmp-info-counter.component.css | 3 +- .../recent-edited-activity.component.css | 9 +-- .../recent-visited-activity.component.css | 6 +- .../dataset-wizard.component.scss | 16 +++-- .../criteria/dataset-criteria.component.scss | 4 +- .../listing/dataset-listing.component.scss | 6 +- .../dataset-listing-item.component.scss | 6 +- .../app/ui/dmp/clone/dmp-clone.component.scss | 7 +- .../datasets-tab/datasets-tab.component.scss | 10 +-- .../ui/dmp/editor/dmp-editor.component.scss | 5 +- .../dmp-finalize-dialog.component.scss | 7 +- .../general-tab/general-tab.component.scss | 4 +- .../editor/grant-tab/grant-tab.component.scss | 5 +- .../people-tab/people-tab.component.scss | 3 +- .../criteria/dmp-criteria.component.scss | 16 ++--- .../dmp-listing-item.component.scss | 7 +- .../dmp/overview/dmp-overview.component.scss | 17 ++--- .../editor/dmp-wizard-editor.component.scss | 2 +- .../dmp-wizard-dataset-listing.component.scss | 29 ++++---- .../explore-dataset-filters.component.scss | 16 ++--- ...xplore-dataset-listing-item.component.scss | 3 +- .../explore-dmp-filters.component.scss | 16 ++--- .../explore-dmp-listing-item.component.scss | 8 ++- .../criteria/grant-criteria.component.scss | 16 ++--- .../misc/breadcrumb/breadcrumb.component.scss | 2 +- .../sidebar-footer.component.css | 2 +- dmp-frontend/src/assets/css/demo.css | 7 +- dmp-frontend/src/assets/scss/blue-theme.scss | 30 ++++---- .../assets/scss/core/variables/_brand.scss | 2 +- .../assets/scss/core/variables/_colors.scss | 28 ++++---- .../src/assets/scss/material-dashboard.scss | 70 +++++++++++-------- dmp-frontend/src/styles.scss | 34 +++++---- 38 files changed, 228 insertions(+), 188 deletions(-) diff --git a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss index 953b1843e..df9136d68 100644 --- a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss +++ b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss @@ -10,7 +10,7 @@ button { // background-color: #aaaaaa; - background-color: #4687f0; + background-color: #00b29f; color: #ffffff; } } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss index 6bf311012..2eb955561 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss @@ -33,7 +33,8 @@ mat-row:hover { // } mat-row:nth-child(odd) { - background-color: #eef0fb; + background-color: #0c748914; + // background-color: #eef0fb; } ::ng-deep .mat-paginator-container { diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss index 25d42604c..b0459dd25 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss @@ -16,7 +16,8 @@ } ::ng-deep .mat-checkbox-checked.mat-accent .mat-checkbox-background, .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background { - background-color: #0070c0; + background-color: #00b29f; + // background-color: #0070c0; } ::ng-deep .mat-checkbox-disabled.mat-checkbox-checked .mat-checkbox-background, .mat-checkbox-disabled.mat-checkbox-indeterminate .mat-checkbox-background { diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss index 772182938..fe822c9c8 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss @@ -16,7 +16,8 @@ } mat-row:nth-child(odd) { - background-color: #eef0fb; + background-color: #0c748914; + // background-color: #eef0fb; } .mat-fab-bottom-right { diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss index ed359a1d6..4f28a0670 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss @@ -12,7 +12,8 @@ } mat-row:nth-child(odd) { - background-color: #eef0fb; + background-color: #0c748914; + // background-color: #eef0fb; } } diff --git a/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css b/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css index 69a97ae21..17d724e05 100644 --- a/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css +++ b/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css @@ -38,7 +38,8 @@ } .about-item .length { - color: rgb(70, 135, 240); + color: #00b29f; + /* color: #089dbb; */ } .about-item .title { @@ -53,7 +54,8 @@ } .icon { - color: #92d050; + color: #08bd63; + /* color: #92d050; */ } hr { diff --git a/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css b/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css index ee94cbfe9..23ba20a1a 100644 --- a/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css +++ b/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css @@ -4,7 +4,8 @@ .icon { /* color: rgb(112, 173, 71); */ - color: #92d050; + color: #08bd63; + /* color: #92d050; */ } .gray-container { diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css index bb91d4d54..c08c9a9f6 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css @@ -5,9 +5,9 @@ th { .is-public { padding-left: 5px; padding-right: 5px; - border: 1px solid rgb(197, 224, 180); - color: rgb(131, 184, 95); - background-color: rgb(240, 247, 236); + border: 1px solid #00b29f3b; + color: #00b29f; + background-color: #00b29f0f; border-radius: 10em; text-align: center; } @@ -31,7 +31,8 @@ th { margin-left: 2.5em; margin-right: 2.5em; border-radius: 10em; - background-color: rgba(0, 112, 192, 1); + background-color: #0d7489; + /* background-color: rgba(0, 112, 192, 1); */ /* background-color: #007bff; */ color: #fff; text-transform: uppercase; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css index 8402448b8..e79187de7 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css @@ -5,9 +5,9 @@ th { .is-public { padding-left: 5px; padding-right: 5px; - border: 1px solid rgb(197, 224, 180); - color: rgb(131, 184, 95); - background-color: rgb(240, 247, 236); + border: 1px solid #00b29f3b; + color: #00b29f; + background-color: #00b29f0f; border-radius: 10em; text-align: center; } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss index b2049965d..02de9b7fe 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss @@ -9,7 +9,8 @@ .description-action-row { margin-top: 1em; } - .deleteButton, .reverseButton { + .deleteButton, + .reverseButton { margin-top: 15px; margin-bottom: 15px; margin-right: 15px; @@ -30,13 +31,13 @@ .saveAndFinalizeButton { margin-top: 15px; margin-bottom: 15px; - margin-right: 15px; + margin-right: 15px; } .finalizeButton { - margin-top: 15px; + margin-top: 15px; margin-bottom: 15px; - margin-right: 15px; - text-transform: uppercase; + margin-right: 15px; + text-transform: uppercase; } .downloadPDF { margin-top: 15px; @@ -76,7 +77,7 @@ } .more-icon :hover { - color: #4687e6; + color: #00b29f; } .new-dataset { @@ -97,5 +98,6 @@ } ::ng-deep .mat-ink-bar { - background-color: #0070c0 !important; + background-color: #00b29f !important; + // background-color: #0070c0 !important; } diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss index f4822491e..28c634a3a 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss @@ -3,7 +3,7 @@ } .category-title { - color: #2e75b6; + color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -20,7 +20,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss index d60d77eee..bcd3a0235 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss @@ -43,12 +43,12 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #00b29f; + background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss index cdaa2558f..21a58f334 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss @@ -18,7 +18,7 @@ } .container-header :hover { - color: #4687e6; + color: #00b29f; } h4 { @@ -45,11 +45,11 @@ h4 > span { } .links :hover { - color: #4687e6; + color: #00b29f; } .about-item .length { - color: #4687f0; + color: #00b29f; } .about-item .title { diff --git a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss index 0917e88e2..13ef5d884 100644 --- a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss +++ b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss @@ -14,7 +14,7 @@ .clone-mode { // line-height: 2em; text-transform: uppercase; - color: #4687e6; + color: #089dbb; font-weight: 400; align-self: center; } @@ -25,7 +25,7 @@ } .more-icon :hover { - color: #4687e6; + color: #00b29f; } ::ng-deep .mat-tab-labels { @@ -37,5 +37,6 @@ } ::ng-deep .mat-ink-bar { - background-color: #0070c0 !important; + background-color: #00b29f !important; + // background-color: #0070c0 !important; } diff --git a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss index b6edcaa28..a7116bf01 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss @@ -7,7 +7,8 @@ } .finalized-bookmark { - color: #92d050; + color: #08bd63; + // color: #92d050; display: inline; position: absolute; margin-top: 0.5em; @@ -38,7 +39,7 @@ .show-more { background-color: #ffffff00; - color: #4687f0; + color: #00b29f; font-weight: 700; justify-self: center; } @@ -50,7 +51,8 @@ margin-left: 2.5em; margin-right: 2.5em; border-radius: 10em; - background-color: #0070c0; + background-color: #0d7489; + // background-color: #0070c0; // background-color: rgb(70, 135, 230); color: #fff; text-transform: uppercase; @@ -71,7 +73,7 @@ } h4 span { - color: #619ce3; + color: #089dbb; font-weight: 600; text-transform: uppercase; } diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss index c5aeb2373..ffe46cacf 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss @@ -12,7 +12,7 @@ } .more-icon :hover { - color: #4687e6; + color: #00b29f; } ::ng-deep .mat-tab-labels { @@ -24,5 +24,6 @@ } ::ng-deep .mat-ink-bar { - background-color: #0070c0 !important; + background-color: #00b29f !important; + // background-color: #0070c0 !important; } diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.scss index 8fdc4177f..59445cc23 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.scss @@ -49,7 +49,8 @@ } .finalized-bookmark { - color: #92d050; + color: #08bd63; + // color: #92d050; display: inline; padding: 0; } @@ -65,10 +66,10 @@ } .datasets span { - color: #4687f0; + color: #00b29f; } .emptyList { font-style: italic; - color:rgba(0, 0, 0, 0.26); + color: rgba(0, 0, 0, 0.26); } diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss index 1a08fab65..05d8ae793 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss @@ -6,7 +6,7 @@ } .input-btn :hover { - color: #4687f0 !important; + color: #00b29f !important; } // .icon-btn { @@ -31,7 +31,7 @@ } .version-menu mat-icon { - color: #4687f0; + color: #00b29f; } ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.scss index 0ee135a89..7c7d1acda 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.scss @@ -5,7 +5,7 @@ align-self: center; padding-bottom: 1em; cursor: pointer; - color: #0070c0; + color: #00b29f; } .add-entity:after { @@ -16,7 +16,8 @@ height: 2px; left: 50%; position: absolute; - background: #0070c0; + background: #00b29f; + // background: #0070c0; transition: width 0.3s ease 0s, left 0.3s ease 0s; width: 0; } diff --git a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss index 2e0aea0f9..35fc52eda 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss @@ -1,6 +1,7 @@ .table-header { background-color: #eeeeee; - color: #0070c0; + color: #0c7489; + // color: #0070c0; height: 2em; } diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss index 02e99ec24..18df2a5f4 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss @@ -22,7 +22,7 @@ } .category-title { - color: #2e75b6; + color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -39,7 +39,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -56,7 +56,7 @@ } ::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; + color: #00b29f !important; } ::ng-deep.mat-form-field-underline { @@ -64,7 +64,7 @@ } ::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; + background-color: #00b29f !important; } // ::ng-deep .mat-checkbox { @@ -81,7 +81,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -98,12 +98,12 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #00b29f; + background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss index 7b4733d6d..9a230fbba 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss @@ -17,7 +17,7 @@ } .container-header :hover { - color: #4687e6; + color: #00b29f; } h4 { @@ -44,7 +44,7 @@ h4 > span { } .datasets-counter :hover { - color: #4687e6 !important; + color: #089dbb !important; } .about-item .title { @@ -70,5 +70,6 @@ h4 > span { .published-icon { padding-top: 1px; - color: #92d050; + color: #08bd63;; + // color: #92d050; } diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss index 324ddea63..f17cab739 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss @@ -14,7 +14,7 @@ } .more-icon :hover { - color: #4687e6; + color: #00b29f; } .menu-item { @@ -54,7 +54,7 @@ .researchers-title { width: 120px; - color: #4687e6; + color: #089dbb; background-color: white; padding: 0px 10px; margin-top: -16px; @@ -78,7 +78,7 @@ } .container-header :hover { - color: #4687e6; + color: #00b29f; } .dataset-card { @@ -105,13 +105,13 @@ .show-more { background-color: #ffffff00; - color: #4687f0; + color: #00b29f; font-weight: 700; justify-self: center; } .visit-website { - background-color: #4687f0; + background-color: #00b29f; color: #ffffff; } @@ -132,7 +132,7 @@ } h4 span { - color: #619ce3; + color: #089dbb; font-weight: 600; text-transform: uppercase; } @@ -144,7 +144,8 @@ h4 span { margin-left: 2.5em; margin-right: 2.5em; border-radius: 10em; - background-color: rgba(0, 112, 192, 1); + background-color: #0d7489; + // background-color: rgba(0, 112, 192, 1); // background-color: rgb(70, 135, 230); color: #fff; text-transform: uppercase; @@ -173,7 +174,7 @@ h4 span { } .datasets-counter :hover { - color: #4687e6 !important; + color: #00b29f !important; } .total-info { diff --git a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss index e8c0f3ca1..d7df7678d 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss +++ b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss @@ -14,7 +14,7 @@ } .input-btn :hover { - color: #4687f0 !important; + color: #00b29f !important; } .table-card .mat-grid-tile { diff --git a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss index 9070df5a0..83bae944c 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss +++ b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss @@ -1,36 +1,37 @@ .mat-table { - margin: 24px; + margin: 24px; } .mat-fab-bottom-right { - // top: auto !important; - // right: 20px !important; - // bottom: 10px !important; - // left: auto !important; - // position: fixed !important; - float: right; + // top: auto !important; + // right: 20px !important; + // bottom: 10px !important; + // left: auto !important; + // position: fixed !important; + float: right; } .full-width { - width: 100%; + width: 100%; } .mat-card { - margin: 16px 0; + margin: 16px 0; } .mat-row { - cursor: pointer; + cursor: pointer; } mat-row:hover { - background-color: lightgray; + background-color: lightgray; } // mat-row:nth-child(even){ // background-color:red; // } -mat-row:nth-child(odd){ - background-color:#eef0fb; - } +mat-row:nth-child(odd) { + background-color: #0c748914; + // background-color:#eef0fb; +} diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss index 7eb7d69a8..1bab477e4 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss @@ -13,7 +13,7 @@ } .category-title { - color: #2e75b6; + color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -30,7 +30,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -47,7 +47,7 @@ } ::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; + color: #00b29f !important; } ::ng-deep.mat-form-field-underline { @@ -55,7 +55,7 @@ } ::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; + background-color: #00b29f !important; } // ::ng-deep .mat-checkbox { @@ -72,7 +72,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -89,12 +89,12 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #00b29f; + background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss index ac562eae6..07ecdd307 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss @@ -33,7 +33,8 @@ h4 { } .about-item .length { - color: rgb(70, 135, 240); + color: #00b29f; + // color: #089dbb; } .about-item .title { diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss index 7eb7d69a8..1bab477e4 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss @@ -13,7 +13,7 @@ } .category-title { - color: #2e75b6; + color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -30,7 +30,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -47,7 +47,7 @@ } ::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; + color: #00b29f !important; } ::ng-deep.mat-form-field-underline { @@ -55,7 +55,7 @@ } ::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; + background-color: #00b29f !important; } // ::ng-deep .mat-checkbox { @@ -72,7 +72,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -89,12 +89,12 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #00b29f; + background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss index 0476c1cea..0ee1f4e12 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss @@ -22,7 +22,8 @@ } .about-item .length { - color: rgb(70, 135, 240); + color: #00b29f; + // color: #089dbb; } .about-item .title { @@ -46,8 +47,9 @@ } .published-icon { - padding-top: 1px; - color: #92d050; + padding-top: 1px; + color: #08bd63; + // color: #92d050; } // .explore-dmp-listing-item { diff --git a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss index eea90799c..c2156e6b9 100644 --- a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss +++ b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss @@ -27,7 +27,7 @@ } .category-title { - color: #2e75b6; + color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -44,7 +44,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -61,7 +61,7 @@ } ::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; + color: #00b29f !important; } ::ng-deep.mat-form-field-underline { @@ -69,7 +69,7 @@ } ::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; + background-color: #00b29f !important; } // ::ng-deep .mat-checkbox { @@ -86,7 +86,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -103,12 +103,12 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #00b29f; + background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss index c80112f1a..543dc4cc3 100644 --- a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss +++ b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss @@ -44,7 +44,7 @@ } .active { - color: #4687f0; + color: #00b29f; } .icon { diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css index f1fb4aa11..faab6bfae 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css @@ -17,7 +17,7 @@ } .sidebar-footer :hover { - color: #4687e6; + color: #00b29f; } .sidebar-footer .vl { diff --git a/dmp-frontend/src/assets/css/demo.css b/dmp-frontend/src/assets/css/demo.css index 040ac2225..699bbba8f 100644 --- a/dmp-frontend/src/assets/css/demo.css +++ b/dmp-frontend/src/assets/css/demo.css @@ -78,7 +78,7 @@ h6 { } .sidebar[data-color="danger"] li.active>a { - background-color: #4687e6; + background-color: rgb(0, 178, 159); /* -webkit-box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */ /* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */ box-shadow: none; @@ -174,7 +174,8 @@ h6 { } .card .card-header-blue .card-icon, .card .card-header-blue .card-text, .card .card-header-blue:not(.card-header-icon):not(.card-header-text), .card.bg-warning, .card.card-rotate.bg-warning .front, .card.card-rotate.bg-warning .back { - background: linear-gradient(60deg, rgb(0, 112, 192), rgb(0, 112, 192)); + /* background: linear-gradient(60deg, rgb(0, 112, 192), rgb(0, 112, 192)); */ + background: linear-gradient(60deg, rgb(12, 116, 137), rgb(12, 116, 137)); } .card .card-header-blue .card-icon, .card .card-header-blue:not(.card-header-icon):not(.card-header-text), .card .card-header-blue .card-text { @@ -347,5 +348,5 @@ table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, . } .attach-file :hover { - color: #667eff + color: #00b29f } diff --git a/dmp-frontend/src/assets/scss/blue-theme.scss b/dmp-frontend/src/assets/scss/blue-theme.scss index 9e72e7d71..d3a21dbd4 100644 --- a/dmp-frontend/src/assets/scss/blue-theme.scss +++ b/dmp-frontend/src/assets/scss/blue-theme.scss @@ -1,21 +1,21 @@ @import 'app/ui/misc/navigation/navigation.component.scss'; -@import '../node_modules/@angular/material/theming'; +@import '~@angular/material/theming'; // @import '../../../node_modules/@angular/material/theming'; $app-blue-theme-primary-palette: ( - 50: #e8eaf6, - 100: #c5cae9, - 200: #9fa8da, - 300: #7986cb, - 400: #5c6bc0, - 500: #3f51b5, - 600: #3949ab, - 700: #303f9f, - 800: #283593, - 900: #1a237e, - A100: #8c9eff, - A200: #536dfe, - A400: #3d5afe, - A700: #304ffe, + 50: #e2eef1, + 100: #b6d5dc, + 200: #86bac4, + 300: #559eac, + 400: #30899b, + 500: #0c7489, + 600: #0a6c81, + 700: #086176, + 800: #06576c, + 900: #034459, + A100: #8bddff, + A200: #58cfff, + A400: #25c0ff, + A700: #0bb9ff, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, diff --git a/dmp-frontend/src/assets/scss/core/variables/_brand.scss b/dmp-frontend/src/assets/scss/core/variables/_brand.scss index 4a9a39cfe..14113fb30 100644 --- a/dmp-frontend/src/assets/scss/core/variables/_brand.scss +++ b/dmp-frontend/src/assets/scss/core/variables/_brand.scss @@ -3,7 +3,7 @@ /* brand Colors */ -$brand-primary: $purple-500 !default; +$brand-primary: $indigo-500 !default; $brand-info: $cyan-500 !default; $brand-success: $green-500 !default; $brand-warning: $orange-500 !default; diff --git a/dmp-frontend/src/assets/scss/core/variables/_colors.scss b/dmp-frontend/src/assets/scss/core/variables/_colors.scss index db0c1986a..05404a310 100644 --- a/dmp-frontend/src/assets/scss/core/variables/_colors.scss +++ b/dmp-frontend/src/assets/scss/core/variables/_colors.scss @@ -62,20 +62,20 @@ $deep-purple-a400: #651fff !default; $deep-purple-a700: #6200ea !default; $deep-purple: $deep-purple-500 !default; -$indigo-50: #e8eaf6 !default; -$indigo-100: #c5cae9 !default; -$indigo-200: #9fa8da !default; -$indigo-300: #7986cb !default; -$indigo-400: #5c6bc0 !default; -$indigo-500: #3f51b5 !default; -$indigo-600: #3949ab !default; -$indigo-700: #303f9f !default; -$indigo-800: #283593 !default; -$indigo-900: #1a237e !default; -$indigo-a100: #8c9eff !default; -$indigo-a200: #536dfe !default; -$indigo-a400: #3d5afe !default; -$indigo-a700: #304ffe !default; +$indigo-50: #e2eef1 !default; +$indigo-100: #b6d5dc !default; +$indigo-200: #86bac4 !default; +$indigo-300: #559eac !default; +$indigo-400: #30899b !default; +$indigo-500: #0c7489 !default; +$indigo-600: #0a6c81 !default; +$indigo-700: #086176 !default; +$indigo-800: #06576c !default; +$indigo-900: #034459 !default; +$indigo-a100: #8bddff !default; +$indigo-a200: #58cfff !default; +$indigo-a400: #25c0ff !default; +$indigo-a700: #0bb9ff !default; $indigo: $indigo-500 !default; $blue-50: #e3f2fd !default; diff --git a/dmp-frontend/src/assets/scss/material-dashboard.scss b/dmp-frontend/src/assets/scss/material-dashboard.scss index 94856c0dd..03d5f6943 100644 --- a/dmp-frontend/src/assets/scss/material-dashboard.scss +++ b/dmp-frontend/src/assets/scss/material-dashboard.scss @@ -14,43 +14,53 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ - @import "~@angular/material/prebuilt-themes/indigo-pink.css"; +@import "~@angular/material/prebuilt-themes/indigo-pink.css"; +@import "~@angular/material/theming"; // @import '../../../node_modules/@angular/material/theming'; +@import "./blue-theme.scss"; - @import "core/variables"; - @import "core/mixins"; - @import "~bootstrap/scss/bootstrap"; +@include mat-core(); +// Define a theme. +$custom-theme-primary: mat-palette($app-blue-theme-primary-palette, 900); +$custom-theme-accent: mat-palette($mat-pink, A200, A100, A400); +$custom-theme-warn: mat-palette($mat-red); +$custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent, $custom-theme-warn); +@include angular-material-theme($custom-theme); - // Core Components - @import "core/buttons"; - @import "core/checkboxes"; - @import "core/radios"; - @import "core/forms"; - @import "core/input-group"; - @import "core/images"; - @import "core/navbar"; - @import "core/alerts"; - @import "core/type"; - @import "core/tabs"; - @import "core/tooltip"; - @import "core/popover"; - @import "core/dropdown"; - @import "core/togglebutton"; - @import "core/ripples"; - @import "core/footers"; - @import "core/sidebar-and-main-panel"; - @import "core/fixed-plugin"; - @import "core/tables"; - @import "core/misc"; +@import "core/variables"; +@import "core/mixins"; +@import "~bootstrap/scss/bootstrap"; + +// Core Components +@import "core/buttons"; +@import "core/checkboxes"; +@import "core/radios"; +@import "core/forms"; +@import "core/input-group"; +@import "core/images"; +@import "core/navbar"; +@import "core/alerts"; +@import "core/type"; +@import "core/tabs"; +@import "core/tooltip"; +@import "core/popover"; +@import "core/dropdown"; +@import "core/togglebutton"; +@import "core/ripples"; +@import "core/footers"; +@import "core/sidebar-and-main-panel"; +@import "core/fixed-plugin"; +@import "core/tables"; +@import "core/misc"; @import "core/cards"; @import "core/cards/card-stats"; @import "core/cards/card-profile"; @import "core/cards/card-plain"; - //plugin scss - @import "core/plugins/animate"; - @import "core/plugins/chartist"; - @import "core/plugins/perfect-scrollbar"; +//plugin scss +@import "core/plugins/animate"; +@import "core/plugins/chartist"; +@import "core/plugins/perfect-scrollbar"; - @import "core/responsive"; +@import "core/responsive"; diff --git a/dmp-frontend/src/styles.scss b/dmp-frontend/src/styles.scss index 107299ff2..6a8886290 100644 --- a/dmp-frontend/src/styles.scss +++ b/dmp-frontend/src/styles.scss @@ -1,18 +1,20 @@ +// @import "~@covalent/core/theming/all-theme"; +@import "~@angular/material/theming"; // @import '../node_modules/@angular/material/theming'; @import "~@angular/material/prebuilt-themes/indigo-pink.css"; +// Material-Bootstrap configuration @import "~bootstrap/scss/bootstrap"; -//Material-Bootstrap configuration -@import "assets/scss/bootstrap-material"; -@import "~@angular/material/theming"; -// @import "~@covalent/core/theming/all-theme"; -@include mat-core(); +// Custom Theme +// @import "./assets/scss/blue-theme.scss"; + // Define a theme. -$primary: mat-palette($mat-indigo); -$accent: mat-palette($mat-pink, A200, A100, A400); -$theme: mat-light-theme($primary, $accent); +// $primary: mat-palette($app-blue-theme-primary-palette); +// $accent: mat-palette($mat-pink, A200, A100, A400); +// $theme: mat-light-theme($primary, $accent); + // Include all theme styles for the components. -@include angular-material-theme($theme); +// @include angular-material-theme($theme); // @include covalent-theme($theme); .snackbar-warning { @@ -31,7 +33,8 @@ $theme: mat-light-theme($primary, $accent); } .lightblue-btn { - background-color: rgba(0, 112, 192, 1) !important; + background-color: rgb(0, 178, 159) !important; + // background-color: rgba(0, 112, 192, 1) !important; } .listing-item { @@ -55,7 +58,8 @@ $theme: mat-light-theme($primary, $accent); .chip { padding: 0.1em 1em; border-radius: 10em; - background-color: rgba(0, 112, 192, 1); + background-color: #0d7489; + // background-color: rgba(0, 112, 192, 1); color: #fff; text-transform: uppercase; font-weight: 500; @@ -70,7 +74,8 @@ $theme: mat-light-theme($primary, $accent); border: 0.1em solid rgb(218, 227, 243); border-radius: 10em; background-color: rgb(236, 241, 249); - color: rgba(0, 112, 192, 1); + color: rgb(0, 178, 159); + // color: rgba(0, 112, 192, 1); // color: rgb(68, 114, 196); text-transform: uppercase; font-weight: 500; @@ -125,14 +130,15 @@ $theme: mat-light-theme($primary, $accent); } .finalized-bookmark { - color: #92d050; + color: #08bd63;; + // color: #92d050; display: inline; position: absolute; padding-top: 3px; } h4 span { - color: #619ce3; + color: #089dbb; font-weight: 600; } }