fix merge

This commit is contained in:
Peter Maquiran
2023-07-28 16:28:59 +01:00
parent ac805b67ba
commit 9bebc1b8b6
18 changed files with 37 additions and 28 deletions
+1 -1
View File
@@ -25,7 +25,7 @@
<div class="conteiner-box pt-20 height-100">
<div class="main-content justify-center d-flex height-100">
<div class="box-container width-100 d-flex mx-20" style="padding: 0px;overflow: hidden;">
<div class="box-container width-100 d-flex mx-20 overflow-hidden" style="padding: 0px;overflow: hidden;">
<ion-progress-bar type="indeterminate" *ngIf="loadingAllTask || TaskService.showLoader"></ion-progress-bar>
<div class="px-20 pb-20 container-filters">
<p class="time ion-text-left font-18-em">{{customDate}}</p>