diff --git a/dmp-frontend/angular.json b/dmp-frontend/angular.json
index c1a3f7752..4c12d5745 100644
--- a/dmp-frontend/angular.json
+++ b/dmp-frontend/angular.json
@@ -30,7 +30,6 @@
"scripts": [
"node_modules/cookieconsent/build/cookieconsent.min.js",
"node_modules/tinymce/tinymce.min.js"
-
],
"vendorChunk": true,
"extractLicenses": false,
diff --git a/dmp-frontend/src/app/core/services/configuration/configuration.service.ts b/dmp-frontend/src/app/core/services/configuration/configuration.service.ts
index 64082cb55..469f1fce9 100644
--- a/dmp-frontend/src/app/core/services/configuration/configuration.service.ts
+++ b/dmp-frontend/src/app/core/services/configuration/configuration.service.ts
@@ -41,6 +41,11 @@ export class ConfigurationService extends BaseComponent {
return this._defaultLanguage;
}
+ private _availableLanguages: any[] = [];
+ get availableLanguages(): any[] {
+ return this._availableLanguages;
+ }
+
private _loginProviders: LoginProviders;
get loginProviders(): LoginProviders {
return this._loginProviders;
@@ -127,6 +132,7 @@ export class ConfigurationService extends BaseComponent {
this._helpService = HelpService.parseValue(config.HelpService);
this._defaultCulture = config.defaultCulture;
this._defaultLanguage = config.defaultLanguage;
+ this._availableLanguages = config.availableLanguages;
this._loginProviders = LoginProviders.parseValue(config.loginProviders);
this._logging = Logging.parseValue(config.logging);
this._lockInterval = config.lockInterval;
diff --git a/dmp-frontend/src/app/core/services/language/language.service.ts b/dmp-frontend/src/app/core/services/language/language.service.ts
index b37a36b20..4b343591d 100644
--- a/dmp-frontend/src/app/core/services/language/language.service.ts
+++ b/dmp-frontend/src/app/core/services/language/language.service.ts
@@ -7,8 +7,6 @@ import { BaseHttpService } from '../http/base-http.service';
import { Language } from '@app/models/language/Language';
import { ConfigurationService } from '../configuration/configuration.service';
-const availableLanguages: any[] = require('../../../../assets/resources/language.json');
-
@Injectable()
export class LanguageService {
private currentLanguage: string;
@@ -43,7 +41,7 @@ export class LanguageService {
public getCurrentLanguageName() {
let result: string = '';
- availableLanguages.forEach(language => {
+ this.configurationService.availableLanguages.forEach(language => {
if (language.value === this.currentLanguage) {
result = this.translate.instant(language.label);
}
diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss
index 611710a88..e616373c0 100644
--- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss
+++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss
@@ -65,7 +65,7 @@
margin: 0px 5px 0px 10px;
}
mat-icon:hover {
- color: #129d99;
+ color: var(--primary-color);
}
}
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 df9136d68..f23b9e314 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: #00b29f;
+ background-color: var(--primary-color-3);
color: #ffffff;
}
}
diff --git a/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html b/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html
index 4965184ec..4cce736fc 100644
--- a/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html
+++ b/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html
@@ -37,8 +37,7 @@
-
-
+
diff --git a/dmp-frontend/src/app/library/guided-tour/guided-tour.component.scss b/dmp-frontend/src/app/library/guided-tour/guided-tour.component.scss
index 71232d8f8..42b9098f9 100644
--- a/dmp-frontend/src/app/library/guided-tour/guided-tour.component.scss
+++ b/dmp-frontend/src/app/library/guided-tour/guided-tour.component.scss
@@ -211,9 +211,9 @@ ngx-guided-tour {
// float: right;
min-width: 133px;
height: 40px;
- border: 1px solid #129d99;
+ border: 1px solid var(--primary-color);
background: #ffffff 0% 0% no-repeat padding-box;
- color: #129d99;
+ color: var(--primary-color);
}
.next-button {
@@ -231,7 +231,7 @@ ngx-guided-tour {
padding-left: 1em;
padding-right: 1em;
min-width: 101px;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
}
/*custom add*/
@@ -245,16 +245,5 @@ ngx-guided-tour {
border-radius: 30px;
}
}
-
- /*custom add*/
- .argos-present-img {
- background: url("../../../assets/splash/assets/img/2_Sign_in/Svg/Sign\ In.svg") no-repeat;
- min-width: 176px;
- height: 220px;
- position: relative;
- top: 110px;
- left: -85px;
- border-top: none;
- }
}
}
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.scss
index a53d303c5..121ec9530 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.scss
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.scss
@@ -15,7 +15,7 @@
//Palete
-$blue-color : #129D99;
+$blue-color : var(--primary-color);
$blue-color-light: #5cf7f2;
.actions-list{
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss
index 5f5900f93..7dfc9b224 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss
@@ -14,7 +14,7 @@ mat-radio-button{
}
li.list-inline-item{
- color: #129D99;
+ color: var(--primary-color);
.mat-icon{
vertical-align: bottom;
}
@@ -27,7 +27,7 @@ li.list-inline-item{
color: #212121;
}
.mat-slide-toggle.mat-checked .mat-slide-toggle-thumb {
- background-color:#129D99 ;
+ background-color:var(--primary-color) ;
}
.mat-slide-toggle.mat-checked .mat-slide-toggle-bar {
background-color:rgba(0,178,159,0.34);
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section-fieldset/dataset-profile-editor-section-fieldset.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section-fieldset/dataset-profile-editor-section-fieldset.component.scss
index c10761262..4870b869e 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section-fieldset/dataset-profile-editor-section-fieldset.component.scss
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section-fieldset/dataset-profile-editor-section-fieldset.component.scss
@@ -1,4 +1,4 @@
-$blue-color : #129D99;
+$blue-color : var(--primary-color);
$blue-color-light: #5cf7f2;
@@ -33,7 +33,7 @@ $blue-color-light: #5cf7f2;
}
.actions-list{
// border: 1px solid $blue-color;
- // box-shadow: 0px 3px 12px #129D9999;
+ // box-shadow: 0px 3px 12px var(--primary-color)99;
border-radius: 4px;
// padding-top: 1rem;
padding: 1em 0.9em;
@@ -59,7 +59,7 @@ $blue-color-light: #5cf7f2;
margin-right: 0.5em;
margin-left: -.09em;
height: auto;
- color: #129D99;;
+ color: var(--primary-color);;
}
.input_icon{
width: 14px;
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss
index 6a9648d6e..cd066b05f 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss
@@ -72,7 +72,7 @@
transition-timing-function: ease-out;
transition-delay: 50ms;
box-shadow: 0px 1px 2px #bfbfbf;
- background-color: #F7DD72;
+ background-color: var(--secondary-color);
}
#progress-container{
box-shadow: 1px 1px 6px #00000029;;
@@ -81,8 +81,8 @@
// .import-btn {
// background: #ffffff 0% 0% no-repeat padding-box;
// border-radius: 30px;
-// // color: #129d99;
-// // border: 1px solid #129d99;
+// // color: var(--primary-color);
+// // border: 1px solid var(--primary-color);
// padding-left: 2em;
// padding-right: 2em;
// color: #000;
@@ -90,7 +90,7 @@
// }
.navigate-btn {
border-radius: 30px;
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
border: 1px solid transparent;
padding-left: 2em;
padding-right: 2em;
@@ -108,7 +108,7 @@ color: #FFF;
.create-section-btn {
border-radius: 30px;
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
border: 1px solid transparent;
padding-left: 1em;
padding-right: 1em;
@@ -117,21 +117,21 @@ color: #FFF;
}
-$blue-color : #129D99;
+$blue-color : var(--primary-color);
$blue-color-light: #5cf7f2;
.finalize-btn {
border-radius: 30px;
- border: 1px solid #129D99;
+ border: 1px solid var(--primary-color);
background: transparent;
padding-left: 2em;
padding-right: 2em;
box-shadow: 0px 3px 6px #1E202029;
- color: #129D99;
+ color: var(--primary-color);
}
.template_action_btn{
border-radius: 30px;
- border: 1px solid #129D99;
+ border: 1px solid var(--primary-color);
background: transparent;
//padding-left: 2em;
//padding-right: 2em;
@@ -139,10 +139,10 @@ $blue-color-light: #5cf7f2;
min-width: 110px;
width: auto;
box-shadow: 0px 3px 6px #1E202029;
- color: #129D99;
+ color: var(--primary-color);
flex: 0 0 auto;
&.save-btn{
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
border: 1px solid transparent;
//padding-left: 2em;
//padding-right: 2em;
@@ -196,7 +196,7 @@ $blue-color-light: #5cf7f2;
.actions-list{
// border: 1px solid $blue-color;
- box-shadow: 0px 3px 12px #129D9999;
+ box-shadow: 0px 3px 12px var(--primary-color)99;
border-radius: 4px;
// padding-top: 1rem;
padding: 1em 0.9em;
@@ -220,7 +220,7 @@ $blue-color-light: #5cf7f2;
margin-right: 0.5em;
margin-left: -.09em;
height: auto;
- color: #129D99;;
+ color: var(--primary-color);;
}
.input_icon{
width: 14px;
@@ -322,7 +322,7 @@ $blue-color-light: #5cf7f2;
position: fixed;
bottom: 20em;
right: 2em;
- color: #129D99 !important;
+ color: var(--primary-color) !important;
cursor: pointer;
font-size: 1rem;
font-weight: 400;
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.scss
index 179e7eb4b..c79fa2851 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.scss
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.scss
@@ -15,12 +15,12 @@ min-width: 101px;
.next-btn {
background: #ffffff 0% 0% no-repeat padding-box;
- border: 1px solid #129d99;
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
min-width: 101px;
height: 43px;
- color: #129d99;
+ color: var(--primary-color);
font-weight: 500;
}
@@ -34,7 +34,7 @@ min-width: 101px;
}
.next-btn:not([disabled]):hover {
- background-color: #129d99;
+ background-color: var(--primary-color);
color: #ffffff;
}
@@ -86,15 +86,15 @@ min-width: 101px;
width: 156px;
height: 44px;
color: #ffffff;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1e202029;
border-radius: 30px;
}
.attach-file:hover {
background-color: #ffffff;
- border: 1px solid #129d99;
- color: #129d99;
+ border: 1px solid var(--primary-color);
+ color: var(--primary-color);
}
.close-btn:hover{
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 456be7372..d6013801d 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
@@ -104,8 +104,8 @@ mat-row:hover {
.import-btn {
background: #ffffff 0% 0% no-repeat padding-box;
border-radius: 30px;
- // color: #129d99;
- // border: 1px solid #129d99;
+ // color: var(--primary-color);
+ // border: 1px solid var(--primary-color);
padding-left: 2em;
padding-right: 2em;
color: #000;
@@ -113,7 +113,7 @@ mat-row:hover {
}
.create-btn {
border-radius: 30px;
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
padding-left: 2em;
padding-right: 2em;
}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss
index 66b54ece1..3e4c13517 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss
@@ -83,9 +83,9 @@
-$blue-color : #129D99;
+$blue-color : var(--primary-color);
$blue-color-light: #5cf7f2;
-$yellow: #f7dd72;
+$yellow: var(--secondary-color);
.badge-ball{
display: inline-block;
border-radius: 50%;
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 ae188ac09..b05bd906f 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
@@ -20,7 +20,7 @@
}
::ng-deep .mat-checkbox-checked.mat-accent .mat-checkbox-background, .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background {
- background-color: #00b29f;
+ background-color: var(--primary-color-3);
// background-color: #0070c0;
}
@@ -30,12 +30,12 @@
.finalize-btn {
border-radius: 30px;
- border: 1px solid #129D99;
+ border: 1px solid var(--primary-color);
background: transparent;
padding-left: 2em;
padding-right: 2em;
box-shadow: 0px 3px 6px #1E202029;
- color: #129D99;
+ color: var(--primary-color);
&:disabled{
background-color: #CBCBCB;
color: #FFF;
@@ -45,7 +45,7 @@
.action-btn {
border-radius: 30px;
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
border: 1px solid transparent;
padding-left: 2em;
padding-right: 2em;
diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.scss
index 179e7eb4b..c79fa2851 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.scss
+++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.scss
@@ -15,12 +15,12 @@ min-width: 101px;
.next-btn {
background: #ffffff 0% 0% no-repeat padding-box;
- border: 1px solid #129d99;
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
min-width: 101px;
height: 43px;
- color: #129d99;
+ color: var(--primary-color);
font-weight: 500;
}
@@ -34,7 +34,7 @@ min-width: 101px;
}
.next-btn:not([disabled]):hover {
- background-color: #129d99;
+ background-color: var(--primary-color);
color: #ffffff;
}
@@ -86,15 +86,15 @@ min-width: 101px;
width: 156px;
height: 44px;
color: #ffffff;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1e202029;
border-radius: 30px;
}
.attach-file:hover {
background-color: #ffffff;
- border: 1px solid #129d99;
- color: #129d99;
+ border: 1px solid var(--primary-color);
+ color: var(--primary-color);
}
.close-btn:hover{
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 e797578ad..55aaa2ee6 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
@@ -37,7 +37,7 @@
}
.create-btn {
border-radius: 30px;
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
padding-left: 2em;
padding-right: 2em;
// color: #000;
@@ -50,8 +50,8 @@
.import-btn {
background: #ffffff 0% 0% no-repeat padding-box;
border-radius: 30px;
- // color: #129d99;
- // border: 1px solid #129d99;
+ // color: var(--primary-color);
+ // border: 1px solid var(--primary-color);
padding-left: 2em;
padding-right: 2em;
color: #000;
diff --git a/dmp-frontend/src/app/ui/admin/user/listing/criteria/user-criteria.component.scss b/dmp-frontend/src/app/ui/admin/user/listing/criteria/user-criteria.component.scss
index 9b54a5539..86021d8d4 100644
--- a/dmp-frontend/src/app/ui/admin/user/listing/criteria/user-criteria.component.scss
+++ b/dmp-frontend/src/app/ui/admin/user/listing/criteria/user-criteria.component.scss
@@ -14,7 +14,7 @@
}
.search-form mat-icon {
- color: #129d99;
+ color: var(--primary-color);
}
}
diff --git a/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss b/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss
index ced1b45aa..c2fc49ca7 100644
--- a/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss
+++ b/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss
@@ -20,7 +20,7 @@
}
.row-action {
- color: #129d99;
+ color: var(--primary-color);
cursor: pointer;
}
.user-role{
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 f9e30031c..6e01f8143 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
@@ -50,8 +50,8 @@
background: #ffffff 0% 0% no-repeat padding-box;
border-radius: 30px;
width: 145px;
- color: #129d99;
- border: 1px solid #129d99;
+ color: var(--primary-color);
+ border: 1px solid var(--primary-color);
}
.export-icon {
diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.scss b/dmp-frontend/src/app/ui/auth/login/login.component.scss
index 8238f27d6..e78cd7a8c 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.scss
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss
@@ -32,13 +32,13 @@
font: Bold 38px/82px Roboto;
height: 60px;
letter-spacing: -0.95px;
- color: #23bcba;
+ color: var(--primary-color-2);
margin-top: 11px;
margin-bottom: 21px;
}
.line {
- border-top: 5px solid #23bcba;
+ border-top: 5px solid var(--primary-color-2);
width: 116px;
margin-bottom: 97px;
}
@@ -261,7 +261,7 @@ span.twitterIcon {
.openaireIconButton:hover,
.orcidIconMediumButton:hover,
.iconmediumButton:hover {
- // background-color: #129d993b;
+ // background-color: var(--primary-color)3b;
background-color: #ececec;
border-radius: 60%;
}
@@ -341,8 +341,7 @@ span.zenodoIcon {
// }
.laptop-img {
- // background: url("../../../../assets/splash/assets/img/laptop.png") no-repeat;
- background: url("../../../../assets/splash/assets/img/1_Main/Png/Who\ \ \ Benefits\ Small.png") no-repeat;
+ background: url("../../../../assets/images/login-bottom-image.png") no-repeat;
width: 164px;
height: 200px;
position: relative;
diff --git a/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss
index 70089c0ca..13a78e08f 100644
--- a/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss
+++ b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss
@@ -25,12 +25,12 @@ img {
.send-btn {
background: #ffffff 0% 0% no-repeat padding-box;
- border: 1px solid #129d99;
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
min-width: 101px;
height: 43px;
- color: #129d99;
+ color: var(--primary-color);
font-weight: 500;
}
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
index 61b9e8242..6e61cf2e5 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
@@ -20,14 +20,12 @@
-
-
-
+
@@ -120,7 +118,7 @@
-
+
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
index 92724be2b..9c0fd9c65 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
@@ -64,7 +64,7 @@
max-width: 256px;
height: 40px;
cursor: pointer;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1e202029;
border-radius: 30px;
border: none;
@@ -81,7 +81,7 @@
//max-width: 256px;
height: 40px;
cursor: pointer;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
border-radius: 30px;
opacity: 1;
border: none;
@@ -197,7 +197,7 @@ input[type="text"] {
}
.dmp-label {
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
opacity: 1;
min-width: 67px;
@@ -210,7 +210,7 @@ input[type="text"] {
// width: 158px;
width: auto;
height: 37px;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
text-align: left;
line-height: 2.8;
@@ -292,7 +292,7 @@ input[type="text"] {
.dataset-card-actions a:hover,
.dmp-card-actions a:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.dmp-dataset-descriptions-title {
@@ -313,7 +313,7 @@ input[type="text"] {
}
.show-more:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.btn-load-more {
@@ -354,7 +354,7 @@ input[type="text"] {
.add-dataset {
width: 142px;
height: 40px;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1e202029;
border-radius: 30px;
opacity: 1;
@@ -401,7 +401,7 @@ input[type="text"] {
:host ::ng-deep .mat-tab-group.mat-primary .mat-ink-bar,
.mat-tab-nav-bar.mat-primary .mat-ink-bar {
- background: #129d99;
+ background: var(--primary-color);
height: 5px;
}
@@ -444,14 +444,6 @@ input[type="text"] {
flex-grow: 1;
} */
-// .header-image {
-// background: url("/assets/images/new-dashboard-bg.png") no-repeat;
-// background-size: cover;
-// margin-top: 70px;
-// min-height: 20em;
-// position: relative;
-// }
-
// .header-text-container {
// background: rgba(255, 255, 255, 0.7);
// position: absolute;
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 17d724e05..0a315c365 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,7 @@
}
.about-item .length {
- color: #00b29f;
+ color: var(--primary-color-3);
/* color: #089dbb; */
}
diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css
index 1ee1781f7..2ae47a234 100644
--- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css
@@ -47,7 +47,7 @@ input[type="text"] {
}
.dmp-label {
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
opacity: 1;
min-width: 67px;
@@ -59,7 +59,7 @@ input[type="text"] {
.dataset-label {
width: auto;
height: 37px;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
text-align: left;
line-height: 2.8;
@@ -130,7 +130,7 @@ input[type="text"] {
.dataset-card-actions a:hover,
.dmp-card-actions a:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.dmp-dataset-descriptions-title {
@@ -151,7 +151,7 @@ input[type="text"] {
}
.show-more:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.btn-load-more {
@@ -183,7 +183,7 @@ input[type="text"] {
}
.search-form mat-icon {
- color: #129d99;
+ color: var(--primary-color);
}
::ng-deep .search-form .mat-form-field-wrapper {
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 170e24672..d39318901 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
@@ -47,7 +47,7 @@ input[type="text"] {
}
.dmp-label {
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
opacity: 1;
min-width: 67px;
@@ -59,7 +59,7 @@ input[type="text"] {
.dataset-label {
width: auto;
height: 37px;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
text-align: left;
line-height: 2.8;
@@ -139,7 +139,7 @@ input[type="text"] {
.dataset-card-actions a:hover,
.dmp-card-actions a:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.dmp-dataset-descriptions-title {
@@ -160,7 +160,7 @@ input[type="text"] {
}
.show-more:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.btn-load-more {
@@ -192,7 +192,7 @@ input[type="text"] {
}
.search-form mat-icon {
- color: #129d99;
+ color: var(--primary-color);
}
::ng-deep .search-form .mat-form-field-wrapper {
@@ -234,9 +234,9 @@ a {
.is-public {
padding-left: 5px;
padding-right: 5px;
- border: 1px solid #00b29f3b;
- color: #00b29f;
- background-color: #00b29f0f;
+ border: 1px solid var(--primary-color-3)3b;
+ color: var(--primary-color-3);
+ background-color: var(--primary-color-3)0f;
border-radius: 10em;
text-align: center;
}
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss
index 3aadd6111..3c5f10947 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss
@@ -47,7 +47,7 @@ input[type="text"] {
}
.dmp-label {
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
opacity: 1;
min-width: 67px;
@@ -59,7 +59,7 @@ input[type="text"] {
.dataset-label {
width: auto;
height: 37px;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
text-align: left;
line-height: 2.8;
@@ -141,7 +141,7 @@ input[type="text"] {
.dataset-card-actions a:hover,
.dmp-card-actions a:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.dmp-dataset-descriptions-title {
@@ -162,7 +162,7 @@ input[type="text"] {
}
.show-more:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.btn-load-more {
@@ -194,7 +194,7 @@ input[type="text"] {
}
.search-form mat-icon {
- color: #129d99;
+ color: var(--primary-color);
}
::ng-deep .search-form .mat-form-field-wrapper {
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css
index 44bd0a482..6829e925e 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css
@@ -46,7 +46,7 @@ input[type="text"] {
}
.dmp-label {
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
opacity: 1;
min-width: 67px;
@@ -58,7 +58,7 @@ input[type="text"] {
.dataset-label {
width: auto;
height: 37px;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
text-align: left;
line-height: 2.8;
@@ -123,7 +123,7 @@ input[type="text"] {
}
.dataset-card-actions a:hover, .dmp-card-actions a:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.dmp-dataset-descriptions-title {
@@ -144,7 +144,7 @@ input[type="text"] {
}
.show-more:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.btn-load-more {
@@ -176,7 +176,7 @@ input[type="text"] {
}
.search-form mat-icon {
- color: #129d99;
+ color: var(--primary-color);
}
::ng-deep .search-form .mat-form-field-wrapper {
@@ -204,9 +204,9 @@ a {
.is-public {
padding-left: 5px;
padding-right: 5px;
- border: 1px solid #00b29f3b;
- color: #00b29f;
- background-color: #00b29f0f;
+ border: 1px solid var(--primary-color-3)3b;
+ color: var(--primary-color-3);
+ background-color: var(--primary-color-3)0f;
border-radius: 10em;
text-align: center;
}
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 e79187de7..cb5d9aee0 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 #00b29f3b;
- color: #00b29f;
- background-color: #00b29f0f;
+ border: 1px solid var(--primary-color-3)3b;
+ color: var(--primary-color-3);
+ background-color: var(--primary-color-3)0f;
border-radius: 10em;
text-align: center;
}
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.scss
index bed07edff..69f3e2062 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.scss
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.scss
@@ -22,17 +22,17 @@ min-width: 101px;
.confirm-btn {
background: #ffffff 0% 0% no-repeat padding-box;
- border: 1px solid #129d99;
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
min-width: 101px;
height: 43px;
- color: #129d99;
+ color: var(--primary-color);
font-weight: 500;
}
.confirm-btn:hover {
- background-color: #129d99;
+ background-color: var(--primary-color);
color: #ffffff;
}
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.scss
index 3a40b45e8..b006bc845 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.scss
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.scss
@@ -53,7 +53,7 @@
}
.input-btn :hover {
- color: #00b29f !important;
+ color: var(--primary-color-3) !important;
}
.dmp-link {
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 48fdc4538..246e7ad8b 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
@@ -104,7 +104,7 @@
}
.more-icon :hover {
- color: #00b29f;
+ color: var(--primary-color-3);
}
.new-dataset {
@@ -120,8 +120,8 @@
.dataset-editor-header {
height: 113px;
- background: var(--unnamed-color-129d99) 0% 0% no-repeat padding-box;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--unnamed-color-var(--primary-color)) 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #00000029;
padding: 0.6rem;
margin: 30px 0px 0px 0px;
@@ -192,7 +192,7 @@
justify-content: center;
align-items: center;
font-weight: 700;
- color: #129d99;
+ color: var(--primary-color);
}
.dataset-discard-btn {
@@ -227,7 +227,7 @@
text-align: left;
font-size: 1rem;
font-weight: 700;
- color: #129d99;
+ color: var(--primary-color);
line-height: 25px;
}
@@ -238,7 +238,7 @@
.dmp-label {
min-width: 67px;
height: 37px;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
color: white;
border-radius: 4px;
opacity: 1;
@@ -264,7 +264,7 @@
opacity: 0.75;
}
.open-in-new-icon:hover {
- color: #129d99;
+ color: var(--primary-color);
}
.dataset-stepper {
@@ -347,7 +347,7 @@
width: 100%;
height: 27px;
line-height: 27px;
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
color: #5d5d5d;
border-radius: 4px;
font-weight: 400;
@@ -423,7 +423,7 @@
}
.add-dataset-btn {
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1e202029;
font-weight: 500;
word-wrap: break-word;
@@ -432,7 +432,7 @@
}
.next {
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
color: white;
box-shadow: 0px 3px 6px #1e202029;
font-weight: 400;
@@ -440,7 +440,7 @@
}
.dataset-next {
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
color: #212121;
box-shadow: 0px 3px 6px #1e202029;
font-weight: 700;
@@ -500,7 +500,7 @@ mat-icon.size-18 {
// }
// ::ng-deep .mat-ink-bar {
-// background-color: #00b29f !important;
+// background-color: var(--primary-color-3) !important;
// // background-color: #0070c0 !important;
// }
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.scss
index 55a2a967c..7a892e68b 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.scss
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.scss
@@ -3,7 +3,7 @@
display: flex;
width: 100%;
height: 60px;
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
color: #212121;
font-size: 1.25rem;
}
@@ -33,8 +33,8 @@
}
.empty-btn, .prefill-btn {
- background: #f7dd72 0 0 no-repeat padding-box;
- border: 1px solid #f7dd72;
+ background: var(--secondary-color) 0 0 no-repeat padding-box;
+ border: 1px solid var(--secondary-color);
border-radius: 30px;
opacity: 1;
min-width: 101px;
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 62c992251..a8e92de7c 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
@@ -34,7 +34,7 @@
.filters-title {
width: 93px;
// color: #089dbb;
- color: #23bcba;
+ color: var(--primary-color-2);
background-color: white;
padding: 0px 20px;
margin-top: -10px;
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
index f03d171f4..5c99449fe 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
@@ -11,7 +11,7 @@
-
+
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 e50263a3e..5042fe772 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
@@ -102,7 +102,7 @@
max-width: 256px;
height: 40px;
cursor: pointer;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1e202029;
border-radius: 30px;
border: none;
@@ -119,7 +119,7 @@
max-width: 256px;
height: 40px;
cursor: pointer;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
border-radius: 30px;
opacity: 1;
border: none;
@@ -148,7 +148,7 @@
.filter-btn button {
color: white;
- background-color: #23bcba;
+ background-color: var(--primary-color-2);
width: 37px;
height: 45px;
}
@@ -173,7 +173,7 @@
}
.search-form mat-icon {
- color: #129d99;
+ color: var(--primary-color);
}
.empty-list {
@@ -186,7 +186,7 @@
}
.pointer:hover {
- color: #00b29f;
+ color: var(--primary-color-3);
}
::ng-deep .search-form .mat-form-field-wrapper {
@@ -250,12 +250,12 @@
::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle {
border-color: #777777;
- // border-color: #00b29f;
+ // border-color: var(--primary-color-3);
}
::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle {
- // color: #00b29f;
- // background-color: #00b29f;
+ // color: var(--primary-color-3);
+ // background-color: var(--primary-color-3);
color: #777777;
background-color: #777777;
}
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 659ab566b..20b421820 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: #00b29f;
+ color: var(--primary-color-3);
}
h4 {
@@ -42,11 +42,11 @@ h4 > span {
}
.links :hover {
- color: #00b29f;
+ color: var(--primary-color-3);
}
.about-item .length {
- color: #00b29f;
+ color: var(--primary-color-3);
}
.about-item .title {
@@ -66,7 +66,7 @@ p {
}
.storage :hover {
- color: #00b29f;
+ color: var(--primary-color-3);
}
.draft-bookmark {
@@ -115,7 +115,7 @@ input[type="text"] {
}
.dmp-label {
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
opacity: 1;
min-width: 67px;
@@ -127,7 +127,7 @@ input[type="text"] {
.dataset-label {
width: auto;
height: 37px;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
text-align: left;
line-height: 2.8;
@@ -209,7 +209,7 @@ input[type="text"] {
.dataset-card-actions a:hover,
.dmp-card-actions a:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.dmp-dataset-descriptions-title {
@@ -230,7 +230,7 @@ input[type="text"] {
}
.show-more:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.btn-load-more {
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss
index 33bf2bc8b..ab755a92a 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss
@@ -17,7 +17,7 @@
width: 2.5em;
height: 2.5em;
color: #212121;
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
}
.mat-mini-fab-icon,
@@ -27,7 +27,7 @@
.actions-btn:hover,
.finalize-btn:hover {
- background-color: #129d99;
+ background-color: var(--primary-color);
color: #ffffff;
}
@@ -63,7 +63,7 @@
.dmp-btn {
width: 35em;
min-height: 2.3em;
- background-color: #129d99;
+ background-color: var(--primary-color);
border-radius: 4px;
flex-direction: row;
justify-content: space-between;
@@ -80,7 +80,7 @@
width: 31.6em;
padding: 0 1em;
background-color: #ffffff00;
- color: #129d99;
+ color: var(--primary-color);
font-weight: 700;
}
@@ -91,7 +91,7 @@
}
.finalize-btn {
- // border: 1px solid #F7DD72;
+ // border: 1px solid var(--secondary-color);
background: #f5db71;
}
@@ -129,7 +129,7 @@
.dataset-logo {
width: 6em;
height: 2.6em;
- background: #f7dd72;
+ background: var(--secondary-color);
border-radius: 4px;
font-size: 0.875em;
// color: #212121;
diff --git a/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.scss
index 2ef15d145..d2a67e117 100644
--- a/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.scss
@@ -45,14 +45,14 @@
min-width: 84px;
height: 43px;
background: #ffffff;
- color: #129d99;
- border: 1px solid #129d99;
+ color: var(--primary-color);
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
}
.confirm-btn:hover {
- background-color: #129d99;
+ background-color: var(--primary-color);
color: #ffffff;
}
}
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 9f4c70e5f..5a9122ecf 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
@@ -7,7 +7,7 @@ a {
}
a:hover {
- color: #00b29f;
+ color: var(--primary-color-3);
}
.main-content {
@@ -23,8 +23,8 @@ a:hover {
.editor-header {
height: 64px;
- background: var(--unnamed-color-129d99) 0% 0% no-repeat padding-box;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--unnamed-color-var(--primary-color)) 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #00000029;
padding: 0.6rem;
margin: 30px 0px 0px 0px;
@@ -41,8 +41,8 @@ a:hover {
.dataset-editor-header {
height: 113px;
- background: var(--unnamed-color-129d99) 0% 0% no-repeat padding-box;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--unnamed-color-var(--primary-color)) 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #00000029;
padding: 0.6rem;
margin: 30px 0px 0px 0px;
@@ -135,7 +135,7 @@ a:hover {
justify-content: center;
align-items: center;
font-weight: 700;
- color: #129d99;
+ color: var(--primary-color);
cursor: pointer;
}
@@ -241,7 +241,7 @@ a:hover {
.dataset-tag {
width: 73px;
height: 27px;
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
color: #5d5d5d;
border-radius: 4px;
font-weight: 400;
@@ -286,7 +286,7 @@ a:hover {
}
.next {
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
color: white;
box-shadow: 0px 3px 6px #1e202029;
font-weight: 400;
@@ -294,7 +294,7 @@ a:hover {
}
.dataset-next {
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
color: #212121;
box-shadow: 0px 3px 6px #1e202029;
font-weight: 700;
@@ -322,7 +322,7 @@ a:hover {
.dmp-label {
min-width: 67px;
height: 37px;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
color: white;
border-radius: 4px;
opacity: 1;
@@ -372,7 +372,7 @@ a:hover {
// }
::ng-deep .mat-ink-bar {
- background-color: #00b29f !important;
+ background-color: var(--primary-color-3) !important;
// background-color: #0070c0 !important;
}
@@ -405,7 +405,7 @@ a:hover {
// }
// .more-icon :hover {
-// color: #00b29f;
+// color: var(--primary-color-3);
// }
// ::ng-deep .mat-tab-labels {
@@ -417,5 +417,5 @@ a:hover {
// }
// ::ng-deep .mat-ink-bar {
-// background-color: #00b29f !important;
+// background-color: var(--primary-color-3) !important;
// }
diff --git a/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.scss
index cf8386431..f64cc489e 100644
--- a/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.scss
@@ -3,7 +3,7 @@
display: flex;
width: 100%;
height: 89px;
- background-color: #129D99;
+ background-color: var(--primary-color);
color: #FFFFFF;
font-size: 1.25rem;
}
@@ -33,8 +33,8 @@
}
.start-btn {
- background: #129d99 0% 0% no-repeat padding-box;
- border: 1px solid #129d99;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
min-width: 101px;
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.html b/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.html
index ff171f0fa..264029888 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.html
+++ b/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.html
@@ -19,6 +19,6 @@
-
+
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.scss
index 01fd3d2a2..edbe4157a 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.scss
@@ -38,8 +38,8 @@
}
.start-btn {
- background: #129d99 0% 0% no-repeat padding-box;
- border: 1px solid #129d99;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
min-width: 101px;
@@ -49,7 +49,7 @@
}
.color-green {
- color: #129d99;
+ color: var(--primary-color);
font-weight: 500;
}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.scss
index ff8c96676..9d2f3fdf7 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.scss
@@ -57,7 +57,7 @@
}
.input-btn :hover {
- color: #00b29f !important;
+ color: var(--primary-color-3) !important;
}
.dmp-link {
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.scss
index 4dc2ab551..4d5220f39 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.scss
@@ -56,7 +56,7 @@
}
.input-btn :hover {
- color: #00b29f !important;
+ color: var(--primary-color-3) !important;
}
.not-found {
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 1b3deaba4..7f90f8e5e 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
@@ -45,7 +45,7 @@
.show-more {
background-color: #ffffff00;
- color: #00b29f;
+ color: var(--primary-color-3);
font-weight: 700;
justify-self: center;
}
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 ef7f7b0a9..23ee2c6c1 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
@@ -18,7 +18,7 @@ a {
}
a:hover {
- color: #00b29f;
+ color: var(--primary-color-3);
}
.main-content {
@@ -40,7 +40,7 @@ a:hover {
}
.more-icon :hover {
- color: #00b29f;
+ color: var(--primary-color-3);
}
.export-btn {
@@ -56,8 +56,8 @@ a:hover {
.editor-header {
height: 64px;
- background: var(--unnamed-color-129d99) 0% 0% no-repeat padding-box;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--unnamed-color-var(--primary-color)) 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #00000029;
padding: 0.6rem;
margin: 30px 0px 0px 0px;
@@ -74,8 +74,8 @@ a:hover {
.dataset-editor-header {
height: 113px;
- background: var(--unnamed-color-129d99) 0% 0% no-repeat padding-box;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--unnamed-color-var(--primary-color)) 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #00000029;
padding: 0.6rem;
margin: 30px 0px 0px 0px;
@@ -167,7 +167,7 @@ a:hover {
justify-content: center;
align-items: center;
font-weight: 700;
- color: #129d99;
+ color: var(--primary-color);
}
.dataset-discard-btn {
@@ -278,7 +278,7 @@ a:hover {
width: 100%;
height: 27px;
line-height: 27px;
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
color: #5d5d5d;
border-radius: 4px;
font-weight: 400;
@@ -344,7 +344,7 @@ mat-icon.size-16 {
}
.add-dataset-btn {
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1e202029;
font-weight: 500;
white-space: normal;
@@ -361,7 +361,7 @@ mat-icon.size-16 {
}
.next {
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
color: white;
box-shadow: 0px 3px 6px #1e202029;
font-weight: 400;
@@ -369,7 +369,7 @@ mat-icon.size-16 {
}
.dataset-next {
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
color: #212121;
box-shadow: 0px 3px 6px #1e202029;
font-weight: 700;
@@ -391,8 +391,8 @@ mat-icon.size-16 {
}
// .add-dataset-btn:hover {
-// color: #129d99 !important;
-// border: 1px solid #129d99;
+// color: var(--primary-color) !important;
+// border: 1px solid var(--primary-color);
// }
.dataset-list {
@@ -403,7 +403,7 @@ mat-icon.size-16 {
.dmp-label {
min-width: 67px;
height: 37px;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
color: white;
border-radius: 4px;
opacity: 1;
@@ -462,6 +462,6 @@ mat-icon.size-16 {
// }
::ng-deep .mat-ink-bar {
- background-color: #00b29f !important;
+ background-color: var(--primary-color-3) !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 0491b676f..ef8f400c4 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
@@ -66,7 +66,7 @@
}
.datasets span {
- color: #00b29f;
+ color: var(--primary-color-3);
}
.emptyList {
@@ -75,7 +75,7 @@
}
.save-btn {
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 30px;
opacity: 1;
width: auto;
@@ -92,8 +92,8 @@
min-width: 84px;
height: 43px;
background: #ffffff;
- color: #129d99;
- border: 1px solid #129d99;
+ color: var(--primary-color);
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
}
@@ -103,7 +103,7 @@
}
.submit-btn:not([disabled]):hover {
- background-color: #129d99;
+ background-color: var(--primary-color);
color: #ffffff;
}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.scss b/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.scss
index c1716ad85..5b59efebb 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.scss
@@ -56,12 +56,12 @@
}
.input-btn :hover {
- color: #00b29f !important;
+ color: var(--primary-color-3) !important;
}
.insert {
text-decoration: underline;
- color: #00b29f;
+ color: var(--primary-color-3);
cursor: pointer;
font-size: 1rem;
font-weight: 400;
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 322c63d34..80009775a 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: #00b29f !important;
+ color: var(--primary-color-3) !important;
}
// .icon-btn {
@@ -31,7 +31,7 @@
}
.version-menu mat-icon {
- color: #00b29f;
+ color: var(--primary-color-3);
}
::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 7c7d1acda..f1cb8b38d 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: #00b29f;
+ color: var(--primary-color-3);
}
.add-entity:after {
@@ -16,7 +16,7 @@
height: 2px;
left: 50%;
position: absolute;
- background: #00b29f;
+ background: var(--primary-color-3);
// 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/license-info/license-info.component.scss b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.scss
index 51514d57e..0c50a8d8d 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.scss
@@ -56,7 +56,7 @@
}
.input-btn :hover {
- color: #00b29f !important;
+ color: var(--primary-color-3) !important;
}
}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.scss b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.scss
index 7db4197ca..6b5c69009 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.scss
@@ -62,12 +62,12 @@
}
.input-btn :hover {
- color: #00b29f !important;
+ color: var(--primary-color-3) !important;
}
.insert-manually {
text-decoration: underline;
- color: #00b29f;
+ color: var(--primary-color-3);
cursor: pointer;
font-size: 1rem;
font-weight: 400;
diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss
index 650d75379..6a4ec26e4 100644
--- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss
@@ -95,12 +95,12 @@
.invite-btn {
background: #ffffff 0% 0% no-repeat padding-box;
- border: 1px solid #129d99;
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
min-width: 101px;
height: 43px;
- color: #129d99;
+ color: var(--primary-color);
font-weight: 500;
}
@@ -118,7 +118,7 @@
}
.invite-btn:hover {
- background: #129d99;
+ background: var(--primary-color);
color: #ffffff;
}
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 002c554f8..4fb26c9f2 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
@@ -48,7 +48,7 @@
.filters-title {
width: 93px;
// color: #089dbb;
- color: #23bcba;
+ color: var(--primary-color-2);
background-color: white;
padding: 0px 20px;
margin-top: -10px;
@@ -65,7 +65,7 @@
// }
// ::ng-deep .mat-focused .mat-form-field-label {
-// color: #00b29f !important;
+// color: var(--primary-color-3) !important;
// }
// ::ng-deep.mat-form-field-underline {
@@ -73,7 +73,7 @@
// }
// ::ng-deep.mat-form-field-ripple {
-// background-color: #00b29f !important;
+// background-color: var(--primary-color-3) !important;
// }
// ::ng-deep .mat-checkbox {
@@ -90,7 +90,7 @@
.mat-accent .mat-pseudo-checkbox-indeterminate,
.mat-pseudo-checkbox-checked,
.mat-pseudo-checkbox-indeterminate {
- background-color: #00b29f;
+ background-color: var(--primary-color-3);
}
::ng-deep .mat-ripple-element {
@@ -108,14 +108,14 @@
::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle {
border-color: #777777;
- // border-color: #00b29f;
+ // border-color: var(--primary-color-3);
}
::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle {
color: #777777;
background-color: #777777;
- // color: #00b29f;
- // background-color: #00b29f;
+ // color: var(--primary-color-3);
+ // background-color: var(--primary-color-3);
}
.mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element {
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
index 93b175b8f..473852b36 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
@@ -9,7 +9,7 @@
{{'DMP-LISTING.TEXT-INFO-QUESTION' | translate}} {{'DMP-LISTING.LINK-ZENODO' | translate}} {{'DMP-LISTING.GET-IDEA' | translate}}
{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}
-
+
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
index 2d71d0e3d..1ff157f67 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
@@ -69,7 +69,7 @@
}
.more-icon :hover {
- color: #00b29f;
+ color: var(--primary-color-3);
}
.header-image {
@@ -163,7 +163,7 @@
max-width: 256px;
height: 40px;
cursor: pointer;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1e202029;
border-radius: 30px;
border: none;
@@ -180,7 +180,7 @@
max-width: 256px;
height: 40px;
cursor: pointer;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
border-radius: 30px;
opacity: 1;
border: none;
@@ -211,7 +211,7 @@
.filter-btn button {
color: white;
- background-color: #23bcba;
+ background-color: var(--primary-color-2);
width: 37px;
height: 45px;
}
@@ -223,7 +223,7 @@
}
.search-form mat-icon {
- color: #129d99;
+ color: var(--primary-color);
}
.empty-list {
@@ -242,7 +242,7 @@
.pointer:hover,
.zenodo-link:hover {
- color: #00b29f;
+ color: var(--primary-color-3);
}
::ng-deep .search-form .mat-form-field-wrapper {
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 e77d00b31..9f90fdda3 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: #00b29f;
+ color: var(--primary-color-3);
}
h4 {
@@ -45,7 +45,7 @@ h4 > span {
}
.datasets-counter :hover {
- color: #00b29f !important;
+ color: var(--primary-color-3) !important;
}
.about-item .title {
@@ -149,7 +149,7 @@ input[type="text"] {
}
.dmp-label {
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
opacity: 1;
min-width: 67px;
@@ -161,7 +161,7 @@ input[type="text"] {
.dataset-label {
width: auto;
height: 37px;
- background: #f7dd72 0% 0% no-repeat padding-box;
+ background: var(--secondary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px;
text-align: left;
line-height: 2.8;
@@ -240,7 +240,7 @@ input[type="text"] {
.dataset-card-actions a:hover,
.dmp-card-actions a:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.dmp-dataset-descriptions-title {
@@ -261,7 +261,7 @@ input[type="text"] {
}
.show-more:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.btn-load-more {
diff --git a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss
index b959e43c7..fad4d3f42 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss
@@ -37,12 +37,12 @@ min-width: 101px;
.next-btn {
background: #ffffff 0% 0% no-repeat padding-box;
- border: 1px solid #129d99;
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
min-width: 101px;
height: 43px;
- color: #129d99;
+ color: var(--primary-color);
font-weight: 500;
}
@@ -56,7 +56,7 @@ min-width: 101px;
}
.next-btn:not([disabled]):hover {
- background-color: #129d99;
+ background-color: var(--primary-color);
color: #ffffff;
}
@@ -70,7 +70,7 @@ min-width: 101px;
// }
// .next-btn:hover {
-// background: #129d99;
+// background: var(--primary-color);
// color: #ffffff;
// }
@@ -82,15 +82,15 @@ min-width: 101px;
min-width: 156px;
height: 44px;
color: #ffffff;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1e202029;
border-radius: 30px;
}
.attach-file:hover {
background-color: #ffffff;
- border: 1px solid #129d99;
- color: #129d99;
+ border: 1px solid var(--primary-color);
+ color: var(--primary-color);
}
.drop-file {
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 19f35902f..0c8b8ed77 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
@@ -16,7 +16,7 @@
.mat-mini-fab {
width: 2.5em;
height: 2.5em;
- background-color: #129d99;
+ background-color: var(--primary-color);
color: white;
}
@@ -45,7 +45,7 @@
.dataset-btn {
width: 36.1em;
padding: 0 1.1em;
- background-color: #f7dd72;
+ background-color: var(--secondary-color);
border-radius: 4px;
justify-content: space-between;
color: #212121;
@@ -65,7 +65,7 @@
width: 31.6em;
padding: 0 1em;
background-color: #ffffff00;
- color: #129d99;
+ color: var(--primary-color);
font-weight: 700;
}
@@ -75,8 +75,8 @@
}
.finalize-btn {
- border: 1px solid #129d99;
- color: #129d99;
+ border: 1px solid var(--primary-color);
+ color: var(--primary-color);
}
.grant-title {
@@ -125,7 +125,7 @@
padding: 10px;
min-width: 4.8em;
height: 2.6em;
- background: #129d99;
+ background: var(--primary-color);
border-radius: 4px;
font-size: 0.875em;
color: #ffffff;
@@ -237,7 +237,7 @@
}
.finalize-txt {
- color: #129d99;
+ color: var(--primary-color);
}
.frame-txt,
@@ -305,7 +305,7 @@
}
.add-dataset-btn:hover {
- color: #129d99 !important;
+ color: var(--primary-color) !important;
}
.show-more-btn {
@@ -356,7 +356,7 @@
// }
// .more-icon :hover {
-// color: #00b29f;
+// color: var(--primary-color-3);
// }
// .export-btn {
@@ -453,7 +453,7 @@
// }
// .container-header :hover {
-// color: #00b29f;
+// color: var(--primary-color-3);
// }
// .dataset-card {
@@ -480,13 +480,13 @@
// .show-more {
// background-color: #ffffff00;
-// color: #00b29f;
+// color: var(--primary-color-3);
// font-weight: 700;
// justify-self: center;
// }
// .visit-website {
-// background-color: #00b29f;
+// background-color: var(--primary-color-3);
// color: #ffffff;
// }
@@ -550,7 +550,7 @@
// }
// .datasets-counter :hover {
-// color: #00b29f !important;
+// color: var(--primary-color-3) !important;
// }
// .total-info {
@@ -594,5 +594,5 @@
// }
// .interact-icon :hover {
-// color: #00b29f !important;
+// color: var(--primary-color-3) !important;
// }
diff --git a/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.scss
index fae608bac..aa2563c3e 100644
--- a/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.scss
@@ -63,17 +63,17 @@ min-width: 101px;
.next-btn {
background: #ffffff 0% 0% no-repeat padding-box;
- border: 1px solid #129d99;
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
min-width: 101px;
height: 43px;
- color: #129d99;
+ color: var(--primary-color);
font-weight: 500;
}
.next-btn:hover {
- background-color: #129d99;
+ background-color: var(--primary-color);
color: white;
}
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 d7df7678d..3d03c286e 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: #00b29f !important;
+ color: var(--primary-color-3) !important;
}
.table-card .mat-grid-tile {
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 d59ca2f65..e4fb0d02b 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
@@ -32,7 +32,7 @@
.filters-title {
width: 90px;
// color: #089dbb;
- color: #23bcba;
+ color: var(--primary-color-2);
background-color: white;
padding: 0px 20px;
margin-top: -10px;
@@ -49,7 +49,7 @@
// }
// ::ng-deep .mat-focused .mat-form-field-label {
-// color: #00b29f !important;
+// color: var(--primary-color-3) !important;
// }
// ::ng-deep.mat-form-field-underline {
@@ -57,7 +57,7 @@
// }
// ::ng-deep.mat-form-field-ripple {
-// background-color: #00b29f !important;
+// background-color: var(--primary-color-3) !important;
// }
// ::ng-deep .mat-checkbox {
@@ -74,7 +74,7 @@
.mat-accent .mat-pseudo-checkbox-indeterminate,
.mat-pseudo-checkbox-checked,
.mat-pseudo-checkbox-indeterminate {
- background-color: #00b29f;
+ background-color: var(--primary-color-3);
}
::ng-deep .mat-ripple-element {
@@ -92,14 +92,14 @@
::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle {
border-color: #777777;
- // border-color: #00b29f;
+ // border-color: var(--primary-color-3);
}
::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle {
color: #777777;
background-color: #777777;
- // color: #00b29f;
- // background-color: #00b29f;
+ // color: var(--primary-color-3);
+ // background-color: var(--primary-color-3);
}
.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 26c7bf5b0..99897de43 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
@@ -34,7 +34,7 @@ h4 {
}
.about-item .length {
- color: #00b29f;
+ color: var(--primary-color-3);
// color: #089dbb;
}
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 c1cd0df9a..f42ffd3fb 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
@@ -32,7 +32,7 @@
.filters-title {
width: 93px;
// color: #089dbb;
- color: #23bcba;
+ color: var(--primary-color-2);
background-color: white;
padding: 0px 20px;
margin-top: -10px;
@@ -49,7 +49,7 @@
// }
// ::ng-deep .mat-focused .mat-form-field-label {
-// color: #00b29f !important;
+// color: var(--primary-color-3) !important;
// }
// ::ng-deep.mat-form-field-underline {
@@ -57,7 +57,7 @@
// }
// ::ng-deep.mat-form-field-ripple {
-// background-color: #00b29f !important;
+// background-color: var(--primary-color-3) !important;
// }
// ::ng-deep .mat-checkbox {
@@ -74,7 +74,7 @@
.mat-accent .mat-pseudo-checkbox-indeterminate,
.mat-pseudo-checkbox-checked,
.mat-pseudo-checkbox-indeterminate {
- background-color: #00b29f;
+ background-color: var(--primary-color-3);
}
::ng-deep .mat-ripple-element {
@@ -92,14 +92,14 @@
::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle {
border-color: #777777;
- // border-color: #00b29f;
+ // border-color: var(--primary-color-3);
}
::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle {
color: #777777;
background-color: #777777;
- // color: #00b29f;
- // background-color: #00b29f;
+ // color: var(--primary-color-3);
+ // background-color: var(--primary-color-3);
}
.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 53f7173c0..8e71079de 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,7 @@
}
.about-item .length {
- color: #00b29f;
+ color: var(--primary-color-3);
// color: #089dbb;
}
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 d4e4c18ab..0eebb1bea 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
@@ -46,7 +46,7 @@
.filters-title {
width: 90px;
// color: #089dbb;
- color: #23bcba;
+ color: var(--primary-color-2);
background-color: white;
padding: 0px 20px;
margin-top: -10px;
@@ -63,7 +63,7 @@
// }
// ::ng-deep .mat-focused .mat-form-field-label {
-// color: #00b29f !important;
+// color: var(--primary-color-3) !important;
// }
// ::ng-deep.mat-form-field-underline {
@@ -71,7 +71,7 @@
// }
// ::ng-deep.mat-form-field-ripple {
-// background-color: #00b29f !important;
+// background-color: var(--primary-color-3) !important;
// }
::ng-deep .mat-checkbox {
@@ -88,7 +88,7 @@
.mat-accent .mat-pseudo-checkbox-indeterminate,
.mat-pseudo-checkbox-checked,
.mat-pseudo-checkbox-indeterminate {
- background-color: #00b29f;
+ background-color: var(--primary-color-3);
}
::ng-deep .mat-ripple-element {
@@ -106,14 +106,14 @@
::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle {
border-color: #777777;
- // border-color: #00b29f;
+ // border-color: var(--primary-color-3);
}
::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle {
color: #777777;
background-color: #777777;
- // color: #00b29f;
- // background-color: #00b29f;
+ // color: var(--primary-color-3);
+ // background-color: var(--primary-color-3);
}
.mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element {
diff --git a/dmp-frontend/src/app/ui/language/language-content/language.component.ts b/dmp-frontend/src/app/ui/language/language-content/language.component.ts
index 9eff5109f..e27bf0258 100644
--- a/dmp-frontend/src/app/ui/language/language-content/language.component.ts
+++ b/dmp-frontend/src/app/ui/language/language-content/language.component.ts
@@ -5,8 +5,7 @@ import { LanguageService } from '@app/core/services/language/language.service';
import { UserService } from '@app/core/services/user/user.service';
import { takeUntil } from 'rxjs/operators';
import { BaseComponent } from '@common/base/base.component';
-
-const availableLanguages: any[] = require('../../../../assets/resources/language.json');
+import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
@Component({
selector: 'app-language',
@@ -16,14 +15,18 @@ const availableLanguages: any[] = require('../../../../assets/resources/language
export class LanguageComponent extends BaseComponent implements OnInit {
@Output() languageChange: EventEmitter = new EventEmitter();
- languages = availableLanguages;
+ languages = [];
constructor(
private router: Router,
private authentication: AuthService,
private languageService: LanguageService,
- private userService: UserService
- ) { super(); }
+ private userService: UserService,
+ private configurationService:ConfigurationService
+ ) {
+ super();
+ this.languages = this.configurationService.availableLanguages;
+ }
ngOnInit() {
this.languageChange.emit(this.getCurrentLanguage().value)
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 543dc4cc3..b045dae51 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: #00b29f;
+ color: var(--primary-color-3);
}
.icon {
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-title/form-composite-title.component.scss b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-title/form-composite-title.component.scss
index b6469481f..356217a1e 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-title/form-composite-title.component.scss
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-title/form-composite-title.component.scss
@@ -24,7 +24,7 @@ h6 {
.more {
text-decoration: underline;
- color: #F7DD72;
+ color: var(--secondary-color);
cursor: pointer;
font-size: 1rem;
font-weight: 400;
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.scss b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.scss
index 1f281e606..627591d48 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.scss
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.scss
@@ -38,15 +38,15 @@
min-width: 156px;
height: 44px;
color: #ffffff;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1e202029;
border-radius: 30px;
}
.attach-file-btn:hover {
background-color: #ffffff;
- border: 1px solid #129d99;
- color: #129d99;
+ border: 1px solid var(--primary-color);
+ color: var(--primary-color);
}
.attach-file-btn.mat-button-disabled, .attach-file-btn.mat-button-disabled:hover {
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section-inner/form-section-inner.component.scss b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section-inner/form-section-inner.component.scss
index 8c65d8bdd..7d7f80f08 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section-inner/form-section-inner.component.scss
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section-inner/form-section-inner.component.scss
@@ -9,7 +9,7 @@
.addOneFieldButton {
margin-top: -15px;
margin-left: -11px;
- color: #129d99;
+ color: var(--primary-color);
}
.panel-title,
.panel-desc {
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss
index 606e1a5bb..cb676cf4c 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss
@@ -9,7 +9,7 @@
.addOneFieldButton {
margin-top: -15px;
margin-left: -11px;
- color: #129d99;
+ color: var(--primary-color);
}
.panel-title,
.panel-desc {
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.scss b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.scss
index 57b066d5c..955e5fed6 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.scss
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.scss
@@ -27,5 +27,5 @@
.mat-step-header .mat-step-icon-selected,
.mat-step-header .mat-step-icon-state-done,
.mat-step-header .mat-step-icon-state-edit {
- background-color: #129d99 !important;
+ background-color: var(--primary-color) !important;
}
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.scss b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.scss
index b081e1ae7..3b8872d71 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.scss
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description.component.scss
@@ -43,5 +43,5 @@
// ::ng-deep .mat-step-header .mat-step-icon-selected,
// .mat-step-header .mat-step-icon-state-done,
// .mat-step-header .mat-step-icon-state-edit {
-// background-color: #129d99 !important;
+// background-color: var(--primary-color) !important;
// }
diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss
index 1f78b313e..a7b439673 100644
--- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss
+++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss
@@ -50,7 +50,7 @@ $mat-card-header-size: 40px !default;
}
.check-icon {
- color: #129D99;
+ color: var(--primary-color);
transform: scale(0.7);
}
diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.html b/dmp-frontend/src/app/ui/navbar/navbar.component.html
index d5f969740..0c9b6c9b9 100644
--- a/dmp-frontend/src/app/ui/navbar/navbar.component.html
+++ b/dmp-frontend/src/app/ui/navbar/navbar.component.html
@@ -1,13 +1,13 @@