From a289b07497d171637c8c7ca7343aeb00cf20e61e Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 11 Jun 2021 11:07:10 +0100
Subject: [PATCH 1/2] Scroll

---
 src/app/pages/agenda/agenda.page.html |  6 +++---
 src/app/pages/agenda/agenda.page.scss | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index bda24ae27..5935ca6e7 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -213,7 +213,7 @@
               </div>
             </div> -->
 
-            <div  class="ss-timeline hide-scroll timeline-mobile flex-grow-1  d-md-none text-black height-100 overflow-y-auto" >
+            <div  class="ss-timeline hide-scroll timeline-mobile flex-grow-1  d-md-none text-black height-100 width-100 overflow-y-auto" >
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
                 <div *ngIf="CalendarCurrentDay <= events.key">
@@ -254,7 +254,7 @@
               </div>
             </div>
 
-            <div  class="fs-timeline hide-scroll flex-grow-1 d-none d-md-block  d-md-block text-black  pr-20 height-100 mr-md-20 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
+            <div  class="fs-timeline hide-scroll flex-grow-1 d-none d-md-block  d-md-block text-black  pr-20 width-100 height-100 mr-md-20 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
                 <div *ngIf="CalendarCurrentDay <= events.key">
@@ -292,7 +292,7 @@
               </div>
             </div>
 
-            <div  class="sd-timeline hide-scroll flex-grow-1 d-none d-md-block timeline-md text-black pr-20 height-100 overflow-y-auto" >
+            <div  class="sd-timeline hide-scroll flex-grow-1 d-none d-md-block timeline-md text-black pr-20 width-100 height-100 overflow-y-auto" >
               <div *ngFor="let events of TimelinePRList | keyvalue;">
                 
                 <div  *ngIf="CalendarCurrentDay <= events.key">
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 9228e1166..332dd05fc 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -63,11 +63,11 @@ ion-slide{
     padding: 0 !important;
     background: #ecf8ff;
   }
-  .div-title{
+  .div-title {
     padding: 0!important;
     float: left;
   }
-  .title{
+  .title {
     font-size: 25px;
   }
   .div-icon{
@@ -698,4 +698,9 @@ app-approve-event{
   display: flex;
   align-items: center;
   height: 100%;
-}
\ No newline at end of file
+}
+
+
+.fs-timeline {
+  border-right: 2px solid #909090;
+}

From 810e10b65b8e808f2a9137d8e9505d75c33817ed Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 11 Jun 2021 11:26:25 +0100
Subject: [PATCH 2/2] Improve search

---
 src/app/pages/agenda/agenda.page.html | 6 +++---
 src/app/pages/search/search.page.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 5935ca6e7..26c0a87d3 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -171,7 +171,7 @@
 
         <!-- Timeline -->
         <div class="height-100">
-          <div class="timeline-container height-100 d-flex pt-20 pl-20" >
+          <div class="timeline-container height-100 d-flex pt-20 pa-20" >
             
             <!-- <div [ngSwitch]="view" class="ss-timeline timeline-mobile flex-grow-1  d-md-none">
               <mwl-calendar-day-view
@@ -254,7 +254,7 @@
               </div>
             </div>
 
-            <div  class="fs-timeline hide-scroll flex-grow-1 d-none d-md-block  d-md-block text-black  pr-20 width-100 height-100 mr-md-20 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
+            <div  class="fs-timeline hide-scroll flex-grow-1 d-none d-md-block  d-md-block text-black  pr-20 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
                 <div *ngIf="CalendarCurrentDay <= events.key">
@@ -292,7 +292,7 @@
               </div>
             </div>
 
-            <div  class="sd-timeline hide-scroll flex-grow-1 d-none d-md-block timeline-md text-black pr-20 width-100 height-100 overflow-y-auto" >
+            <div  class="sd-timeline hide-scroll flex-grow-1 d-none d-md-block timeline-md text-black pl-20 width-100 height-100 overflow-y-auto" >
               <div *ngFor="let events of TimelinePRList | keyvalue;">
                 
                 <div  *ngIf="CalendarCurrentDay <= events.key">
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index 60377a2b5..0c7a4fb10 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -33,7 +33,7 @@
       <ion-icon class="icon" src="assets/images/icons-profile.svg"></ion-icon>
     </div>
 
-    <div class="btn-modal-dismiss">
+    <div class="btn-modal-dismiss" *ngIf="showSearchInput">
       <button class="btn-no-color" (click)="close()">
         <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
       </button>