Update to latest changes #1

Merged
k.triantafyllou merged 3 commits from develop into master 2023-03-20 21:53:18 +01:00
7 changed files with 30 additions and 18 deletions

View File

@ -94,16 +94,6 @@ export class AppComponent implements OnInit, OnDestroy {
}));
}
@HostListener('window:resize', ['$event'])
onResize(event) {
if (this.layoutService.isSmallScreen && event.target.innerWidth > 640) {
this.layoutService.setSmallScreen(false);
} else if (!this.layoutService.isSmallScreen && event.target.innerWidth <= 640) {
this.layoutService.setSmallScreen(true);
this.layoutService.setOpen(false);
}
}
ngOnInit() {
if (typeof document !== 'undefined' && window) {
this.innerWidth = window.innerWidth;
@ -134,9 +124,7 @@ export class AppComponent implements OnInit, OnDestroy {
this.setSideBar();
}
});
this.layoutService.setSmallScreen((this.innerWidth && this.innerWidth <= 640));
this.layoutService.setOpen(!(this.innerWidth && this.innerWidth <= 640));
this.layoutService.setOpen(true);
this.subscriptions.push(this.data.subscribe(data => {
if (data && data.portal) {
this.setProperties(data.portal);

View File

@ -61,7 +61,7 @@
<ng-template #stakeholderBox let-stakeholder="stakeholder">
<div *ngIf="stakeholder">
<div class="uk-card uk-card-default uk-card-body uk-position-relative">
<div class="uk-card uk-card-default uk-card-body uk-position-relative" [ngClass]="stakeholder.type">
<div class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
<a class="uk-link-reset uk-flex uk-flex-middle">
<icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(stakeholder.visibility)" ratio="0.6"></icon>

View File

@ -0,0 +1,23 @@
@import (reference) "~src/assets/openaire-theme/less/color.less";
.setType(@color) {
border-bottom: 4px solid fade(@color, 30%);
& .type {
color: @color;
}
}
.uk-card {
&.funder {
.setType(@funder-color);
}
&.ri {
.setType(@ri-color);
}
&.organization {
.setType(@organization-color);
}
}

View File

@ -20,7 +20,8 @@ declare var UIkit;
@Component({
selector: 'home',
templateUrl: "./manageStakeholders.component.html"
templateUrl: "./manageStakeholders.component.html",
styleUrls: ["./manageStakeholders.component.less"]
})
export class ManageStakeholdersComponent implements OnInit, OnDestroy {

@ -1 +1 @@
Subproject commit 886b50a52c93163113ed6583faf8b054d9390731
Subproject commit 4c19e65edb3db3b546eda029ea90a58298a1f0ad

@ -1 +1 @@
Subproject commit 071385b36c9b9c65d6d081d6468aeea2bf01ffbf
Subproject commit 95c2b50a57696a80dd3dd376880f26cb21d65817

@ -1 +1 @@
Subproject commit ee657bbddcf3b56c00d93f38e91290900cb616bc
Subproject commit c4e2781acc42f281265a70d6cd75616cdd6fa762