Merge remote-tracking branch 'origin/master' into angular-12

This commit is contained in:
Konstantinos Triantafyllou 2022-09-27 11:46:40 +03:00
commit 242ffaa517
6 changed files with 13 additions and 6 deletions

View File

@ -149,7 +149,8 @@
</ng-template> </ng-template>
<div *ngIf="communityInfo && community && !isPrivate()" > <div *ngIf="communityInfo && community && !isPrivate()" >
<div *ngIf="communityInfo && community" class="generalSearchForm"> <!-- this div will have the customized color or image --> <div *ngIf="communityInfo && community" class="generalSearchForm heroBackground"> <!-- this div will have the
customized color or image -->
<div class="uk-container uk-container-large uk-flex uk-flex-center"> <div class="uk-container uk-container-large uk-flex uk-flex-center">
<div class="uk-width-2-3@m uk-width-1-2@l uk-margin-large-top uk-margin-large-bottom"> <div class="uk-width-2-3@m uk-width-1-2@l uk-margin-large-top uk-margin-large-bottom">
<h1 *ngIf="community.title" class="uk-text-center uk-h2 uk-margin-remove"> <h1 *ngIf="community.title" class="uk-text-center uk-h2 uk-margin-remove">

View File

@ -36,7 +36,7 @@ export class DemoComponent implements OnInit{
this.resultLanding.types = this.result.types = ["Article"]; this.resultLanding.types = this.result.types = ["Article"];
this.resultLanding.accessMode = this.result.accessMode = "Open Access"; this.resultLanding.accessMode = this.result.accessMode = "Open Access";
this.result.description = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." this.result.description = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
this.resultLanding.description = [this.result.description]; this.resultLanding.description = this.result.description;
this.resultLanding.authors = this.result.authors = [{fullName: "Lorem ipsum", orcid: "0000-1111-2222-3333", orcid_pending: null}, {fullName: "Lorem ipsum", orcid: null, orcid_pending: "0000-1111-2222-3333"},{fullName: "Lorem ipsum", orcid: null, orcid_pending: null}]; this.resultLanding.authors = this.result.authors = [{fullName: "Lorem ipsum", orcid: "0000-1111-2222-3333", orcid_pending: null}, {fullName: "Lorem ipsum", orcid: null, orcid_pending: "0000-1111-2222-3333"},{fullName: "Lorem ipsum", orcid: null, orcid_pending: null}];
this.resultLanding.title = this.result.title = "Lorem ipsum dolor sit amet, consectetur adipiscing elit"; this.resultLanding.title = this.result.title = "Lorem ipsum dolor sit amet, consectetur adipiscing elit";
this.resultLanding.fundedByProjects = this.result.projects = [{id: "XYZ", acronym: "Project acronym", title: "Project name", funderShortname: "Funder acronym", funderName: "Funder name", code:" project code"}] this.resultLanding.fundedByProjects = this.result.projects = [{id: "XYZ", acronym: "Project acronym", title: "Project name", funderShortname: "Funder acronym", funderName: "Funder name", code:" project code"}]

View File

@ -12,7 +12,7 @@
</div> </div>
<div [class.uk-hidden]="subscriberInvite.loading"> <div [class.uk-hidden]="subscriberInvite.loading">
<h1 class="uk-text-center uk-h2 uk-margin-medium-bottom"> <h1 class="uk-text-center uk-h2 uk-margin-medium-bottom">
Invite users to subscribe Invite users to join
</h1> </h1>
<div *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" class="uk-margin-medium"> <div *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" class="uk-margin-medium">
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"

View File

@ -6,7 +6,8 @@
@global-primary-gradient: none; @global-primary-gradient: none;
@general-search-form-background: fade(@global-primary-background, 15%); @general-search-form-background: fade(@global-primary-background, 15%);
@hero-background-image: none;
@hero-background-position: top center;
#joinAndInviteBtn { #joinAndInviteBtn {
position: fixed; position: fixed;
right: 0; right: 0;
@ -49,3 +50,8 @@
color: @button-primary-color; color: @button-primary-color;
} }
} }
.heroBackground{
background-image: @hero-background-image;
background-position: @hero-background-position;
}

View File

@ -108,7 +108,7 @@ export let properties: EnvProperties = {
depositSearchPage: "/participate/deposit/search", depositSearchPage: "/participate/deposit/search",
shareInZenodoPage: "/participate/deposit/zenodo", shareInZenodoPage: "/participate/deposit/zenodo",
reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
admins: ["rcd@openaire.eu"], admins: ["feedback@openaire.eu"],
lastIndexUpdate: "2020-05-06", lastIndexUpdate: "2020-05-06",
indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",

View File

@ -108,7 +108,7 @@ export let properties: EnvProperties = {
depositSearchPage: "/participate/deposit/search", depositSearchPage: "/participate/deposit/search",
shareInZenodoPage: "/participate/deposit/zenodo", shareInZenodoPage: "/participate/deposit/zenodo",
reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
admins: ["rcd@openaire.eu"], admins: ["feedback@openaire.eu"],
lastIndexUpdate: "2019-07-24", lastIndexUpdate: "2019-07-24",
indexInfoAPI: "https://services.openaire.eu/openaire/info/", indexInfoAPI: "https://services.openaire.eu/openaire/info/",
altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",