MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
sharedComponents/bottom.component.html
View File

@ -34,60 +34,61 @@
<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' : ''))">
<div *ngIf="showOpenaire" <ng-container *ngIf="properties.footerGrantText || (divContents && divContents['footer']?.length > 0)">
[class]="(centered?'uk-width-1-1 uk-width-1-4@m uk-text-center':'')"> <div *ngIf="showOpenaire"
<img [src]="assetsPath + 'common/Logo_Horizontal_'+(darkBackground?'white':'dark')+'_small.png'" [class]="(centered?'uk-width-1-1 uk-width-1-4@m uk-text-center':'')">
data-width="126" <img [src]="assetsPath + 'common/Logo_Horizontal_'+(darkBackground?'white':'dark')+'_small.png'"
data-height="30" class="el-image" alt="OpenAIRE"> data-width="126"
</div> data-height="30" class="el-image" alt="OpenAIRE">
<div *ngIf="showCommision" id="footer#5" </div>
[class]="'uk-margin uk-text-left '+(centered?'uk-width-expand':'')"> <div *ngIf="showCommision" id="footer#5"
<!-- [src]="assetsPath + 'common/commission'+(this.darkBackground?'.jpg':'-dark.png')"--> [class]="'uk-text-left '+(centered?' uk-margin uk-width-expand':' uk-margin-left')">
<!-- <div *ngIf="!grantAdvance" class="uk-margin">--> <!-- [src]="assetsPath + 'common/commission'+(this.darkBackground?'.jpg':'-dark.png')"-->
<!-- <img style="margin-right: 8px; float: left;"--> <!-- <div *ngIf="!grantAdvance" class="uk-margin">-->
<!-- [src]="assetsPath + 'common/commission'+(this.darkBackground?'.jpg':'-dark.png')"--> <!-- <img style="margin-right: 8px; float: left;"-->
<!-- alt="flag black white low" width="50" height="33">--> <!-- [src]="assetsPath + 'common/commission'+(this.darkBackground?'.jpg':'-dark.png')"-->
<!-- <span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml] = "grantConenctText"></span>--> <!-- alt="flag black white low" width="50" height="33">-->
<!-- </div>--> <!-- <span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml] = "grantConenctText"></span>-->
<!-- <div class="uk-margin">--> <!-- </div>-->
<!-- <img style="margin-right: 8px; float: left;" [src]="assetsPath + 'common/commission'+(this.darkBackground?'.jpg':'-dark.png')" alt="flag black white low" width="50" height="33">--> <!-- <div class="uk-margin">-->
<!-- <span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml] = "grantAdvanceText"></span>--> <!-- <img style="margin-right: 8px; float: left;" [src]="assetsPath + 'common/commission'+(this.darkBackground?'.jpg':'-dark.png')" alt="flag black white low" width="50" height="33">-->
<!-- </div>--> <!-- <span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml] = "grantAdvanceText"></span>-->
<div class="uk-flex uk-flex-middle"> <!-- </div>-->
<div> <div class="uk-flex uk-flex-middle">
<img style="margin-right: 8px; float: left;" <div>
[src]="assetsPath + 'common/commission.jpg'" <img style="margin-right: 8px; float: left;"
alt="flag black white low" width="50" height="33"> [src]="assetsPath + 'common/commission.jpg'"
</div> alt="flag black white low" width="50" height="33">
<div class="uk-margin-left"> </div>
<helper *ngIf="divContents && divContents['footer']?.length > 0" <div class="uk-margin-left">
[texts]="divContents['footer']"></helper> <helper *ngIf="divContents && divContents['footer']?.length > 0"
<div *ngIf="properties.footerGrantText" class=""> [texts]="divContents['footer']"></helper>
<span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml]="properties.footerGrantText"></span> <div *ngIf="properties.footerGrantText" class="">
<span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml]="properties.footerGrantText"></span>
</div>
</div> </div>
</div> </div>
<!--img [src]="assetsPath + 'common/commission.jpg'" sizes="(min-width: 50px) 50px" data-width="427" data-height="285" class="el-image" alt="European Commission"-->
</div> </div>
<!--img [src]="assetsPath + 'common/commission.jpg'" sizes="(min-width: 50px) 50px" data-width="427" data-height="285" class="el-image" alt="European Commission"--> <!--<div *ngIf="showSocialButtons" id="footer#6" class="newsletter uk-margin uk-margin-remove-bottom uk-text-left@s uk-text-center uk-panel">
</div>
<!--<div *ngIf="showSocialButtons" id="footer#6" class="newsletter uk-margin uk-margin-remove-bottom uk-text-left@s uk-text-center uk-panel">
<a target="_blank" href="https://www.openaire.eu/newsletter/listing" class="el-link newsletter">
<h6 class="el-title uk-margin">
Newsletter
<span class="el-image uk-icon">
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<circle cx="3.12" cy="16.8" r="1.85"></circle>
<path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,8.2 C1.78,8.18 2.06,8.16 2.35,8.16 C7.57,8.16 11.81,12.37 11.81,17.57 C11.81,17.89 11.79,18.19 11.76,18.5"></path>
<path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,2.52 C1.78,2.51 2.06,2.5 2.35,2.5 C10.72,2.5 17.5,9.24 17.5,17.57 C17.5,17.89 17.49,18.19 17.47,18.5"></path>
</svg>
</span>
</h5>
</a>
</div>-->
<a target="_blank" href="https://www.openaire.eu/newsletter/listing" class="el-link newsletter">
<h6 class="el-title uk-margin">
Newsletter
<span class="el-image uk-icon">
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<circle cx="3.12" cy="16.8" r="1.85"></circle>
<path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,8.2 C1.78,8.18 2.06,8.16 2.35,8.16 C7.57,8.16 11.81,12.37 11.81,17.57 C11.81,17.89 11.79,18.19 11.76,18.5"></path>
<path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,2.52 C1.78,2.51 2.06,2.5 2.35,2.5 C10.72,2.5 17.5,9.24 17.5,17.57 C17.5,17.89 17.49,18.19 17.47,18.5"></path>
</svg>
</span>
</h5>
</a>
</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':'')">