From 45ba9517e61bca0e5732a43b2a6b69758dd84cbe Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 23 Feb 2022 12:42:49 +0200 Subject: [PATCH] Update library and openaire-theme. Add rules for secondary button and background. Home: Make Features section responsive --- src/app/app.component.ts | 1 - src/app/home/home.component.css | 2 +- src/app/home/home.component.html | 4 ++-- src/app/home/home.component.ts | 2 -- src/app/openaireLibrary | 2 +- src/assets/monitor-custom.css | 11 ++++++++--- src/assets/openaire-theme | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d8dfee1..e232f0f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -10,7 +10,6 @@ import {properties} from "../environments/environment"; import {BehaviorSubject, Subscriber} from "rxjs"; import {StakeholderService} from "./openaireLibrary/monitor/services/stakeholder.service"; import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component"; -import {QuickContactComponent} from "./openaireLibrary/sharedComponents/quick-contact/quick-contact.component"; import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; import {QuickContactService} from './openaireLibrary/sharedComponents/quick-contact/quick-contact.service'; diff --git a/src/app/home/home.component.css b/src/app/home/home.component.css index 9d9324f..a1303fc 100644 --- a/src/app/home/home.component.css +++ b/src/app/home/home.component.css @@ -2,7 +2,7 @@ background-color: white; } -@media only screen and (min-width: 960px) { +@media only screen and (min-width: 1200px) { .home-background { position: relative; background-repeat: no-repeat; diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 1b7de2b..2c000fe 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -108,7 +108,7 @@
-
+
Features

Open data.
Open
methodologies.

@@ -119,7 +119,7 @@
-
+
{ - console.log(entries); - console.log(this.showQuickContact); entries.forEach(entry => { if(entry.isIntersecting && this.showQuickContact) { this.showQuickContact = false; diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 1a7aee9..31e5658 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 1a7aee9a2f34ce04b5bc97559065ceb8e813a2ac +Subproject commit 31e56588271d0ed3fc64990a35ac007e7aa4b2b3 diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css index f6eac8d..e8a7c83 100644 --- a/src/assets/monitor-custom.css +++ b/src/assets/monitor-custom.css @@ -1,13 +1,18 @@ :root { /*buttons*/ - --button-primary-background: transparent; + --button-primary-background: var(--monitor-color); --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; + --button-secondary-background: var(--light-color); + --button-secondary-color: var(--monitor-color); + --button-secondary-border-color: var(--monitor-color); + --button-secondary-background-hover: var(--secondary-color); + --button-secondary-color-hover: var(--light-color); + --button-secondary-border-color-hover: transparent; /*backgrounds*/ --primary-background: #2C2C2C; --primary-background-image:none; + --secondary-background: var(--monitor-color); --secondary-background-image:none; /*fonts*/ diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 0d78487..0a34bf8 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 0d784875161cd5e74900a229ab995aabc79221a1 +Subproject commit 0a34bf8f62ef7544060acc4e8333ce13ea929d91