From 1d9b94431ddfe4736f31805ec7c6509f96ea6d8b Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Fri, 4 Jun 2021 07:48:22 +0000
Subject: [PATCH] [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
---
 sharedComponents/bottom.component.html | 101 +++++++++++++------------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/sharedComponents/bottom.component.html b/sharedComponents/bottom.component.html
index 7158c2dc..aae3f3c1 100644
--- a/sharedComponents/bottom.component.html
+++ b/sharedComponents/bottom.component.html
@@ -34,60 +34,61 @@
     <div [class]="'uk-container  ' +(centered?'uk-container-small':'uk-container-expand') ">
       <!--      <div class="uk-container uk-container-expand uk-margin-small">-->
       <div [class]="(centered?'':'uk-grid uk-grid-collapse ') ">
-        <div *ngIf="properties.footerGrantText || (divContents && divContents['footer']?.length > 0)"
-              id="footer#3" [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')">
-          <div *ngIf="showOpenaire"
-               [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'"
-                 data-width="126"
-                 data-height="30" class="el-image" alt="OpenAIRE">
-          </div>
-          <div *ngIf="showCommision" id="footer#5"
-               [class]="'uk-margin uk-text-left '+(centered?'uk-width-expand':'')">
-            <!--                 [src]="assetsPath +  'common/commission'+(this.darkBackground?'.jpg':'-dark.png')"-->
-            <!--                 <div *ngIf="!grantAdvance" class="uk-margin">-->
-            <!--                   <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">-->
-            <!--                   <span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml] = "grantConenctText"></span>-->
-            <!--                 </div>-->
-            <!--                 <div class="uk-margin">-->
-            <!--                  <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">-->
-            <!--                  <span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml] = "grantAdvanceText"></span>-->
-            <!--                </div>-->
-            <div class="uk-flex uk-flex-middle">
-              <div>
-                <img style="margin-right: 8px; float: left;"
-                     [src]="assetsPath + 'common/commission.jpg'"
-                     alt="flag black white low" width="50" height="33">
-              </div>
-              <div class="uk-margin-left">
-                <helper *ngIf="divContents && divContents['footer']?.length > 0"
-                        [texts]="divContents['footer']"></helper>
-                <div *ngIf="properties.footerGrantText" class="">
-                  <span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml]="properties.footerGrantText"></span>
+        <div id="footer#3"
+             [class]="'uk-first-column uk-flex uk-flex-middle ' +
+                (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"
+                 [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'"
+                   data-width="126"
+                   data-height="30" class="el-image" alt="OpenAIRE">
+            </div>
+            <div *ngIf="showCommision" id="footer#5"
+                 [class]="'uk-text-left '+(centered?' uk-margin uk-width-expand':' uk-margin-left')">
+              <!--                 [src]="assetsPath +  'common/commission'+(this.darkBackground?'.jpg':'-dark.png')"-->
+              <!--                 <div *ngIf="!grantAdvance" class="uk-margin">-->
+              <!--                   <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">-->
+              <!--                   <span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml] = "grantConenctText"></span>-->
+              <!--                 </div>-->
+              <!--                 <div class="uk-margin">-->
+              <!--                  <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">-->
+              <!--                  <span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml] = "grantAdvanceText"></span>-->
+              <!--                </div>-->
+              <div class="uk-flex uk-flex-middle">
+                <div>
+                  <img style="margin-right: 8px; float: left;"
+                       [src]="assetsPath + 'common/commission.jpg'"
+                       alt="flag black white low" width="50" height="33">
+                </div>
+                <div class="uk-margin-left">
+                  <helper *ngIf="divContents && divContents['footer']?.length > 0"
+                          [texts]="divContents['footer']"></helper>
+                  <div *ngIf="properties.footerGrantText" class="">
+                    <span style="font-size: 8pt; line-height: 0.7!important;" [innerHtml]="properties.footerGrantText"></span>
+                  </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>
-            <!--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 *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>-->
+            <!--<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>-->
+          </ng-container>
         </div>
         <div [class]="(!centered?'uk-grid uk-width-expand':'')">
           <div *ngIf="showMenuItems" [class]="'uk-width-expand@m '+ (darkBackground?'uk-light':'')">