diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a899b60..d7bd235 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -131,8 +131,8 @@ export class AppComponent { route: "/", url: null, title: 'monitor', - logoUrl: this.logoPath + 'main.svg', - logoSmallUrl: this.logoPath + 'small.svg', + logoUrl: this.logoPath + 'main.png', + logoSmallUrl: this.logoPath + 'small.png', position: 'left', badge: true, menuPosition: 'center' diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.html b/src/app/browse-stakeholder/browse-stakeholder.component.html index 1a9dc27..058bc3f 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.html +++ b/src/app/browse-stakeholder/browse-stakeholder.component.html @@ -18,7 +18,7 @@
{{mapType(stakeholder.type)}}
-
+

{{stakeholder.name}}

diff --git a/src/app/home/home.component.css b/src/app/home/home.component.css index a1303fc..52db588 100644 --- a/src/app/home/home.component.css +++ b/src/app/home/home.component.css @@ -1,27 +1,3 @@ .home-background { - background-color: white; -} - -@media only screen and (min-width: 1200px) { - .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; - } + background-color: var(--light-color); } diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 5b54e80..c4c3bf8 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,22 +1,29 @@
-
-
+
-
-

- A new era of monitoring research. -

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

+ A new era of monitoring research. +

+
+
Work together with us to view, understand and visualize
+
research statistics and indicators.
+
+
+ Get Started +
-
- Get Started +
+
+ + +
-
@@ -25,7 +32,7 @@ class="uk-text-primary">.
-
+
ipad
@@ -36,7 +43,7 @@

Get a complete
picture.

-

Track and discover your organization’s research output.
Use the OpenAIRE Research +

Track and discover your organization’s research output.
Use the OpenAIRE Research Graph to get a 360o view of
your publications-data-code.

@@ -46,7 +53,7 @@ Monitor open science
compliance. -

Work with the open science expert community
for open and transparent metrics. +

Work with the open science expert community
for open and transparent metrics. Discover open
science trends for your organization and see how
you fare in EOSC.

@@ -56,7 +63,7 @@ Turn research
results to insights. -

Understand your community. Measure impact,
discover trends, connections and +

Understand your community. Measure impact,
discover trends, connections and collaborations
to improve and optimize your future actions.

@@ -67,7 +74,7 @@ Tap into the OpenAIRE
Research Graph.
-
+
@@ -127,9 +134,7 @@
-
- Global outlook -
+
Global outlook
Monitor is built on the OpenAIRE Research Graph. An interconnected scholarly communication shared data resource from open initiatives around the world, of global interest. @@ -140,9 +145,7 @@
-
- Minimum effort to join -
+
Minimum effort to join
You only share some information with us to include in out backend aggregating and data mining, and we deliver a view of your world. As you see fit. @@ -153,9 +156,7 @@
-
- Transparent methodology -
+
Transparent methodology
We base our service on open science principles. We rely on open data sources, and document our algorithms for every metric and indicator we publish. @@ -166,9 +167,7 @@
-
- Customised to your needs -
+
Customised to your needs
Choose from a variety of pre-defined metrics. Select how to visualize them, and who to share with. Use our advanced tools and expertise add add your own metrics. @@ -215,7 +214,7 @@
  • -
    +
    diff --git a/src/app/learn-how/learn-how.component.html b/src/app/learn-how/learn-how.component.html index d9ec51b..7632ad5 100644 --- a/src/app/learn-how/learn-how.component.html +++ b/src/app/learn-how/learn-how.component.html @@ -21,9 +21,9 @@
    -
    0
    +
    0
    -
    +
    Starting from the OpenAIRE
    RESEARCH GRAPH
    @@ -34,9 +34,9 @@
    -
    1
    +
    1
    -
    +
    Provide us some information
    @@ -47,9 +47,9 @@
    -
    2
    +
    2
    -
    +
    We get the ball rolling
    @@ -60,9 +60,9 @@
    -
    3
    +
    3
    -
    +
    You validate
    @@ -73,9 +73,9 @@
    -
    4
    +
    4
    -
    +
    You set up your portal
    @@ -86,9 +86,9 @@
    -
    5
    +
    5
    -
    +
    You track, monitor, report
    @@ -101,7 +101,7 @@
    Inclusion, transparency, quality, state of the art technology. -

    Simplify research
    tracking & monitoring.

    +

    Simplify research
    tracking & monitoring.

    diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 53a0cd7..4ccabce 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 53a0cd733b074f967aa0b39749273762c6074e59 +Subproject commit 4ccabced6dd8624a0c7cde617891cca4d10e0751 diff --git a/src/assets/common-assets b/src/assets/common-assets index 940072a..9a06b6e 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 940072a39728d0981d1b732468b9b8afa739428e +Subproject commit 9a06b6e012adb3f7c47659237fe775631a20ff11 diff --git a/src/assets/monitor-assets/home/mask.svg b/src/assets/monitor-assets/home/mask.svg index 137b250..a3dd8bf 100644 --- a/src/assets/monitor-assets/home/mask.svg +++ b/src/assets/monitor-assets/home/mask.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/src/assets/monitor-assets/home/monitor.jpg b/src/assets/monitor-assets/home/monitor.jpg index 7afcd2f..84a38a0 100644 Binary files a/src/assets/monitor-assets/home/monitor.jpg 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 47aa446..140b612 100644 --- a/src/assets/monitor-custom.css +++ b/src/assets/monitor-custom.css @@ -10,14 +10,14 @@ --button-secondary-border-color-hover: transparent; /*backgrounds*/ - --primary-background: #2C2C2C; - --primary-background-image:none; - --secondary-background: var(--monitor-color); - --secondary-background-image:none; + --background-primary:var(--monitor-color); + --background-primary-image:none; + --background-secondary: var(--grey-color); + --background-secondary-image:none; /*fonts*/ - --font-primary-color: var(--monitor-color); - --font-gradient-color: linear-gradient(110deg, var(--monitor-light-color) 0%, var(--monitor-dark-color) 100%); + --text-primary-color: var(--monitor-color); + --text-gradient-color: linear-gradient(110deg, var(--monitor-light-color) 0%, var(--monitor-dark-color) 100%); /*slider*/ --slider-dot-background: rgba(var(--monitor-color-rgb), 0.5); @@ -93,4 +93,4 @@ main { /*.monitorApp .uk-grid-divider>:not(.uk-first-column)::before {*/ /* border-left: 1px solid #DEDEDE;*/ -/*}*/ \ No newline at end of file +/*}*/ diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index a6fbd5f..de51fea 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit a6fbd5fdba27493d9b5bd59d92b632f08c7dbb96 +Subproject commit de51fea2dd3c8a64fc3c68ed29a9aa8f71034a54