From 839763ae5c277029c3753cd9e1283ab7350c607d Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 11 Feb 2022 15:37:21 +0200 Subject: [PATCH] Comment old css in monitor-custom.css. Change contact-us base on new mocks. --- src/app/contact/contact.component.html | 39 ++++----- src/app/contact/contact.component.ts | 2 + src/app/contact/contact.module.ts | 12 +-- src/app/openaireLibrary | 2 +- src/assets/monitor-custom.css | 105 +++++++++++++++---------- src/assets/openaire-theme | 2 +- 6 files changed, 94 insertions(+), 68 deletions(-) diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html index 37b94cf..379b248 100644 --- a/src/app/contact/contact.component.html +++ b/src/app/contact/contact.component.html @@ -1,25 +1,28 @@ -
-
-
- -
-
-
-
-
-

Contact us to learn more

-
- We’d be happy to provide more information on OpenAIRE Monitor – please fill in your details below to send your questions to our team. -
-
- -
+
+
+ +
+
+
+
+
+ +

+ 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 7a87db9..382d385 100644 --- a/src/app/contact/contact.component.ts +++ b/src/app/contact/contact.component.ts @@ -12,6 +12,7 @@ import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; import {AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators} from "@angular/forms"; import {Subscriber} from "rxjs"; import {properties} from "../../environments/environment"; +import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; @Component({ selector: 'contact', @@ -28,6 +29,7 @@ export class ContactComponent implements OnInit { public properties: EnvProperties = null; public pageContents = null; public divContents = null; + public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Contact us'}]; public organizationTypes: string[] = [ 'Funding agency', 'University / Research Center', 'Research Infrastructure', 'Government', diff --git a/src/app/contact/contact.module.ts b/src/app/contact/contact.module.ts index 732b402..f68d0e7 100644 --- a/src/app/contact/contact.module.ts +++ b/src/app/contact/contact.module.ts @@ -13,14 +13,16 @@ import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard"; import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {ContactUsModule} from "../openaireLibrary/contact-us/contact-us.module"; +import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module"; +import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; @NgModule({ - imports: [ - ContactRoutingModule, CommonModule, RouterModule, - AlertModalModule, RecaptchaModule, HelperModule, - Schema2jsonldModule, SEOServiceModule, ContactUsModule - ], + imports: [ + ContactRoutingModule, CommonModule, RouterModule, + AlertModalModule, RecaptchaModule, HelperModule, + Schema2jsonldModule, SEOServiceModule, ContactUsModule, BreadcrumbsModule, LoadingModule + ], declarations: [ ContactComponent ], diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 02a18d4..f8b395d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 02a18d48d07f0aa244c886f8c765c0ec59037217 +Subproject commit f8b395dc81b06bb03cae4f8807a8a353f725c0a4 diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css index ba8dcb3..fa97e46 100644 --- a/src/assets/monitor-custom.css +++ b/src/assets/monitor-custom.css @@ -1,64 +1,83 @@ :root { - --portal-main-color: #8DCA26; - --portal-main-contrast: white; - --portal-dark-color: #7cb021; + --monitor-color-darken: #228001; - --openaire-main-color: #313179; + /*buttons*/ + --button-primary-background: transparent; + --button-primary-background-image: linear-gradient(113deg, var(--monitor-color) 0%, var(--monitor-color-darken) 100%); + --button-secondary-background: var(--secondary-color); + --button-secondary-background-image: none; - --explore-portal-color: #D95F2D; - --provide-portal-color: #37C7E9; - --monitor-portal-color: #8DCA26; - --connect-portal-color: #EBB13E; - --develop-portal-color: #DA65AB; + /*backgrounds*/ + --primary-background: #2C2C2C; + --primary-background-image:none; + --secondary-background-image:none; - --explore-portal-lower-tone: #a0462c; - --provide-portal-lower-tone: #3A8FA3; - --monitor-portal-lower-tone: #7cb021; - --connect-portal-lower-tone: #b48536; - --develop-portal-lower-tone: #9f4e7e; + /*fonts*/ + --font-primary-color:var(--monitor-color); + /*--secondary-background: var(--secondary-color);*/ } -.tm-toolbar .uk-subnav-line .custom-monitor-li { - background: var(--portal-main-color); -} +/*:root {*/ +/* --portal-main-color: #9ABB55;*/ +/* --portal-main-contrast: white;*/ +/* --portal-dark-color: #7c9144;*/ -.monitorApp, .searchForm { - background: #F9F9F9 !important; -} +/* --openaire-main-color: #313179;*/ -.monitorApp .login text { - stroke: white; - fill: white; -} +/* --explore-portal-color: #D95F2D;*/ +/* --provide-portal-color: #37C7E9;*/ +/* --monitor-portal-color: #9ABB55;*/ +/* --connect-portal-color: #EBB13E;*/ +/* --develop-portal-color: #DA65AB;*/ -.uk-card { - color: #1a1a1a; +/* --explore-portal-lower-tone: #a0462c;*/ +/* --provide-portal-lower-tone: #3A8FA3;*/ +/* --monitor-portal-lower-tone: #7c9144;*/ +/* --connect-portal-lower-tone: #b48536;*/ +/* --develop-portal-lower-tone: #9f4e7e;*/ +/*}*/ + +/*.tm-toolbar .uk-subnav-line .custom-monitor-li {*/ +/* background: var(--portal-main-color);*/ +/*}*/ + +/*.monitorApp, .searchForm {*/ +/* background: #F9F9F9 !important;*/ +/*}*/ + +/*.monitorApp .login text {*/ +/* stroke: white;*/ +/* fill: white;*/ +/*}*/ + +/*.uk-card {*/ +/* color: #1a1a1a;*/ +/*}*/ + +.custom-main-content { + background-color: #F9F9F9 !important; } main { min-height: calc(100vh - 100px); - line-height: 23px; - font-size: 16px; - color: #1a1a1a; - font-family: "Open Sans", sans-serif; } -.monitorApp .uk-text-small { - font-size: 14px; -} +/*.monitorApp .uk-text-small {*/ +/* font-size: 14px;*/ +/*}*/ -.monitorApp .uk-text-muted { - color: #4D4D4D !important; -} +/*.monitorApp .uk-text-muted {*/ +/* color: #4D4D4D !important;*/ +/*}*/ -.monitorApp .portal-button { - color: white !important; - font-weight: 700; -} +/*.monitorApp .portal-button {*/ +/* color: white !important;*/ +/* font-weight: 700;*/ +/*}*/ -.monitorApp .uk-grid-divider>:not(.uk-first-column)::before { - border-left: 1px solid #DEDEDE; -} +/*.monitorApp .uk-grid-divider>:not(.uk-first-column)::before {*/ +/* border-left: 1px solid #DEDEDE;*/ +/*}*/ diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 25e2dd3..8ba04ba 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 25e2dd30e2b2eb4d274754a1120adb5dbf11e9e0 +Subproject commit 8ba04ba5f755b94b9274428b3ce80bb423c40cef