diff --git a/src/app/modals/document-detail/document-detail.page.scss b/src/app/modals/document-detail/document-detail.page.scss
index 6372feb82..70ac70190 100644
--- a/src/app/modals/document-detail/document-detail.page.scss
+++ b/src/app/modals/document-detail/document-detail.page.scss
@@ -102,7 +102,7 @@ ion-button{
       background: #ffb703;
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/modals/view-event/view-event.page.scss b/src/app/modals/view-event/view-event.page.scss
index 495418689..66362ad3e 100644
--- a/src/app/modals/view-event/view-event.page.scss
+++ b/src/app/modals/view-event/view-event.page.scss
@@ -297,5 +297,5 @@ ion-menu{
     background: var(--label-bg-color);
     float: right;
     padding: 5px 13.5px 5px 13.5px;
-    color: #fff;
+    color: black;
   }
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 104fcbefa..3717b449d 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -14,11 +14,11 @@
         <!-- Toolbar -->
         <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
 
-        <div [class]="weeksToShow" > 
+        <div  class="weeksToShow"> 
           <!--  Calendar is here -->
 
           <div class="calendar-segment-{{profile}}" [class.calendar-segment-pr-force]="SessionStore.user.Profile =='PR'">
-            <div class="calendar-container"  [class]="calendarHeight">
+            <div class="calendar-container" class="calendarHeight" >
 
               <ion-row class="ion-justify-content-between calendar-tool-tip">
                 <ion-row class="ion-align-items-center first-row">
@@ -139,25 +139,28 @@
                 </thead>
               </table>
 
-              <calendar
-                class="calendar-component"
-                [eventSource]="listToPresent"
-                [calendarMode]="calendar.mode"
-                [currentDate]="calendar.currentDate"
-                (onEventSelected)="onEventSelected($event)"
-                (onTitleChanged)="onViewTitleChanged($event)"
-                (onRangeChanged)="onRangeChanged($event)"
-                (onCurrentDateChanged)="onCurrentChanged($event)"
-                queryMode="remote"
-                startHour="6"
-                endHour="20"
-                step="30"
-                startingDayMonth="1"
-                noEventsLabel="Sem Eventos"
-                allDayLabel="Todo o dia"
-                [monthviewDisplayEventTemplate]="template"
-              >
-              </calendar>
+              <div class="calendar-conteiner-height overflow-hidden" [style.height]="height">
+                <calendar
+                    class="calendar-component"
+                    [eventSource]="listToPresent"
+                    [calendarMode]="calendar.mode"
+                    [currentDate]="calendar.currentDate"
+                    (onEventSelected)="onEventSelected($event)"
+                    (onTitleChanged)="onViewTitleChanged($event)"
+                    (onRangeChanged)="onRangeChanged($event)"
+                    (onCurrentDateChanged)="onCurrentChanged($event)"
+                    queryMode="remote"
+                    startHour="6"
+                    endHour="20"
+                    step="30"
+                    startingDayMonth="1"
+                    noEventsLabel="Sem Eventos"
+                    allDayLabel="Todo o dia"
+                    [monthviewDisplayEventTemplate]="template"
+                  >
+                  </calendar>
+              </div>
+
 
               <!-- Adding a customized ng-template -->
               <ng-template #template let-view="view" let-row="row" let-col="col">
@@ -182,12 +185,12 @@
           <div class="calendar-title-container px-20 d-flex">
 
             <ion-row class="timeline-date align-center pr-10">
-              <button class="no-color"  *ngIf="showCalendar" (click)="calendarHeight=['height-75'];showCalendar=false">
+              <button class="no-color"  *ngIf="showCalendar" (click)="height='0px';showCalendar=false">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps  font-25" src="assets/images/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps  font-25" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "  class="collaps  font-25"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg"></ion-icon>
               </button>
-              <button  class="no-color" *ngIf="!showCalendar" (click)="calendarHeight=['height-356'];showCalendar=true">
+              <button  class="no-color" *ngIf="!showCalendar" (click)="weekToShow();showCalendar=true">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps  font-25" src="assets/images/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps  font-25" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps  font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-down.svg" ></ion-icon>
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 4d017eb84..3418faa07 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -242,7 +242,7 @@ label{
   color:  #e16817;
 }
 td.monthview-primary-with-event {
-  background-color: red !important;
+  background-color: white !important;
 }
 .header-title{
   font-family: Roboto;
@@ -1031,7 +1031,7 @@ $font-size: rem(15);
     }
     
     .height-356 {
-      height: 369px;
+      height: 360px;
     }
   }
 
@@ -1066,3 +1066,13 @@ $font-size: rem(15);
   
 }
 
