MaDgIK
/
monitor
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

Comment old css in monitor-custom.css. Change contact-us base on new mocks.

This commit is contained in:
Konstantinos Triantafyllou 2022-02-11 15:37:21 +02:00
parent 7285aa24d1
commit 839763ae5c
6 changed files with 94 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/app/contact/contact.component.html
View File

@ -1,25 +1,28 @@
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other" [description]="description"></schema2jsonld>
<div class="uk-section">
<div class="uk-align-center">
<div *ngIf="showLoading" class="uk-margin-large">
<div class="uk-animation-fade uk-margin-top uk-width-1-1" role="alert"><span
class="loading-gif uk-align-center"></span></div>
</div>
<div *ngIf="!showLoading" class="uk-container uk-container-large">
<div class="uk-grid-divider uk-grid uk-flex-center" uk-grid>
<div class="uk-width-1-1 uk-width-1-2@m">
<div class="uk-text-center uk-margin-medium-bottom">
<h1 class="uk-h2">Contact us to learn more</h1>
<h6 class="uk-text-muted uk-margin-remove-top">
We’d be happy to provide more information on OpenAIRE Monitor – please fill in your details below to send your questions to our team.
</h6>
</div>
<contact-us [properties]="properties" [errorMessage]="errorMessage" [organizationTypes]="organizationTypes"
[contactForm]="contactForm" (sendEmitter)="send($event)"></contact-us>
</div>
<div class="uk-container uk-container-large uk-section uk-padding-remove-bottom">
<div class="uk-padding-small">
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
</div>
</div>
<div class="uk-section uk-padding-remove-top uk-container uk-container-large">
<div class="uk-padding-small uk-width-1-2@l uk-width-2-3@m uk-width-1-1">
<div class="uk-position-relative">
<contact-us *ngIf="!showLoading" [organizationTypes]="organizationTypes"
[properties]="properties" [errorMessage]="errorMessage"
[contactForm]="contactForm" (sendEmitter)="send($event)">
<h1 page-title class="uk-margin-auto">
Contact us<span class="uk-text-primary">.</span>
</h1>
<div page-description class="uk-text-large uk-width-2-3@s">
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.
</div>
</contact-us>
<div *ngIf="showLoading" class="uk-position-center uk-margin-medium-top">
<loading></loading>
</div>
</div>
</div>
</div>
<modal-alert #AlertModal (alertOutput)="goToHome()">
<div class="uk-text-center">

2
src/app/contact/contact.component.ts
View File

@ -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',

12
src/app/contact/contact.module.ts
View File

@ -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
],

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 02a18d48d07f0aa244c886f8c765c0ec59037217
Subproject commit f8b395dc81b06bb03cae4f8807a8a353f725c0a4

105
src/assets/monitor-custom.css
View File

@ -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;*/
/*}*/

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit 25e2dd30e2b2eb4d274754a1120adb5dbf11e9e0
Subproject commit 8ba04ba5f755b94b9274428b3ce80bb423c40cef