From 837111d7ce47c1b8c53b00c1912867c99aa61347 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 10 Jun 2021 14:00:44 +0100
Subject: [PATCH] Improve

---
 src/app/pages/agenda/agenda.page.html         | 22 +++++++++----------
 src/app/pages/agenda/agenda.page.scss         |  4 ++--
 .../agenda/view-event/view-event.page.scss    |  3 ---
 .../gabinete-digital.page.scss                |  2 +-
 src/app/pages/login/login.page.ts             |  1 +
 .../agenda/view-event/view-event.page.scss    |  4 ++--
 6 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 0aeb716df..d444daa6d 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -46,12 +46,12 @@
                 </ion-row>
                 <ion-row class="ion-align-items-center">
 
-                  <button *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="right-icons d-md-none btn-no-color">
-                    <ion-icon   src="assets/images/icons-profile-calendar-md.svg">ddddddd</ion-icon>
+                  <button *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="d-md-none btn-no-color">
+                    <ion-icon class="right-icons" src="assets/images/icons-profile-calendar-md.svg"></ion-icon>
                   </button>
                   
                   <button  *ngIf="profile == 'pr' " (click)="changeProfile()" class="btn-no-color">
-                    <ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg">dddddddd</ion-icon>
+                    <ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
                   </button>
 
                   <button class="btn-no-color" (click)="viewEventsToApprove()" *ngIf="loggeduser.Profile == 'MDGPR'">
@@ -109,14 +109,12 @@
               </ng-template>
             </div>
 
-
           </div>
       
           <div class="calendar-border">
             
           </div>
       
-      
           <!-- Calendar currente date -->
           <ion-row class="timeline-header ion-justify-content-between ion-align-items-center currente-date-timelien pb-5">
             <ion-row class="timeline-date align-center">
@@ -164,16 +162,16 @@
         </div>
 
       </div>
-      <div class="timeline-wrapper flex-grow-1" >
-          <!-- Progress bar -->
+      <div class="timeline-wrapper flex-grow-1 height-100" >
+        <!-- Progress bar -->
         <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
           <ion-refresher-content>
           </ion-refresher-content>
         </ion-refresher>
 
         <!-- Timeline -->
-        <div>
-          <div class="timeline-container d-flex py-20 pl-20" >
+        <div class="height-100">
+          <div class="timeline-container height-100 d-flex pt-20 pl-20" >
             
             <!-- <div [ngSwitch]="view" class="ss-timeline timeline-mobile flex-grow-1  d-md-none">
               <mwl-calendar-day-view
@@ -215,7 +213,7 @@
               </div>
             </div> -->
 
-            <div  class="ss-timeline timeline-mobile flex-grow-1  d-md-none text-black " >
+            <div  class="ss-timeline timeline-mobile flex-grow-1  d-md-none text-black height-100 overflow-y-auto" >
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
                 <div >
@@ -256,7 +254,7 @@
               </div>
             </div>
 
-            <div  class="fs-timeline flex-grow-1 d-none d-md-block  d-md-block text-black  pr-20" *ngIf="loggeduser.Profile == 'MDGPR'">
+            <div  class="fs-timeline 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 *ngFor="let events of TimelineMDList | keyvalue;" >
                 
                 <div >
@@ -294,7 +292,7 @@
               </div>
             </div>
 
-            <div  class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pr-20" >
+            <div  class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pr-20 height-100 overflow-y-auto" >
               <div *ngFor="let events of TimelinePRList | keyvalue;">
                 
                 <div >
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 5ed340a03..2630a033a 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -605,8 +605,8 @@ td.monthview-primary-with-event {
 
     .timeline-wrapper{
       width: 100%;
-      overflow: scroll;
-      overflow-x: hidden; 
+      overflow: auto;
+      // overflow-x: hidden; 
     }
   }
 }
diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss
index 61f3a3c9d..583a4ff9d 100644
--- a/src/app/pages/agenda/view-event/view-event.page.scss
+++ b/src/app/pages/agenda/view-event/view-event.page.scss
@@ -15,7 +15,6 @@ ion-menu{
   .main-header{
     font-family: Roboto;
     background-color: #fff;
-    overflow:hidden;
     color:#000;
     transform: translate3d(0, 1px, 0);
     
@@ -28,7 +27,6 @@ ion-menu{
         width: 37px;
         float: left;
         font-size: 35px;
-        overflow: hidden;
       }
       .middle{
           //width: 230px;
@@ -206,7 +204,6 @@ ion-menu{
           width: 37px;
           float: right;
           font-size: 35px;
-          overflow: hidden;
       }
     }
     .buttons{
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index cf740dc3d..d4e0cca6a 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -81,7 +81,7 @@ ion-content{
 
 
 /* NEW CSS */
-.main-content{
+.main-content { 
   width: 100%; /* 400px */
   height: 100%;
   font-family: Roboto;
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index a807cb999..61caa66f5 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -77,6 +77,7 @@ export class LoginPage implements OnInit {
       this.username.trim().length > 0
     );
   }
+  
   validatePassword() {
     return (
       this.password.trim().length > 0
diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss
index a5f496ec9..5202cb708 100644
--- a/src/app/shared/agenda/view-event/view-event.page.scss
+++ b/src/app/shared/agenda/view-event/view-event.page.scss
@@ -32,7 +32,7 @@ ion-menu{
         width: 37px;
         float: left;
         font-size: 35px;
-        overflow: hidden;
+
       }
       .middle{
           padding: 0 0 0 10px !important;
@@ -54,7 +54,7 @@ ion-menu{
         padding: 1px !important;
         top: 0 !important;
         margin: 0 !important;
-        overflow: hidden;
+
       }
       .div-icon .edit{
         font-size: 35px;