diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.css b/src/app/browse-stakeholder/browse-stakeholder.component.css new file mode 100644 index 0000000..9ff984b --- /dev/null +++ b/src/app/browse-stakeholder/browse-stakeholder.component.css @@ -0,0 +1,11 @@ +.funder { + color: var(--funder-color); +} + +.ri { + color: var(--ri-color); +} + +.organization { + color: var(--organization-color); +} diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.html b/src/app/browse-stakeholder/browse-stakeholder.component.html index 2a7d759..1dc75cf 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.html +++ b/src/app/browse-stakeholder/browse-stakeholder.component.html @@ -17,7 +17,7 @@
-
{{mapType(stakeholder.type)}}
+
{{mapType(stakeholder.type)}}

{{stakeholder.name}} diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.ts b/src/app/browse-stakeholder/browse-stakeholder.component.ts index cf46f8c..7953ac7 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.ts +++ b/src/app/browse-stakeholder/browse-stakeholder.component.ts @@ -9,7 +9,8 @@ import {Subscriber} from "rxjs"; @Component({ selector: 'browse-stakeholder', - templateUrl: 'browse-stakeholder.component.html' + templateUrl: 'browse-stakeholder.component.html', + styleUrls: ['browse-stakeholder.component.css'] }) export class BrowseStakeholderComponent { @Input() public stakeholder: StakeholderInfo = null; @@ -47,10 +48,8 @@ export class BrowseStakeholderComponent { mapType(type: string) { if(type === 'ri') { return 'Research Initiative'; - } else if(type === 'community') { - return 'Research Community' } else if(type === 'organization') { - return 'Institution'; + return 'Research Institution'; } else { return type; } diff --git a/src/app/contact/contact.component.css b/src/app/contact/contact.component.css new file mode 100644 index 0000000..af7af25 --- /dev/null +++ b/src/app/contact/contact.component.css @@ -0,0 +1,3 @@ +#contact-us { + background-image: url("~src/assets/monitor-assets/contact-us.jpg"); +} diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html index 379b248..412e8f3 100644 --- a/src/app/contact/contact.component.html +++ b/src/app/contact/contact.component.html @@ -1,25 +1,28 @@ -

-
- +
+
+
+ +
-
-
-
-
- -

- Contact us. -

-
- We would be happy to open a discussion with you to better understand your needs and share examples of how OpenAIRE MONITOR - can help your organization in your open science needs. +
+
+
+ +

+ Contact us. +

+
+ We would be happy to open a discussion with you to better understand your needs and share examples of how + OpenAIRE MONITOR + can help your organization in your open science needs. +
+ +
+
- -
-
diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts index 382d385..958a9d4 100644 --- a/src/app/contact/contact.component.ts +++ b/src/app/contact/contact.component.ts @@ -17,6 +17,7 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo @Component({ selector: 'contact', templateUrl: './contact.component.html', + styleUrls: ['contact.component.css'] }) export class ContactComponent implements OnInit { public url: string = null; diff --git a/src/app/home/home.component.css b/src/app/home/home.component.css index e69de29..3a0db44 100644 --- a/src/app/home/home.component.css +++ b/src/app/home/home.component.css @@ -0,0 +1,22 @@ +.home-background { + position: relative; + background-repeat: no-repeat; + background-position: right top; + background-size: contain; + background-image: url("~src/assets/monitor-assets/home/monitor.jpg"); + background-color: white; + height: calc(100vh - 1px); +} + +.home-background .mask { + position: absolute; + top: 0; + left: 50vw; + bottom: 0; + right: 0; + background-image: url("~src/assets/monitor-assets/home/mask.svg"); + background-repeat: no-repeat; + background-position: right center; + background-size: contain; + background-attachment: fixed; +} diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index cf0382a..28e71e0 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,48 +1,39 @@
-
-
-
-
-

- A new era of
monitoring
research. -

-
-
Work together with us to view, understand and visualize
-
research statistics and indicators.
-
-
- GET STARTED -
-
+
+
+
+

+ A new era of
monitoring
research. +

+
+
Work together with us to view, understand and visualize
+
research statistics and indicators.
+
+
+ Get Started
- -
+ +
Benefits

Simplify open science
tracking & monitoring.

-
-
- img1 +
+
+ ipad-1
-
- img2 -
-
- img3 +
+ ipad-2
-
-
+
+

Get a complete
picture.

@@ -50,8 +41,8 @@ Graph to get a 360o view of
your publications-data-code.

-
-
+
+

Monitor open science
compliance. @@ -60,8 +51,8 @@ Discover open
science trends for your organization and see how
you fare in EOSC.

-
-
+
+

Turn research
results to insights. @@ -83,7 +74,8 @@ [href]="url" target="_blank">
-
{{(numberSize.number|number) + numberSize.size}}
+
{{(numberSize.number|number) + numberSize.size}}
{{name}}
@@ -211,7 +203,8 @@ - + diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 9522058..ceaedb6 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -36,6 +36,8 @@ export class HomeComponent { public loading: boolean = true; public errorCodes: ErrorCodes; public properties: EnvProperties = properties; + /* Section scroll Map */ + public map: Map = new Map([['1st', 'ipad-1'], ['2nd', 'ipad-2'], ['3rd', 'ipad-2']]) public type: string = null; public directLink: boolean = true; public publicationsSize: any = null; diff --git a/src/app/learn-how/learn-how.component.css b/src/app/learn-how/learn-how.component.css index e69de29..3f4532d 100644 --- a/src/app/learn-how/learn-how.component.css +++ b/src/app/learn-how/learn-how.component.css @@ -0,0 +1,4 @@ +.about-background { + background-image: url('~src/assets/monitor-assets/about/dot-pattern.svg'); + background-size: 20%; +} diff --git a/src/app/learn-how/learn-how.component.html b/src/app/learn-how/learn-how.component.html index 2609c52..58a40b7 100644 --- a/src/app/learn-how/learn-how.component.html +++ b/src/app/learn-how/learn-how.component.html @@ -1,6 +1,5 @@ -
+
@@ -13,7 +12,7 @@
- +
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5a69cb2..94519de 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5a69cb210178c77ef078eb3d5e35e527570e722e +Subproject commit 94519de68b284f1ef4014d0eaebf02ea9ba819d6 diff --git a/src/assets/monitor-assets/about/dot-pattern.svg b/src/assets/monitor-assets/about/dot-pattern.svg new file mode 100644 index 0000000..7599475 --- /dev/null +++ b/src/assets/monitor-assets/about/dot-pattern.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/monitor-assets/about/steps.svg b/src/assets/monitor-assets/about/steps.svg new file mode 100644 index 0000000..483a331 --- /dev/null +++ b/src/assets/monitor-assets/about/steps.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/monitor-assets/contact-us.jpg b/src/assets/monitor-assets/contact-us.jpg new file mode 100644 index 0000000..7e971d1 Binary files /dev/null and b/src/assets/monitor-assets/contact-us.jpg differ diff --git a/src/assets/monitor-assets/home/ipad-1.png b/src/assets/monitor-assets/home/ipad-1.png new file mode 100644 index 0000000..8e88050 Binary files /dev/null and b/src/assets/monitor-assets/home/ipad-1.png differ diff --git a/src/assets/monitor-assets/home/ipad-2.png b/src/assets/monitor-assets/home/ipad-2.png new file mode 100644 index 0000000..92a63ed Binary files /dev/null and b/src/assets/monitor-assets/home/ipad-2.png differ diff --git a/src/assets/monitor-assets/home/mask.svg b/src/assets/monitor-assets/home/mask.svg new file mode 100644 index 0000000..137b250 --- /dev/null +++ b/src/assets/monitor-assets/home/mask.svg @@ -0,0 +1 @@ + diff --git a/src/assets/monitor-assets/home/monitor-dark-logo.svg b/src/assets/monitor-assets/home/monitor-dark-logo.svg new file mode 100644 index 0000000..fd041c3 --- /dev/null +++ b/src/assets/monitor-assets/home/monitor-dark-logo.svg @@ -0,0 +1,426 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/monitor-assets/home/monitor.jpg b/src/assets/monitor-assets/home/monitor.jpg new file mode 100644 index 0000000..7afcd2f Binary files /dev/null and b/src/assets/monitor-assets/home/monitor.jpg differ diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css index bb8a1ca..b4af95b 100644 --- a/src/assets/monitor-custom.css +++ b/src/assets/monitor-custom.css @@ -15,8 +15,14 @@ --font-gradient-color: linear-gradient(110deg, var(--monitor-light-color) 0%, var(--monitor-dark-color) 100%); /*slider*/ - --slider-dot-background: var(--monitor-light-color); - --slider-dot-active-background: var(--monitor-dark-color); + --slider-dot-background: rgba(var(--monitor-color-rgb), 0.5); + --slider-dot-active-background: var(--monitor-color); + + /*Monitor specific*/ + --monitor-contrast-color: #FFE7D6; + --funder-color: #3C9F94; + --ri-color: #D023AE; + --organization-color: #E28B6C; } /*:root {*/ @@ -43,9 +49,22 @@ /* background: var(--portal-main-color);*/ /*}*/ -/*.monitorApp, .searchForm {*/ -/* background: #F9F9F9 !important;*/ -/*}*/ +main { + min-height: calc(100vh - 100px); +} + +.monitorApp .searchForm { + background: var(--monitor-contrast-color) !important; +} + +.monitor-dark-logo-background { + background-image: url("~src/assets/monitor-assets/home/monitor-dark-logo.svg"); + background-repeat: no-repeat; + background-position: left bottom; + background-size: auto; + background-attachment: fixed; +} + /*.monitorApp .login text {*/ /* stroke: white;*/ @@ -56,10 +75,6 @@ /* color: #1a1a1a;*/ /*}*/ -main { - min-height: calc(100vh - 100px); -} - /*.monitorApp .uk-text-small {*/ /* font-size: 14px;*/ /*}*/ diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index eb0b04c..ad9442d 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit eb0b04cb96b9ab92387d61cdafae21256a6da762 +Subproject commit ad9442d4d2a8eecaaff284f59fc973aaf806517b