From 2f706866380a200d3fb61fdb69716168ce19eb6a Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Thu, 22 Dec 2022 11:41:04 +0200
Subject: [PATCH] Fix flex align in manage indicators for preview button and
 page heading

---
 src/app/topic/topic.component.html | 64 +++++++++++++++---------------
 src/assets/common-assets           |  2 +-
 src/assets/openaire-theme          |  2 +-
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html
index 8c4a932..3f03f75 100644
--- a/src/app/topic/topic.component.html
+++ b/src/app/topic/topic.component.html
@@ -189,29 +189,29 @@
 <div #pageContent *ngIf="stakeholder && filters" page-content>
   <div header>
     <div *ngIf="stakeholder.topics.length > 0 && stakeholder.topics[topicIndex]">
-      <div class="uk-flex uk-margin-medium-top uk-flex-middle info">
+      <div class="uk-margin-medium-top uk-margin-bottom uk-flex uk-flex-middle info">
         <div class="uk-width-expand">
           <div class="uk-text-background uk-text-bold uk-text-small">Manage Indicators</div>
           <h1 class="uk-h6 uk-margin-remove">{{stakeholder.name}}</h1>
         </div>
-        <div *ngIf="stakeholder.topics.length > 0 && !pageContent.isStickyActive" class="uk-width-auto@l uk-width-1-1">
+        <div *ngIf="stakeholder.topics.length > 0 && !pageContent.isStickyActive" class="uk-width-auto">
           <div class="uk-flex uk-flex-center">
             <button class="uk-button uk-button-primary uk-flex uk-flex-middle">
               <icon name="visibility" [flex]="true"></icon>
               <span class="uk-margin-small-left uk-margin-small-right">Preview</span>
               <icon name="expand_more" [flex]="true"></icon>
             </button>
-            <div #element uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; flip: false">
+            <div #preview uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; flip: false">
               <ul class="uk-nav uk-dropdown-nav">
                 <li><a target="_blank"
                        [routerLink]="'/' + stakeholder.alias + '/' + stakeholder.topics[topicIndex].alias"
                        [queryParams]="{view: 'PUBLIC'}"
-                       (click)="hide(element)">Public view</a>
+                       (click)="hide(preview)">Public view</a>
                 </li>
                 <li><a target="_blank" [routerLink]="'/' + stakeholder.alias + '/' +
               stakeholder.topics[topicIndex].alias"
                        [queryParams]="{view: 'RESTRICTED'}"
-                       (click)="hide(element)">Restricted view</a>
+                       (click)="hide(preview)">Restricted view</a>
                 </li>
                 <!--<li class="disabled"><a class="uk-disabled uk-text-muted"
                                     uk-tooltip="Note: available only in administration dashboard"
@@ -226,6 +226,33 @@
   </div>
   <div actions>
     <div class="uk-grid uk-flex-middle" uk-grid>
+      <div *ngIf="stakeholder.topics.length > 0 && pageContent.isStickyActive" class="uk-width-auto@m uk-margin-small-bottom uk-flex-last@m uk-width-1-1">
+        <div class="uk-flex uk-flex-center">
+          <button class="uk-button uk-button-primary uk-flex uk-flex-middle">
+            <icon name="visibility" [flex]="true"></icon>
+            <span class="uk-margin-small-left uk-margin-small-right">Preview</span>
+            <icon name="expand_more" [flex]="true"></icon>
+          </button>
+          <div #element uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; flip: false">
+            <ul class="uk-nav uk-dropdown-nav">
+              <li><a target="_blank"
+                     [routerLink]="'/' + stakeholder.alias + '/' + stakeholder.topics[topicIndex].alias"
+                     [queryParams]="{view: 'PUBLIC'}"
+                     (click)="hide(element)">Public view</a>
+              </li>
+              <li><a target="_blank" [routerLink]="'/' + stakeholder.alias + '/' +
+              stakeholder.topics[topicIndex].alias"
+                     [queryParams]="{view: 'RESTRICTED'}"
+                     (click)="hide(element)">Restricted view</a>
+              </li>
+              <!--<li class="disabled"><a class="uk-disabled uk-text-muted"
+                                  uk-tooltip="Note: available only in administration dashboard"
+                     (click)="hide(element)">Private view</a>
+              </li>-->
+            </ul>
+          </div>
+        </div>
+      </div>
       <div class="uk-margin-medium-top uk-width-expand">
         <ul *ngIf="stakeholder.topics.length > 0 && stakeholder.topics[topicIndex].categories.length > 0 && stakeholder.topics[topicIndex].categories[categoryIndex]"
             transition-group class="uk-tab" [id]="'subCategories'">
@@ -326,33 +353,6 @@
           </li>
         </ul>
       </div>
-      <div *ngIf="stakeholder.topics.length > 0 && pageContent.isStickyActive" class="uk-width-auto@l uk-width-1-1">
-        <div class="uk-flex uk-flex-center">
-          <button class="uk-button uk-button-primary uk-flex uk-flex-middle">
-            <icon name="visibility" [flex]="true"></icon>
-            <span class="uk-margin-small-left uk-margin-small-right">Preview</span>
-            <icon name="expand_more" [flex]="true"></icon>
-          </button>
-          <div #element uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; flip: false">
-            <ul class="uk-nav uk-dropdown-nav">
-              <li><a target="_blank"
-                     [routerLink]="'/' + stakeholder.alias + '/' + stakeholder.topics[topicIndex].alias"
-                     [queryParams]="{view: 'PUBLIC'}"
-                     (click)="hide(element)">Public view</a>
-              </li>
-              <li><a target="_blank" [routerLink]="'/' + stakeholder.alias + '/' +
-              stakeholder.topics[topicIndex].alias"
-                     [queryParams]="{view: 'RESTRICTED'}"
-                     (click)="hide(element)">Restricted view</a>
-              </li>
-              <!--<li class="disabled"><a class="uk-disabled uk-text-muted"
-                                  uk-tooltip="Note: available only in administration dashboard"
-                     (click)="hide(element)">Private view</a>
-              </li>-->
-            </ul>
-          </div>
-        </div>
-      </div>
     </div>
   </div>
   <div inner>
diff --git a/src/assets/common-assets b/src/assets/common-assets
index d772dbd..b0e59ae 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit d772dbd4b2f2d8af9e26d98eed7417f2fbf15c3a
+Subproject commit b0e59ae244c03ccf06d1512efdef3a77d6cd195c
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index be12d26..5c7af22 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit be12d2637a68e4d17b3a45befe40af2ee8431b6a
+Subproject commit 5c7af220c1de2c87d393e2636cdf18805a97e6a1