1. Update UIkit to 3.12.2. 2. Add home in mobile menu. 3. Fix overflow: clip if not supported in how-it-works. 4. Add padding in stakeholder logo cards
This commit is contained in:
parent
b83105355a
commit
5c924393ba
|
@ -42,7 +42,7 @@
|
||||||
"rxjs": "^6.5.1",
|
"rxjs": "^6.5.1",
|
||||||
"ts-md5": "^1.2.0",
|
"ts-md5": "^1.2.0",
|
||||||
"tslib": "^2.0.0",
|
"tslib": "^2.0.0",
|
||||||
"uikit": "3.12.0",
|
"uikit": "3.12.2",
|
||||||
"zone.js": "~0.11.4"
|
"zone.js": "~0.11.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
|
@ -319,7 +319,7 @@ import {StakeholderEntities} from "../openaireLibrary/monitor/entities/stakehold
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-position-relative uk-height-medium" style="overflow-x: clip;">
|
<div class="uk-position-relative uk-height-medium" style="overflow-x: hidden; overflow-x: clip;">
|
||||||
<img class="uk-width-large uk-position-absolute" src="assets/monitor-assets/about/hero.svg" loading="lazy"
|
<img class="uk-width-large uk-position-absolute" src="assets/monitor-assets/about/hero.svg" loading="lazy"
|
||||||
style="bottom: -70px; right: -80px;">
|
style="bottom: -70px; right: -80px;">
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -30,8 +30,8 @@ import {ResourcesService} from "./openaireLibrary/monitor/services/resources.ser
|
||||||
<navbar *ngIf="properties && showMenu && header" portal="monitor" [header]="header" [onlyTop]="false"
|
<navbar *ngIf="properties && showMenu && header" portal="monitor" [header]="header" [onlyTop]="false"
|
||||||
[userMenuItems]=userMenuItems [menuItems]=menuItems [user]="user"
|
[userMenuItems]=userMenuItems [menuItems]=menuItems [user]="user"
|
||||||
[showMenu]=showMenu [properties]="properties">
|
[showMenu]=showMenu [properties]="properties">
|
||||||
<div *ngIf="showGetStarted" extra-s class="uk-margin-large-top uk-text-center">
|
<div *ngIf="showGetStarted" extra-s class="uk-margin-large-top uk-margin-left">
|
||||||
<a class="uk-button uk-button-small uk-button-primary uk-text-uppercase" routerLink="/get-started">Get Started</a>
|
<a class="uk-button uk-button-primary uk-text-uppercase" routerLink="/get-started">Get Started</a>
|
||||||
</div>
|
</div>
|
||||||
<a *ngIf="showGetStarted" extra-m class="uk-button uk-button-small uk-button-primary uk-text-uppercase uk-margin-left" routerLink="/get-started">Get Started</a>
|
<a *ngIf="showGetStarted" extra-m class="uk-button uk-button-small uk-button-primary uk-text-uppercase uk-margin-left" routerLink="/get-started">Get Started</a>
|
||||||
</navbar>
|
</navbar>
|
||||||
|
@ -172,6 +172,9 @@ export class AppComponent {
|
||||||
|
|
||||||
public buildMenu() {
|
public buildMenu() {
|
||||||
this.menuItems = [];
|
this.menuItems = [];
|
||||||
|
this.menuItems.push(
|
||||||
|
new MenuItem("home", "Home", "", "/", false, [], null, {}, null, null, "uk-hidden@m")
|
||||||
|
);
|
||||||
this.menuItems.push(
|
this.menuItems.push(
|
||||||
new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS, "", "/browse", false, [], null, {})
|
new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS, "", "/browse", false, [], null, {})
|
||||||
);
|
);
|
||||||
|
|
|
@ -9,11 +9,11 @@
|
||||||
<ng-template #card>
|
<ng-template #card>
|
||||||
<div class="uk-card uk-card-default uk-card-hover uk-card-body" [ngClass]="stakeholder.type" [class.uk-disabled]="!hasPermission()">
|
<div class="uk-card uk-card-default uk-card-hover uk-card-body" [ngClass]="stakeholder.type" [class.uk-disabled]="!hasPermission()">
|
||||||
<div *ngIf="stakeholder.visibility && stakeholder.visibility !== 'PUBLIC'"
|
<div *ngIf="stakeholder.visibility && stakeholder.visibility !== 'PUBLIC'"
|
||||||
class="uk-position-top-right uk-margin-small-top uk-margin-small-right uk-flex uk-flex-column uk-flex-middle">
|
class="uk-position-top-right uk-margin-small-top uk-margin-small-right uk-flex uk-flex-column uk-flex-middle uk-position-z-index">
|
||||||
<icon [name]="visibilityIcon.get(stakeholder.visibility)" ratio="1.2" [flex]="true"></icon>
|
<icon [name]="visibilityIcon.get(stakeholder.visibility)" ratio="1.2" [flex]="true"></icon>
|
||||||
<span class="uk-text-small uk-text-capitalize">{{stakeholder.visibility.toLowerCase()}}</span>
|
<span class="uk-text-small uk-text-capitalize">{{stakeholder.visibility.toLowerCase()}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-card-media-top uk-padding-small uk-padding-remove-vertical uk-flex uk-flex-center uk-flex-middle uk-height-xsmall">
|
<div class="uk-card-media-top uk-padding-large uk-padding-remove-vertical uk-flex uk-flex-center uk-flex-middle uk-height-xsmall">
|
||||||
<img *ngIf="stakeholder.logoUrl; else elseBlock" [src]="stakeholder | logoUrl" [alt]="stakeholder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply">
|
<img *ngIf="stakeholder.logoUrl; else elseBlock" [src]="stakeholder | logoUrl" [alt]="stakeholder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply">
|
||||||
<ng-template #elseBlock>
|
<ng-template #elseBlock>
|
||||||
<img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply">
|
<img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply">
|
||||||
|
|
|
@ -7,6 +7,7 @@ import {properties} from "../../environments/environment"
|
||||||
import {LocalStorageService} from "../openaireLibrary/services/localStorage.service";
|
import {LocalStorageService} from "../openaireLibrary/services/localStorage.service";
|
||||||
import {Subscriber} from "rxjs";
|
import {Subscriber} from "rxjs";
|
||||||
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
|
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
|
||||||
|
import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'browse-stakeholder',
|
selector: 'browse-stakeholder',
|
||||||
|
@ -27,15 +28,23 @@ export class BrowseStakeholderComponent {
|
||||||
constructor(private route: ActivatedRoute,
|
constructor(private route: ActivatedRoute,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private location: Location,
|
private location: Location,
|
||||||
private localStorageService: LocalStorageService) {
|
private localStorageService: LocalStorageService,
|
||||||
|
private layoutService: LayoutService) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public ngOnInit() {
|
public ngOnInit() {
|
||||||
this.properties = properties;
|
this.properties = properties;
|
||||||
this.subscriptions.push(this.localStorageService.get().subscribe(value => {
|
this.subscriptions.push(this.layoutService.isMobile.subscribe(value => {
|
||||||
this.directLink = value;
|
if(value) {
|
||||||
|
this.directLink = true;
|
||||||
|
} else {
|
||||||
|
this.subscriptions.push(this.localStorageService.get().subscribe(value => {
|
||||||
|
this.directLink = value;
|
||||||
|
}));
|
||||||
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
ngOnDestroy() {
|
ngOnDestroy() {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5bcc25fe849d87d8570d7ec7ebe6650642ef1de2
|
Subproject commit 259182b7c4e93079af045335d09d18c836402071
|
|
@ -1 +1 @@
|
||||||
Subproject commit c4e2781acc42f281265a70d6cd75616cdd6fa762
|
Subproject commit f264617e5ab356c4279ee1ef1819db434fec4fba
|
Loading…
Reference in New Issue