brand change

dmp-backend/web/pom.xml.rej

@@ -0,0 +1,9 @@
+diff a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml	(rejected hunks)
+@@ -13,6 +13,7 @@
+         <groupId>eu.eudat</groupId>
+         <artifactId>dmp-backend</artifactId>
+         <version>${revision}</version>
++        <relativePath>../pom.xml</relativePath>
+     </parent>
+ 
+     <properties>

dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.html

@@ -205,7 +205,7 @@
 
 								<mat-divider></mat-divider>
 								<button mat-list-item (click)="$event.stopPropagation();" style="font-style: italic;">
-									<img src="/assets/images/editor/icons/argos_entities.svg" class="input_icon" alt="Argos Entities icon">
+									<img src="/assets/images/editor/icons/internal_entities.svg" class="input_icon" alt="Internal Entities icon">
 									Argos Entities
 								</button>
 								<mat-action-list class="ml-4">

dmp-frontend/src/app/ui/auth/login/login.component.html

@@ -1,81 +1,3 @@
-<div class="login-bg d-flex flex-column align-items-center justify-content-center" [ngClass]="{'login-screen': !mergeUsers}">
+<div>
 
 </div>
-
-
-
-
-
-
-<!-- <div class="login-screen login-bg d-flex flex-column align-items-center justify-content-center">
-	<div class="login-logo"></div>
-	<div class="card login-card">
-		<div class="container card-header">
-			<div *ngIf="hasGoogleOauth()" class="row social-btns">
-				<div class="col-auto">
-					<button mat-icon-button id="googleSignInButton" class="login-social-button">
-						<i class="fa fa-google"></i>
-					</button>
-				</div>
-				<div *ngIf="hasLinkedInOauth()" class="col-auto">
-					<button mat-icon-button class="login-social-button">
-						<i class="fa fa-linkedin" (click)="linkedInLogin()"></i>
-					</button>
-				</div>
-				<div *ngIf="hasFacebookOauth()" class="col-auto">
-					<button mat-icon-button (click)="facebookLogin()" class="login-social-button">
-						<i class="fa fa-facebook-square"></i>
-					</button>
-				</div>
-				<div *ngIf="hasTwitterOauth()" class="col-auto">
-					<button mat-icon-button (click)="twitterLogin()" class="login-social-button">
-						<i class="fa fa-twitter"></i>
-					</button>
-				</div>
-			</div>
-			<div class="w-100"></div>
-			<div class="row pt-2 mb-4 accesss-methods"> -->
-<!-- <div class="col justify-content-center"> -->
-<!-- <div *ngIf="hasB2AccessOauth()" class="col-auto logo">
-					<button class="b2access-button" mat-icon-button (click)="b2AccessLogin()" class="login-social-button">
-						<span class="iconmedium"></span> -->
-<!-- <span></span> -->
-<!-- </button>
-				</div>
-				<div *ngIf="hasOrcidOauth()" class="col-auto orcid-logo">
-					<button class="orcid-button" mat-icon-button (click)="orcidLogin()" class="login-social-button">
-						<span class="orcidIconMedium"></span> -->
-<!-- <span></span> -->
-<!-- </button>
-				</div>
-				<div *ngIf="hasOpenAireOauth()" class="col-auto openaire-logo">
-					<button class="openaire-button" mat-icon-button (click)="openaireLogin()" class="login-social-button">
-						<span class="openaireIcon"></span> -->
-<!-- <span></span> -->
-<!-- </button>
-				</div> -->
-<!-- </div> -->
-<!-- </div>
-			<div *ngIf="hasConfigurableProviders()" class="row pt-2 mb-4 accesss-methods">
-				<div *ngFor="let provider of this.configurableProviderService.providers" class="col-auto configurable-logo">
-					<button mat-icon-button class="configurable-button" (click)="configurableLogin(provider)" class="login-social-button">
-						<span class="configurableIcon">{{provider.name}}</span>
-					</button>
-				</div>
-			</div>
-			<div *ngIf="hasZenodoOauth()" class="col-auto zenodo-logo">
-				<button class="zenodo-button" mat-icon-button (click)="zenodoLogin()" class="login-social-button">
-					<span class="zenodoIcon"></span> -->
-<!-- <span></span> -->
-<!-- </button>
-			</div>
-		</div>
-		<div class="card-footer">
-			<h4 class="text-uppercase">
-				<strong>{{ 'HOME.LOGIN.TITLE' | translate }}</strong>
-			</h4>
-			<br />
-			<h5>{{ 'HOME.LOGIN.TEXT' | translate }}</h5>
-		</div>
-	</div>
-</div> -->

