From 56cf5a7552b95200dffdc6c2c34fe0d23f27d8a9 Mon Sep 17 00:00:00 2001
From: apapachristou
Date: Wed, 9 Sep 2020 17:56:20 +0300
Subject: [PATCH] Adds new assets
---
.../guided-tour/guided-tour.component.html | 21 ++++++-----
.../guided-tour/guided-tour.component.scss | 16 ++++-----
.../app/ui/auth/login/login.component.scss | 7 ++--
.../app/ui/dashboard/dashboard.component.html | 3 +-
.../Png/Connect with OpenAIRE _ EOSC.png | Bin 0 -> 55878 bytes
.../Png/Customise dataset descriptions.png | Bin 0 -> 43364 bytes
.../img/1_Main/Png/Import and Export DMPs.png | Bin 0 -> 58419 bytes
.../1_Main/Png/Plan and follow your data.png | Bin 0 -> 404251 bytes
.../img/1_Main/Png/Produce DMP outputs.png | Bin 0 -> 49709 bytes
.../Png/Re-use datasets _ templates.png | Bin 0 -> 49512 bytes
.../assets/img/1_Main/Png/Update DMPs.png | Bin 0 -> 55455 bytes
.../img/1_Main/Png/Who Benefits Small.png | Bin 0 -> 28351 bytes
.../img/1_Main/Png/Who Benefits copy.png | Bin 0 -> 158543 bytes
.../assets/img/1_Main/Png/Who Benefits.png | Bin 0 -> 209790 bytes
.../assets/img/1_Main/Png/co-branding-m.png | Bin 0 -> 467559 bytes
.../assets/img/1_Main/Png/co-branding-sm.png | Bin 0 -> 316885 bytes
.../assets/img/1_Main/Png/co-branding.png | Bin 0 -> 493945 bytes
.../splash/assets/img/1_Main/Svg/Asset 72.svg | 1 +
.../splash/assets/img/1_Main/Svg/Asset 73.svg | 1 +
.../splash/assets/img/1_Main/Svg/Asset 74.svg | 1 +
.../splash/assets/img/1_Main/Svg/Asset 75.svg | 1 +
.../splash/assets/img/1_Main/Svg/Asset 76.svg | 1 +
.../splash/assets/img/1_Main/Svg/Asset 77.svg | 1 +
.../splash/assets/img/1_Main/Svg/Asset 78.svg | 1 +
.../splash/assets/img/1_Main/Svg/Asset 79.svg | 1 +
.../splash/assets/img/1_Main/Svg/Asset 81.svg | 1 +
.../{ => 1_Main_PreviousVersion/Png}/1.png | Bin
.../Png}/2 - Copy.png | Bin
.../{ => 1_Main_PreviousVersion/Png}/2.png | Bin
.../{ => 1_Main_PreviousVersion/Png}/3.png | Bin
.../Png}/laptop.png | Bin
.../Svg}/Asset 10.svg | 0
.../Svg}/Asset 11.svg | 0
.../Svg}/Asset 12.svg | 0
.../Svg}/Asset 13.svg | 0
.../Svg}/Asset 14.svg | 0
.../Svg}/Asset 15.svg | 0
.../img/2_Sign_in/Png/Sign In - Copy.png | Bin 0 -> 27907 bytes
.../assets/img/2_Sign_in/Png/Sign In.png | Bin 0 -> 266712 bytes
.../assets/img/2_Sign_in/Svg/Sign In.svg | 1 +
dmp-frontend/src/assets/splash/index.html | 33 +++++++++++++-----
41 files changed, 60 insertions(+), 30 deletions(-)
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Connect with OpenAIRE _ EOSC.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Customise dataset descriptions.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Import and Export DMPs.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Plan and follow your data.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Produce DMP outputs.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Re-use datasets _ templates.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Update DMPs.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits Small.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits copy.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding-m.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding-sm.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 72.svg
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 73.svg
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 74.svg
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 75.svg
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 76.svg
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 77.svg
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 78.svg
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 79.svg
create mode 100644 dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 81.svg
rename dmp-frontend/src/assets/splash/assets/img/{ => 1_Main_PreviousVersion/Png}/1.png (100%)
rename dmp-frontend/src/assets/splash/assets/img/{ => 1_Main_PreviousVersion/Png}/2 - Copy.png (100%)
rename dmp-frontend/src/assets/splash/assets/img/{ => 1_Main_PreviousVersion/Png}/2.png (100%)
rename dmp-frontend/src/assets/splash/assets/img/{ => 1_Main_PreviousVersion/Png}/3.png (100%)
rename dmp-frontend/src/assets/splash/assets/img/{ => 1_Main_PreviousVersion/Png}/laptop.png (100%)
rename dmp-frontend/src/assets/splash/assets/img/{ => 1_Main_PreviousVersion/Svg}/Asset 10.svg (100%)
rename dmp-frontend/src/assets/splash/assets/img/{ => 1_Main_PreviousVersion/Svg}/Asset 11.svg (100%)
rename dmp-frontend/src/assets/splash/assets/img/{ => 1_Main_PreviousVersion/Svg}/Asset 12.svg (100%)
rename dmp-frontend/src/assets/splash/assets/img/{ => 1_Main_PreviousVersion/Svg}/Asset 13.svg (100%)
rename dmp-frontend/src/assets/splash/assets/img/{ => 1_Main_PreviousVersion/Svg}/Asset 14.svg (100%)
rename dmp-frontend/src/assets/splash/assets/img/{ => 1_Main_PreviousVersion/Svg}/Asset 15.svg (100%)
create mode 100644 dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Png/Sign In - Copy.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Png/Sign In.png
create mode 100644 dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Svg/Sign In.svg
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 3f8e8dc89..4965184ec 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
@@ -1,24 +1,24 @@
-
-
-
+
+
{{currentTourStep.title}}
@@ -36,7 +36,10 @@
-
+
+
+
+
-
\ No newline at end of file
+
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 a39ea2aaf..ae71afc9d 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
@@ -90,12 +90,12 @@ ngx-guided-tour {
// transform: translateX(-50%);
// left: 50%;
/*custom add*/
- transform: scale(2);
- left: 494px;
+ transform: scale(2);
+ left: 494px;
}
/*custom add*/
margin-top: 20px;
- margin-left: 10px;
+ margin-left: 10px;
}
&.tour-bottom-right, &.tour-top-right {
@@ -153,7 +153,7 @@ ngx-guided-tour {
/*custom add*/
font-weight: lighter !important;
font-size: 16px !important;
- padding: 28px 74px 0px 65px;
+ padding: 28px 5px 0px 65px;
overflow: auto;
text-align: left;
color: #212121;
@@ -171,7 +171,7 @@ ngx-guided-tour {
.tour-buttons {
overflow: hidden; // clearfix
- padding: 10px 70px 30px 65px; /*custom add*/
+ padding: 10px 70px 30px 65px; /*custom add*/
button.link-button {
padding-left: 0;
@@ -195,7 +195,7 @@ ngx-guided-tour {
// padding-left: 0;
border-left: 0;
- /*custom add*/
+ /*custom add*/
padding: 0;
float: right;
width: 133px;
@@ -214,7 +214,7 @@ ngx-guided-tour {
// padding-left: 10px;
// padding-right: 10px;
- /*custom add*/
+ /*custom add*/
float: left;
padding: 10px 0px;;
width: 101px;
@@ -234,7 +234,7 @@ ngx-guided-tour {
/*custom add*/
.argos-present-img {
- background: url("../../../assets/splash/assets/img/argos\ present.png") no-repeat;
+ background: url("../../../assets/splash/assets/img/2_Sign_in/Svg/Sign\ In.svg") no-repeat;
min-width: 176px;
height: 220px;
position: relative;
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 410d639e0..11ce873d2 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.scss
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss
@@ -234,7 +234,7 @@ span.facebookIcon {
span.twitterIcon {
background: url("../../../../assets/images/argos-login/NoPath\ -\ Copy\ \(5\).png") no-repeat;
-
+
}
span.googleIcon, span.facebookIcon, span.twitterIcon {
@@ -318,8 +318,9 @@ span.zenodoIcon {
// }
.laptop-img {
- background: url("../../../../assets/splash/assets/img/laptop.png") no-repeat;
- width: 116px;
+// 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;
+ width: 164px;
height: 200px;
position: relative;
top: -140px;
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
index defd64425..d12c5d194 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
@@ -13,7 +13,8 @@
-
+
+
diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Connect with OpenAIRE _ EOSC.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Connect with OpenAIRE _ EOSC.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b306ae1177c1f8d34a0f8aca47d3f12ad3728a2
GIT binary patch
literal 55878
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