diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.css b/src/app/browse-stakeholder/browse-stakeholder.component.css index 9ff984b..b488021 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.css +++ b/src/app/browse-stakeholder/browse-stakeholder.component.css @@ -1,11 +1,24 @@ +.uk-card { + --border-color: none; + --type-color: none; + border-bottom: 4px solid var(--border-color); +} + +.uk-card .type { + color: var(--type-color); +} + .funder { - color: var(--funder-color); + --border-color: rgba(60, 159, 148, 0.3); + --type-color: #3C9F94; } .ri { - color: var(--ri-color); + --border-color: rgba(208, 35, 174, 0.3); + --type-color: #D023AE; } .organization { - color: var(--organization-color); + --border-color: rgba(226, 139, 108, 0.3); + --type-color: #E28B6C; } diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.html b/src/app/browse-stakeholder/browse-stakeholder.component.html index 1dc75cf..1a9dc27 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.html +++ b/src/app/browse-stakeholder/browse-stakeholder.component.html @@ -1,23 +1,23 @@ + class="uk-height-1-1 uk-link-reset uk-display-block" [class.uk-disabled]="!hasPermission()"> + class="uk-height-1-1 uk-link-reset uk-display-block" [class.uk-disabled]="!hasPermission()"> -
+
{{stakeholder.visibility.toLowerCase()}}
- +
-
{{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 7953ac7..8fb1971 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.ts +++ b/src/app/browse-stakeholder/browse-stakeholder.component.ts @@ -19,7 +19,7 @@ export class BrowseStakeholderComponent { public directLink: boolean = true; public visibilityIcon: Map = new Map ([ ["PRIVATE", 'incognito'], - ["RESTRICTED", 'group'] + ["RESTRICTED", 'restricted'] ]); private subscriptions: any[] = []; diff --git a/src/app/browse-stakeholder/browse-stakeholder.module.ts b/src/app/browse-stakeholder/browse-stakeholder.module.ts index 75a195d..c7c5c28 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.module.ts +++ b/src/app/browse-stakeholder/browse-stakeholder.module.ts @@ -7,7 +7,7 @@ import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.modu import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {BrowseStakeholderComponent} from "./browse-stakeholder.component"; import {IconsService} from "../openaireLibrary/utils/icons/icons.service"; -import {incognito} from "../openaireLibrary/utils/icons/icons"; +import {incognito, restricted} from "../openaireLibrary/utils/icons/icons"; @NgModule({ imports: [ @@ -25,6 +25,6 @@ import {incognito} from "../openaireLibrary/utils/icons/icons"; }) export class BrowseStakeholderModule { constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([incognito]); + this.iconsService.registerIcons([incognito, restricted]); } } diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html index 412e8f3..8e00e96 100644 --- a/src/app/contact/contact.component.html +++ b/src/app/contact/contact.component.html @@ -1,6 +1,6 @@ -

-
+
+
diff --git a/src/app/home/home.component.css b/src/app/home/home.component.css index 3a0db44..9d9324f 100644 --- a/src/app/home/home.component.css +++ b/src/app/home/home.component.css @@ -1,22 +1,27 @@ .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; +@media only screen and (min-width: 960px) { + .home-background { + position: relative; + background-repeat: no-repeat; + background-position: 80% center; + background-size: contain; + background-image: url("~src/assets/monitor-assets/home/monitor.jpg"); + height: calc(100vh - 1px); + } + + .home-background .mask { + position: absolute; + top: 0; + left: 30%; + bottom: 0; + right: 0; + background-image: url("~src/assets/monitor-assets/home/mask.svg"); + background-repeat: no-repeat; + background-position: 80% center; + background-size: contain; + background-attachment: fixed; + } } diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 34f8822..1b7de2b 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -14,8 +14,8 @@
- +
Benefits @@ -23,12 +23,9 @@ class="uk-text-primary">.
-
+
- ipad-1 -
-
- ipad-2 + ipad
@@ -76,7 +73,7 @@
{{(numberSize.number|number) + numberSize.size}}
-
{{name}}
+
{{name}}
@@ -217,9 +214,7 @@
-
- -
+
diff --git a/src/app/learn-how/learn-how.component.html b/src/app/learn-how/learn-how.component.html index 58a40b7..427099d 100644 --- a/src/app/learn-how/learn-how.component.html +++ b/src/app/learn-how/learn-how.component.html @@ -1,9 +1,11 @@
-
+
+
+

Learn the process.

@@ -19,7 +21,7 @@
-

0

+
0
Starting from the OpenAIRE
RESEARCH GRAPH @@ -32,7 +34,7 @@
-

1

+
1
Provide us some information @@ -45,7 +47,7 @@
-

2

+
2
We get the ball rolling @@ -58,7 +60,7 @@
-

3

+
3
You validate @@ -71,7 +73,7 @@
-

4

+
4
You set up your portal @@ -84,7 +86,7 @@
-

5

+
5
You track, monitor, report @@ -97,7 +99,7 @@
-
+
Inclusion, transparency, quality, state of the art technology.

Simplify research
tracking & monitoring.

diff --git a/src/app/my-stakeholders/my-stakeholders.component.html b/src/app/my-stakeholders/my-stakeholders.component.html index 98c4ece..fce786a 100644 --- a/src/app/my-stakeholders/my-stakeholders.component.html +++ b/src/app/my-stakeholders/my-stakeholders.component.html @@ -15,13 +15,11 @@

You are managing

-
+
-
- -
+
@@ -37,9 +35,7 @@
-
- -
+
@@ -56,13 +52,11 @@

You are member of

-
+
-
- -
+
@@ -78,9 +72,7 @@
-
- -
+
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index f3ff37c..13fee13 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f3ff37c74cf06a703b31927ee9322cc65917dcf0 +Subproject commit 13fee133e4725be6e33872e50f72975bbe35d881 diff --git a/src/assets/monitor-assets/home/ipad-1.png b/src/assets/monitor-assets/home/ipad-1.png deleted file mode 100644 index 8e88050..0000000 Binary files a/src/assets/monitor-assets/home/ipad-1.png and /dev/null differ diff --git a/src/assets/monitor-assets/home/ipad-2.png b/src/assets/monitor-assets/home/ipad.png similarity index 100% rename from src/assets/monitor-assets/home/ipad-2.png rename to src/assets/monitor-assets/home/ipad.png diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css index 881db32..f6eac8d 100644 --- a/src/assets/monitor-custom.css +++ b/src/assets/monitor-custom.css @@ -1,7 +1,7 @@ :root { /*buttons*/ --button-primary-background: transparent; - --button-primary-background-image: linear-gradient(110deg, var(--monitor-light-color) 0%, var(--monitor-dark-color) 100%); + --button-primary-background-image: linear-gradient(110deg, var(--monitor-light-color) 50%, var(--monitor-dark-color) 100%); --button-secondary-background: var(--secondary-color); --button-secondary-background-image: none; @@ -20,9 +20,6 @@ /*Monitor specific*/ --monitor-contrast-color: #FFE7D6; - --funder-color: #3C9F94; - --ri-color: #D023AE; - --organization-color: #E28B6C; } /*:root {*/ @@ -60,9 +57,8 @@ main { .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; + background-position: left 97%; + background-size: contain; } diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index ad9442d..0d78487 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit ad9442d4d2a8eecaaff284f59fc973aaf806517b +Subproject commit 0d784875161cd5e74900a229ab995aabc79221a1