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 000000000..6b306ae11 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Connect with OpenAIRE _ EOSC.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Customise dataset descriptions.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Customise dataset descriptions.png new file mode 100644 index 000000000..1dae7fb23 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Customise dataset descriptions.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Import and Export DMPs.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Import and Export DMPs.png new file mode 100644 index 000000000..a24890576 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Import and Export DMPs.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Plan and follow your data.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Plan and follow your data.png new file mode 100644 index 000000000..f314ad191 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Plan and follow your data.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Produce DMP outputs.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Produce DMP outputs.png new file mode 100644 index 000000000..936c9b8bc Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Produce DMP outputs.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Re-use datasets _ templates.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Re-use datasets _ templates.png new file mode 100644 index 000000000..33053ccb4 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Re-use datasets _ templates.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Update DMPs.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Update DMPs.png new file mode 100644 index 000000000..0f43d6b69 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Update DMPs.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits Small.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits Small.png new file mode 100644 index 000000000..eaaa0a676 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits Small.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits copy.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits copy.png new file mode 100644 index 000000000..492388a78 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits copy.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits.png new file mode 100644 index 000000000..9ed05f362 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/Who Benefits.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding-m.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding-m.png new file mode 100644 index 000000000..cfa6839fd Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding-m.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding-sm.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding-sm.png new file mode 100644 index 000000000..50775b542 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding-sm.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding.png b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding.png new file mode 100644 index 000000000..f481ab01d Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/1_Main/Png/co-branding.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 72.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 72.svg new file mode 100644 index 000000000..929e527a5 --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 72.svg @@ -0,0 +1 @@ +Asset 72 \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 73.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 73.svg new file mode 100644 index 000000000..2e573455c --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 73.svg @@ -0,0 +1 @@ +Asset 73 \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 74.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 74.svg new file mode 100644 index 000000000..d63ecad48 --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 74.svg @@ -0,0 +1 @@ +Asset 74 \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 75.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 75.svg new file mode 100644 index 000000000..41699f919 --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 75.svg @@ -0,0 +1 @@ +Asset 75 \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 76.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 76.svg new file mode 100644 index 000000000..67710e36f --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 76.svg @@ -0,0 +1 @@ +Asset 76 \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 77.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 77.svg new file mode 100644 index 000000000..15c1b33f3 --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 77.svg @@ -0,0 +1 @@ +Asset 77 \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 78.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 78.svg new file mode 100644 index 000000000..0b4bf1139 --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 78.svg @@ -0,0 +1 @@ +Asset 78 \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 79.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 79.svg new file mode 100644 index 000000000..2d98bd453 --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 79.svg @@ -0,0 +1 @@ +Asset 79 \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 81.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 81.svg new file mode 100644 index 000000000..4ecb72c26 --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/1_Main/Svg/Asset 81.svg @@ -0,0 +1 @@ +Asset 81 \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/assets/img/1.png b/dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Png/1.png similarity index 100% rename from dmp-frontend/src/assets/splash/assets/img/1.png rename to dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Png/1.png diff --git a/dmp-frontend/src/assets/splash/assets/img/2 - Copy.png b/dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Png/2 - Copy.png similarity index 100% rename from dmp-frontend/src/assets/splash/assets/img/2 - Copy.png rename to dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Png/2 - Copy.png diff --git a/dmp-frontend/src/assets/splash/assets/img/2.png b/dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Png/2.png similarity index 100% rename from dmp-frontend/src/assets/splash/assets/img/2.png rename to dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Png/2.png diff --git a/dmp-frontend/src/assets/splash/assets/img/3.png b/dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Png/3.png similarity index 100% rename from dmp-frontend/src/assets/splash/assets/img/3.png rename to dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Png/3.png diff --git a/dmp-frontend/src/assets/splash/assets/img/laptop.png b/dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Png/laptop.png similarity index 100% rename from dmp-frontend/src/assets/splash/assets/img/laptop.png rename to dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Png/laptop.png diff --git a/dmp-frontend/src/assets/splash/assets/img/Asset 10.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 10.svg similarity index 100% rename from dmp-frontend/src/assets/splash/assets/img/Asset 10.svg rename to dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 10.svg diff --git a/dmp-frontend/src/assets/splash/assets/img/Asset 11.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 11.svg similarity index 100% rename from dmp-frontend/src/assets/splash/assets/img/Asset 11.svg rename to dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 11.svg diff --git a/dmp-frontend/src/assets/splash/assets/img/Asset 12.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 12.svg similarity index 100% rename from dmp-frontend/src/assets/splash/assets/img/Asset 12.svg rename to dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 12.svg diff --git a/dmp-frontend/src/assets/splash/assets/img/Asset 13.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 13.svg similarity index 100% rename from dmp-frontend/src/assets/splash/assets/img/Asset 13.svg rename to dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 13.svg diff --git a/dmp-frontend/src/assets/splash/assets/img/Asset 14.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 14.svg similarity index 100% rename from dmp-frontend/src/assets/splash/assets/img/Asset 14.svg rename to dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 14.svg diff --git a/dmp-frontend/src/assets/splash/assets/img/Asset 15.svg b/dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 15.svg similarity index 100% rename from dmp-frontend/src/assets/splash/assets/img/Asset 15.svg rename to dmp-frontend/src/assets/splash/assets/img/1_Main_PreviousVersion/Svg/Asset 15.svg diff --git a/dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Png/Sign In - Copy.png b/dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Png/Sign In - Copy.png new file mode 100644 index 000000000..105178213 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Png/Sign In - Copy.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Png/Sign In.png b/dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Png/Sign In.png new file mode 100644 index 000000000..84df792e1 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Png/Sign In.png differ diff --git a/dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Svg/Sign In.svg b/dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Svg/Sign In.svg new file mode 100644 index 000000000..6a1fd2ad7 --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/2_Sign_in/Svg/Sign In.svg @@ -0,0 +1 @@ +Asset 80 \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/index.html b/dmp-frontend/src/assets/splash/index.html index 9f1b8dd75..ce9a7b8a0 100644 --- a/dmp-frontend/src/assets/splash/index.html +++ b/dmp-frontend/src/assets/splash/index.html @@ -88,7 +88,8 @@
- + +
@@ -128,7 +129,9 @@
-
+ + +
Produce DMP outputs
@@ -142,7 +145,9 @@
- + + +
Update DMPs
@@ -158,7 +163,9 @@
- + + +
Re-use datasets & templates
@@ -172,7 +179,9 @@
- + + +
Import and Export DMPs
@@ -188,7 +197,9 @@
- + + +
Customise dataset descriptions
@@ -202,7 +213,9 @@
- + + +
Connect with OpenAIRE & EOSC
@@ -228,7 +241,8 @@
- + +
@@ -315,7 +329,8 @@
- + +