+.calendar-conteiner-height {
+  height: 100%;
+  transition: 0.5s;
+  animation: 0.5s;
+  -webkit-transition: 0.5s;
+  -moz-transition: 0.5s;
+  -ms-transition: 0.5s;
+  -o-transition: 0.5s;
+  -webkit-animation: 0.5s;
+}
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index d74926ef5..faefffa88 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -291,34 +291,37 @@ export class AgendaPage implements OnInit {
     }, 1000)
   }
 
-  weeksToShow = []
+  height = '75px'
 
   weekToShow() {
 
     setTimeout(() => {
-      let num = 0;
+      try {
+        let weekNum = 0;
 
-      function Week(a) {
-        for(let b of a.querySelectorAll('td')) {
-          if(!b.className.includes('text-muted')) {
-            num++;
-            return true
+        function Week(a) {
+          for(let b of a.querySelectorAll('td')) {
+            if(!b.className.includes('text-muted')) {
+              weekNum++;
+              return true
+            }
           }
         }
-      }
-  
-      for (let a of document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr') as any ){
-        Week(a)
-      } 
-  
-      if(num <= 5) {
         
-        this.weeksToShow = ["week-5"]
-      } else {
-        
-        this.weeksToShow = ["week-6"]
-      }
+        const dayBoxHeight = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td').clientHeight
+        const weeks = document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr');
   
+        for (let week of weeks as any ){
+          Week(week)
+        } 
+    
+        this.showCalendar = true
+        this.height = (weekNum * dayBoxHeight) +'px'
+      } catch (e) {
+        setTimeout(()=> {
+          this.weekToShow()
+        }, 100)
+      }
     }, 250)
 
   }
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 84d69b8a3..ed7d6328f 100644
--- a/src/app/pages/agenda/view-event/view-event.page.scss
+++ b/src/app/pages/agenda/view-event/view-event.page.scss
@@ -298,7 +298,7 @@ ion-menu{
     background: var(--label-bg-color);
     float: right;
     padding: 5px 13.5px 5px 13.5px;
-    color: #fff;
+    color: black;
   }
 
   .text {
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
index 2fb850abe..144435ba0 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
@@ -112,7 +112,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss
index 273144c69..e920d205a 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss
@@ -198,7 +198,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
index cb2549b66..17bb8e5e6 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -71,7 +71,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.scss b/src/app/pages/gabinete-digital/despachos/despachos.page.scss
index 9af2d194a..62af28fa0 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.scss
@@ -177,7 +177,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
index 931c581b2..df5a39020 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
@@ -137,7 +137,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
index 34a08d461..4d56b6331 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
@@ -183,7 +183,7 @@ ion-item{
       /* font-size: rem(12); */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
index c98ea15cc..12d6be55a 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
@@ -177,7 +177,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
index 5ae9a8021..8f8c0615c 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
@@ -124,7 +124,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss b/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss
index 40317712a..e9e427433 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss
@@ -177,7 +177,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
index f43435ef9..7834c4878 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
@@ -103,7 +103,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss
index 65eb18af1..ea80faa0b 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss
@@ -173,7 +173,7 @@ ion-item{
       /*font-size: rem(12);
       */float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
       -webkit-border-radius: 15px;
       -moz-border-radius: 15px;
       -ms-border-radius: 15px;
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
index 7eb4236d3..03768d15b 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
@@ -102,7 +102,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
index 400a3d7be..824220758 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
@@ -176,7 +176,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index b9229b099..760d40f48 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -396,7 +396,7 @@ ion-list {
           font-size: rem(12);
           float: right;
           padding: 2.5px 13.5px 2.5px 13.5px;
-          color: #fff;
+          color: black;
         }
       }
 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
index 9c0983be6..24006f8a5 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
@@ -68,7 +68,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss b/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss
index efce40ae7..1b0caac3e 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss
@@ -174,7 +174,7 @@ ion-item{
       /* font-size: rem(12); */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss
index 0effba5f3..8a0074db0 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss
@@ -172,7 +172,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts
index 6201dad59..4673ecb8d 100644
--- a/src/app/services/agenda/list-box.service.ts
+++ b/src/app/services/agenda/list-box.service.ts
@@ -72,8 +72,6 @@ export class ListBoxService {
 				endTime: event.end
 			})
 
-		
-			
 			const day = this.dateService.getDay(event.start) 
 			
 			event['manyDays'] = !this.dateService.isSameDate(event.start, event.end)
@@ -89,11 +87,10 @@ export class ListBoxService {
 			if (this.dateService.notSameDate(startDate, endDate)) {
 
 
-
-				if (diffDays <= 150 && !event.event.IsAllDayEvent ) {
+				if (diffDays <= 150 ) {
 
 					if (diffDays >= 1) {
-						
+
 						const StartEvent =  this.transForm(event, {startMany: true, endMany: false,	middle: false})
 						
 						if(this.CanPush(event, selectedDate)) days[day].push(StartEvent)
@@ -138,7 +135,6 @@ export class ListBoxService {
 						if(this.CanPush(event, selectedDate)) days[day].push(event)
 					}
 				} else {
-
 					if(this.CanPush(event, selectedDate)) days[day].push(event)
 				}
 			} else {
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index a1b6ab1e4..c9343aaff 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -698,4 +698,13 @@ export class MessageService {
     } catch (error) {}
 	}
 
+
+
+  UIdata() {
+    this.incomingFromCurrentUser = this.u.username!= SessionStore.user.UserName
+   this.hasMessage =  this.msg !=''
+  }
+
+  incomingFromCurrentUser = false
+  hasMessage = false
 }
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
index a2c957e95..2f5182f82 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
@@ -179,7 +179,7 @@ ion-item{
       /* font-size: rem(12); */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
index 519f9804e..799c47275 100644
--- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
@@ -181,7 +181,7 @@ ion-item{
       /* font-size: rem(12); */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
index 5d56820c6..abc4123d5 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
@@ -166,7 +166,7 @@
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
index dea40fd19..af5483311 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
@@ -102,7 +102,7 @@ ion-item{
       //font-size: 12px;
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.scss b/src/app/shared/gabinete-digital/expedients/expedients.page.scss
index 3274bc526..c5a08f3ea 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.scss
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.scss
@@ -102,7 +102,7 @@ ion-item{
       //font-size: 12px;
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss b/src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss
index 7c4765356..c70ef9556 100644
--- a/src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss
+++ b/src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss
@@ -72,7 +72,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss b/src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss
index 7c4765356..c70ef9556 100644
--- a/src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss
+++ b/src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss
@@ -72,7 +72,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
index 5c08d1d8e..daaaf2299 100644
--- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
+++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
@@ -77,7 +77,7 @@ ion-button{
       background: var(--label-bg-color);
       float: right;
       padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
+      color: black;
       font-size: rem(14);
   }
 
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
index f5dcb9f2b..02f1e93f2 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
@@ -169,7 +169,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss b/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
index 1d652537a..8752d7ce3 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
@@ -164,7 +164,7 @@ ion-item{
       /* font-size: 12px; */
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
-      color: #fff;
+      color: black;
   }
   }
   .exp-date{
diff --git a/src/global.scss b/src/global.scss
index b756dd52a..a3ff1b1a5 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -257,7 +257,6 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
 } */
 
 .calendar-container{
-    height: 333px;
     z-index: 10;
     transition: 0.5s;
     overflow-y: hidden;
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 29fb1618f..50e56fda6 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -648,7 +648,7 @@ $app-theme: mat-light-theme(
     font-size: rem(12);
     float: right;
     padding: 2.5px 13.5px 2.5px 13.5px;
-    color: #fff;
+    color: black;
   }
 }
 
diff --git a/version/git-version.ts b/version/git-version.ts
index 19d9b9143..2591e94f4 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "a426fba4b",
-  "SHA": "a426fba4b3c63c23309cc9d377b733bd4fc775b2",
+  "shortSHA": "624d0b1d7",
+  "SHA": "624d0b1d7a142ec7b58756a9a023a650fdd2e952",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Aug 28 17:06:16 2023 +0100'",
-  "lastCommitMessage": "merge branch",
-  "lastCommitNumber": "5221",
-  "change": "",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   .gitignore",
+  "lastCommitTime": "'Mon Aug 28 17:11:29 2023 +0100'",
+  "lastCommitMessage": "add gitignore",
+  "lastCommitNumber": "5222",
+  "change": "diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\nindex 3f911c5ce..4dbc4f087 100644\n--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\n+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\n@@ -170,7 +170,7 @@ ion-item{\n       /* font-size: 12px; */\n       float: right;\n       padding: 2.5px 13.5px 2.5px 13.5px;\n-      color: #fff;\n+      color: black;\n   }\n   }\n   .exp-date{",
+  "changeStatus": "On branch developer-prod\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/modals/document-detail/document-detail.page.scss\n\tmodified:   src/app/modals/view-event/view-event.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/agenda/view-event/view-event.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.scss\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified:   src/app/services/agenda/list-box.service.ts\n\tmodified:   src/app/services/chat/message.service.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.scss\n\tmodified:   src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss\n\tmodified:   src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified:   src/global.scss\n\tmodified:   src/theme/variables.scss\n\tmodified:   version/git-version.ts\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.scss",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file