[Trunk | Library]: bottom.component.html:

a. [Bug fix] Fix alignment of EC flag and "Openaire" name when not centered (uk-margin --> uk-margin-left)
	b. [Bug fix] Move check to show helptext inside <ng-container> - alignment is broken when no helptext and not centered.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61086 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2021-06-04 07:48:22 +00:00
parent 4ea83f6ce8
commit 1d9b94431d
1 changed files with 51 additions and 50 deletions

View File

@ -34,9 +34,10 @@
<div [class]="'uk-container ' +(centered?'uk-container-small':'uk-container-expand') "> <div [class]="'uk-container ' +(centered?'uk-container-small':'uk-container-expand') ">
<!-- <div class="uk-container uk-container-expand uk-margin-small">--> <!-- <div class="uk-container uk-container-expand uk-margin-small">-->
<div [class]="(centered?'':'uk-grid uk-grid-collapse ') "> <div [class]="(centered?'':'uk-grid uk-grid-collapse ') ">
<div *ngIf="properties.footerGrantText || (divContents && divContents['footer']?.length > 0)" <div id="footer#3"
id="footer#3" [class]="'uk-first-column uk-flex uk-flex-middle ' + [class]="'uk-first-column uk-flex uk-flex-middle ' +
(centered?'uk-grid uk-margin-remove-right':'uk-margin-large-right uk-width-1-3@m')"> (centered?'uk-grid uk-margin-remove-right':'uk-margin-large-right '+(properties.footerGrantText || (divContents && divContents['footer']?.length > 0) ? 'uk-width-1-3@m' : ''))">
<ng-container *ngIf="properties.footerGrantText || (divContents && divContents['footer']?.length > 0)">
<div *ngIf="showOpenaire" <div *ngIf="showOpenaire"
[class]="(centered?'uk-width-1-1 uk-width-1-4@m uk-text-center':'')"> [class]="(centered?'uk-width-1-1 uk-width-1-4@m uk-text-center':'')">
<img [src]="assetsPath + 'common/Logo_Horizontal_'+(darkBackground?'white':'dark')+'_small.png'" <img [src]="assetsPath + 'common/Logo_Horizontal_'+(darkBackground?'white':'dark')+'_small.png'"
@ -44,7 +45,7 @@
data-height="30" class="el-image" alt="OpenAIRE"> data-height="30" class="el-image" alt="OpenAIRE">
</div> </div>
<div *ngIf="showCommision" id="footer#5" <div *ngIf="showCommision" id="footer#5"
[class]="'uk-margin uk-text-left '+(centered?'uk-width-expand':'')"> [class]="'uk-text-left '+(centered?' uk-margin uk-width-expand':' uk-margin-left')">
<!-- [src]="assetsPath + 'common/commission'+(this.darkBackground?'.jpg':'-dark.png')"--> <!-- [src]="assetsPath + 'common/commission'+(this.darkBackground?'.jpg':'-dark.png')"-->
<!-- <div *ngIf="!grantAdvance" class="uk-margin">--> <!-- <div *ngIf="!grantAdvance" class="uk-margin">-->
<!-- <img style="margin-right: 8px; float: left;"--> <!-- <img style="margin-right: 8px; float: left;"-->
@ -87,7 +88,7 @@
</h5> </h5>
</a> </a>
</div>--> </div>-->
</ng-container>
</div> </div>
<div [class]="(!centered?'uk-grid uk-width-expand':'')"> <div [class]="(!centered?'uk-grid uk-width-expand':'')">
<div *ngIf="showMenuItems" [class]="'uk-width-expand@m '+ (darkBackground?'uk-light':'')"> <div *ngIf="showMenuItems" [class]="'uk-width-expand@m '+ (darkBackground?'uk-light':'')">