From bb02a9efee8f82a6ec525ed080033809a61beac7 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Thu, 7 Apr 2022 18:25:20 +0300
Subject: [PATCH] 1. Remove image from contact. 2. Change tabs in home page
 with uikit

---
 src/app/contact/contact.component.css  |  4 +--
 src/app/contact/contact.component.html |  8 +++---
 src/app/home/home.component.html       | 37 +++++++++++++++-----------
 src/app/openaireLibrary                |  2 +-
 src/assets/openaire-theme              |  2 +-
 5 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/app/contact/contact.component.css b/src/app/contact/contact.component.css
index af7af25..8b13789 100644
--- a/src/app/contact/contact.component.css
+++ b/src/app/contact/contact.component.css
@@ -1,3 +1 @@
-#contact-us {
-  background-image: url("~src/assets/monitor-assets/contact-us.jpg");
-}
+
diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html
index 7c33160..095ded9 100644
--- a/src/app/contact/contact.component.html
+++ b/src/app/contact/contact.component.html
@@ -1,19 +1,19 @@
 <schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other" [description]="description"></schema2jsonld>
-<div id="contact-us" class="uk-background-fixed uk-background-center-right uk-background-norepeat uk-background-contain">
+<div>
   <div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
     <div class="uk-padding-small">
       <breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
     </div>
   </div>
-  <div class="uk-section uk-padding-remove-top uk-container uk-container-large"
+  <div class="uk-section uk-padding-remove-top uk-container uk-container-large uk-flex uk-flex-center"
        uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
     <div class="uk-padding-small uk-width-1-2@l uk-width-2-3@m uk-width-1-1">
       <contact-us [organizationTypes]="organizationTypes" [sending]="sending" [scrollspy]="true"
                   [contactForm]="contactForm" (sendEmitter)="send($event)">
-        <h1 page-title class="uk-margin-auto" uk-scrollspy-class>
+        <h1 page-title class="uk-margin-auto uk-text-center" uk-scrollspy-class>
           Contact us<span class="uk-text-primary">.</span>
         </h1>
-        <div page-description class="uk-text-large uk-width-2-3@s" uk-scrollspy-class>
+        <div page-description class="uk-text-large uk-text-center" uk-scrollspy-class>
           We would be happy to open a discussion with you to better understand your needs and share examples of how
           OpenAIRE MONITOR
           can help your organization in your open science needs.
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index 7669b31..5e5986d 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -221,21 +221,28 @@
       <div *ngIf="loading" class="uk-height-large uk-flex uk-flex-column uk-flex-center">
         <loading></loading>
       </div>
-      <!-- Tabs -->
-      <my-tabs *ngIf="!loading">
-        <my-tab [tabTitle]="'All'" [tabId]="'all'" class="uk-active">
-          <ng-container *ngTemplateOutlet="sliderTemplate; context: {slides: stakeholdersSlider.stakeholders}"></ng-container>
-        </my-tab>
-        <my-tab [tabTitle]="'Funders'" [tabId]="'funders'">
-          <ng-container *ngTemplateOutlet="sliderTemplate; context: {slides: stakeholdersSlider.funders}"></ng-container>
-        </my-tab>
-        <my-tab [tabTitle]="'Research Initiatives'" [tabId]="'ris'">
-          <ng-container *ngTemplateOutlet="sliderTemplate; context: {slides:stakeholdersSlider.ris}"></ng-container>
-        </my-tab>
-        <my-tab [tabTitle]="'Research Institutions'" [tabId]="'organizations'">
-          <ng-container *ngTemplateOutlet="sliderTemplate; context: {slides: stakeholdersSlider.organizations}"></ng-container>
-        </my-tab>
-      </my-tabs>
+      <ng-container *ngIf="!loading">
+        <ul class="uk-tab" uk-tab>
+          <li><a>All</a></li>
+          <li><a>Funders</a></li>
+          <li><a>Research Initiatives</a></li>
+          <li><a>Research Institutions</a></li>
+        </ul>
+        <ul class="uk-switcher">
+          <li>
+            <ng-container *ngTemplateOutlet="sliderTemplate; context: {slides: stakeholdersSlider.stakeholders}"></ng-container>
+          </li>
+          <li>
+            <ng-container *ngTemplateOutlet="sliderTemplate; context: {slides: stakeholdersSlider.funders}"></ng-container>
+          </li>
+          <li>
+            <ng-container *ngTemplateOutlet="sliderTemplate; context: {slides:stakeholdersSlider.ris}"></ng-container>
+          </li>
+          <li>
+            <ng-container *ngTemplateOutlet="sliderTemplate; context: {slides: stakeholdersSlider.organizations}"></ng-container>
+          </li>
+        </ul>
+      </ng-container>
       <!-- Slider Template for Tab Content -->
       <ng-template #sliderTemplate let-slides="slides">
         <div uk-slider class="uk-margin-medium-top">
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 2b8d344..f20fe90 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 2b8d344bc9501a2f76855b47340130ef7983ed0c
+Subproject commit f20fe90aa2482adb14c60ab684627ae3a9ad88b4
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index e95be93..b68ddc2 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit e95be93cca857b74dc256fce2d22d157e51e0af1
+Subproject commit b68ddc2064ed6934d292794829a0a09ff6082eb3