dmp-frontend/src/app/ui/auth/login/login.component.scss

@@ -1,401 +0,0 @@
-.login-screen {
-  //   margin-top: 70px;
-  min-height: calc(100vh - 10px);
-}
-
-.login-card {
-  // width: auto;
-  width: 510.92px;
-  height: 517.44px;
-  margin-top: 0;
-}
-
-.card {
-  // box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.14);
-  box-shadow: 0px 1px 3px #00000038;
-  border-radius: 6px;
-  color: rgba(0, 0, 0, 0.87);
-  background: #fff;
-}
-
-.card-raised {
-  box-shadow: 0 10px 30px -12px rgba(0, 0, 0, 0.42), 0 4px 25px 0px rgba(0, 0, 0, 0.12),
-    0 8px 10px -5px rgba(0, 0, 0, 0.2);
-}
-
-.page-title {
-  margin-top: 40px;
-}
-
-.title {
-  text-align: center;
-  font: Bold 38px/82px Roboto;
-  height: 60px;
-  letter-spacing: -0.95px;
-  color: var(--primary-color-2);
-  margin-top: 11px;
-  margin-bottom: 21px;
-}
-
-.line {
-  border-top: 5px solid var(--primary-color-2);
-  width: 116px;
-  margin-bottom: 97px;
-}
-
-.container {
-  height: 100%;
-  position: relative;
-  z-index: 1;
-  padding: 15px 30px;
-}
-
-@-webkit-keyframes card {
-  from {
-    top: -40px;
-  }
-
-  to {
-    top: 0;
-  }
-}
-
-@keyframes card {
-  from {
-    top: -40px;
-  }
-
-  to {
-    top: 0;
-  }
-}
-
-.card {
-  position: relative;
-  padding: 20px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-top: 50px;
-  top: -50px;
-  -webkit-animation-name: card;
-  -moz-animation-name: card;
-  -o-animation-name: card;
-  animation-name: card;
-  -webkit-animation-duration: 600ms;
-  -moz-animation-duration: 600ms;
-  -o-animation-duration: 600ms;
-  animation-duration: 600ms;
-  -webkit-animation-fill-mode: forwards;
-  -moz-animation-fill-mode: forwards;
-  -o-animation-fill-mode: forwards;
-  animation-fill-mode: forwards;
-}
-
-.card-header {
-  position: relative;
-  overflow: hidden;
-  top: -50px;
-  width: 100%;
-  min-height: 200px;
-  padding: 25px;
-  border-radius: 3px;
-  background: #0c7489;
-  //   background: rgb(0, 112, 192);
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.card-header h4 {
-  font-weight: 400;
-  color: #fff;
-  margin-bottom: 25px;
-  margin-top: 5px;
-}
-
-// .social-btns {
-//   height: 6em;
-//   justify-content: center;
-// }
-
-// .social-btns i {
-//   font-size: 2.5em;
-//   padding: 0.8em;
-//   color: #fff;
-// }
-
-// .social-btns .col {
-//   flex-grow: 0;
-// }
-
-// .social-btns i:hover {
-//   background-color: #f5f5f51c;
-//   border-radius: 60%;
-// }
-
-.accesss-methods {
-  height: 5em;
-  justify-content: center;
-}
-
-.accesss-methods .col-auto:hover {
-  background-color: #f5f5f51c;
-  border-radius: 100%;
-}
-
-.accesss-methods .logo {
-  flex-grow: 0;
-  padding-top: 21px;
-  padding-bottom: 21px;
-}
-
-.accesss-methods .openaire-logo {
-  flex-grow: 0;
-  padding-top: 21px;
-  padding-bottom: 21px;
-  margin-top: 5px;
-  height: 90px;
-}
-
-.accesss-methods .orcid-logo {
-  height: 75px;
-  padding-top: 8px;
-  margin-top: 13px;
-}
-
-.accesss-methods .configurable-logo {
-  flex-grow: 0;
-  padding-top: 21px;
-  padding-bottom: 21px;
-  margin-top: 5px;
-  height: 90px;
-}
-
-.accesss-methods .zenodo-logo {
-  height: 75px;
-  padding-top: 8px;
-  margin-top: 13px;
-}
-
-.tip {
-  margin-top: -20px;
-}
-
-.form-row,
-.card-form,
-.mat-form-field {
-  width: 100%;
-}
-
-.card-form {
-  padding: 5px;
-}
-
-.form-row {
-  position: relative;
-  display: flex;
-  align-items: center;
-  margin-top: 13px;
-}
-
-.form-row i {
-  position: relative;
-  top: -5px;
-  margin-right: 15px;
-  color: #555;
-}
-
-.card-footer {
-  padding: 0;
-  border-radius: 0;
-  align-items: start;
-  flex-direction: column;
-}
-
-.card-footer button {
-  color: #e91e63;
-}
-
-.btn span.icon {
-  background: url(img/b2access_small.png) no-repeat;
-  float: left;
-  width: 45px;
-  height: 25px;
-}
-
-span.googleIcon {
-  background: url("../../../../assets/images/argos-login/NoPath\ -\ Copy\ \(2\).png") no-repeat;
-}
-
-span.facebookIcon {
-  background: url("../../../../assets/images/argos-login/NoPath\ -\ Copy\ \(4\).png") no-repeat;
-}
-
-span.twitterIcon {
-  background: url("../../../../assets/images/argos-login/NoPath\ -\ Copy\ \(5\).png") no-repeat;
-}
-
-span.googleIcon,
-span.facebookIcon,
-span.twitterIcon {
-  float: left;
-  transform: scale(0.8);
-  width: 45px;
-  height: 45px;
-}
-
-#googleSignInButton,
-.facebookIconButton,
-.twitterIconButton,
-.openaireIconButton,
-.orcidIconMediumButton,
-.iconmediumButton {
-  width: 60px !important;
-  height: 60px !important;
-}
-
-#googleSignInButton:hover,
-.facebookIconButton:hover,
-.twitterIconButton:hover,
-.openaireIconButton:hover,
-.orcidIconMediumButton:hover,
-.iconmediumButton:hover {
-  //   background-color: var(--primary-color)3b;
-  background-color: #ececec;
-  border-radius: 60%;
-}
-
-span.openaireIcon {
-  background: url("../../../../assets/images/argos-login/NoPath\ -\ Copy\ \(6\).png") no-repeat;
-  background-position: center;
-  float: right;
-  transform: scale(0.8);
-  width: 50px;
-  height: 45px;
-}
-
-span.orcidIconMedium {
-  background: url("../../../../assets/images/argos-login/NoPath\ -\ Copy.png") no-repeat;
-  background-position: center;
-  float: left;
-  transform: scale(0.8);
-  width: 50px;
-  height: 45px;
-}
-
-span.iconmedium {
-  background: url("../../../../assets/images/argos-login/NoPath\ -\ Copy\ \(7\).png") no-repeat;
-  float: left;
-  transform: scale(0.85);
-  width: 67px;
-  height: 40px;
-}
-
-span.configurableIcon {
-  float: right;
-  transform: scale(0.85);
-  width: 50px;
-  height: 50px;
-}
-
-span.zenodoIcon {
-  background: url("../../../../assets/images/argos-login/zenodo-gradient-200.png") no-repeat;
-  background-position: center;
-  float: right;
-  transform: scale(0.7);
-  width: 200px;
-  height: 80px;
-}
-
-.b2access-button {
-  margin-top: 10px;
-  width: fit-content;
-}
-
-.orcid-button {
-  margin-top: 10px;
-  width: fit-content;
-}
-
-.openaire-button {
-  margin-top: 10px;
-  width: fit-content;
-}
-
-.configurable-button {
-  margin-top: 10px;
-  width: fit-content;
-}
-
-.zenodo-button {
-  margin-top: 10px;
-  width: fit-content;
-}
-
-// .login-logo {
-//   background: url(img/open-dmp.png) no-repeat;
-//   width: 273px;
-//   height: 300px;
-//   background-size: cover;
-// }
-
-.laptop-img {
-  background: url("../../../../assets/images/login-bottom-image.png") no-repeat;
-  width: 164px;
-  height: 200px;
-  position: relative;
-  top: -140px;
-  margin-bottom: -140px;
-  left: 243px;
-  border-top: none;
-}
-
-.login-bg {
-  // background: url(img/login_bg.png) no-repeat;
-  background-size: cover;
-}
-
-.login-social-button {
-  width: auto;
-  height: auto;
-}
-
-@media (min-width: 1200px) {
-  .container {
-    width: 100%;
-  }
-}
-
-@media (min-width: 992px) {
-  .container {
-    width: 100%;
-  }
-}
-
-@media (min-width: 768px) {
-  .container {
-    width: 100%;
-  }
-}
-
-@media (min-width: 401px) and (max-width: 560px) {
-  .social-btns i {
-    padding: 0.4em !important;
-  }
-  .accesss-methods {
-    padding-top: 1em;
-  }
-}
-
-@media (min-width: 0px) and (max-width: 400px) {
-  .social-btns i {
-    padding: 0.4em !important;
-  }
-  .card-header {
-    height: 350px !important;
-  }
-  .accesss-methods {
-    padding-top: 1em;
-  }
-}

dmp-frontend/src/app/ui/auth/login/login.component.ts

@@ -18,7 +18,6 @@ export class LoginComponent extends BaseComponent implements OnInit {
 
 	public auth2: any;
 	private returnUrl: string;
-	//public cofigurableProviders: ConfigurableProvider[];
 
 	constructor(
 		private zone: NgZone,

dmp-frontend/src/app/ui/description/overview/description-overview.component.scss

@@ -52,7 +52,7 @@
 }
 
 .id-btn {
-  background: url("../../../../assets/images/NoPath.png") no-repeat center;
+  background: url("../../../../assets/images/orcid.png") no-repeat center;
   width: 1em;
   margin-right: 0.3em;
   align-self: center;

dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss

@@ -36,7 +36,7 @@
 // ********BUTTONS********
 
 .id-btn {
-	background: url("../../../../assets/images/NoPath.png") no-repeat center;
+	background: url("../../../../assets/images/orcid.png") no-repeat center;
 	width: 1em;
 	margin-right: 0.3em;
 	align-self: center;

dmp-frontend/src/app/ui/user-profile/user-profile.component.scss

@@ -263,16 +263,16 @@
 	}
 
 	span.googleIcon {
-		background: url("../../../assets/images/argos-login/NoPath\ -\ Copy\ \(2\).png") no-repeat;
+		background: url("../../../assets/images/login/google.png") no-repeat;
 		margin-left: .2rem;
 	}
 
 	span.facebookIcon {
-		background: url("../../../assets/images/argos-login/NoPath\ -\ Copy\ \(4\).png") no-repeat;
+		background: url("../../../assets/images/login/facebook.png") no-repeat;
 	}
 
 	span.twitterIcon {
-		background: url("../../../assets/images/argos-login/NoPath\ -\ Copy\ \(5\).png") no-repeat;
+		background: url("../../../assets/images/login/twitter.png") no-repeat;
 	}
 
 	span.linkedInIcon {
@@ -290,7 +290,7 @@
 	}
 
 	span.orcidIconMedium {
-		background: url("../../../assets/images/argos-login/NoPath\ -\ Copy.png") no-repeat;
+		background: url("../../../assets/images/login/orcid.png") no-repeat;
 		background-position: center;
 		float: left;
 		transform: scale(0.45);
@@ -299,7 +299,7 @@
 	}
 
 	span.openaireIcon {
-		background: url("../../../assets/images/argos-login/NoPath\ -\ Copy\ \(6\).png") no-repeat;
+		background: url("../../../assets/images/login/openaire.png") no-repeat;
 		background-position: center;
 		float: right;
 		transform: scale(0.4);
@@ -308,7 +308,7 @@
 	}
 
 	span.zenodoIcon {
-		background: url("../../../assets/images/argos-login/zenodo-gradient-sm.png") no-repeat;
+		background: url("../../../assets/images/login/zenodo.png") no-repeat;
 		background-position: center;
 		float: right;
 		transform: scale(0.58);

dmp-frontend/src/styles.scss

@@ -3,11 +3,18 @@
 // Be sure that you only ever include this mixin once!
 @include mat.core();
 
+// :root {
+// 	--primary-color: #129d99;
+// 	--primary-color-2: #23bcba;
+// 	--primary-color-3: #00b29f;
+// 	--secondary-color: #f7dd72;
+// }
+
 :root {
-	--primary-color: #129d99;
-	--primary-color-2: #23bcba;
-	--primary-color-3: #00b29f;
-	--secondary-color: #f7dd72;
+	--primary-color: #18488F;
+	--primary-color-2: #1E59B1;
+	--primary-color-3: #246AD3;
+	--secondary-color: #36900B;
 }
 
 // Define your theme with color palettes, typography and density