Changes on Home view

src/app/pages/events/attendees/attendees.page.html

@@ -36,6 +36,8 @@
     </ion-list>
   </ion-item-group>
 </ion-content>
+
+
 <ion-footer class="ion-no-border">
   <ion-toolbar color="primary">
     <ion-buttons slot="start">
@@ -44,6 +46,7 @@
         <ion-icon name="close" slot="start"></ion-icon>
       </ion-button>
     </ion-buttons>
+    <ion-title></ion-title>
     <ion-buttons slot="end">
       <ion-button (click)="save()">
         <ion-label>Gravar</ion-label>

src/app/pages/events/attendees/attendees.page.scss

@@ -4,8 +4,3 @@ ion-item-group{
 ion-item{
     border-bottom:1px solid #ccc;
 }
-ion-button{
-    width: 90%;
-    margin: 0 auto;
-    margin-bottom: 15px;
-}

src/app/pages/events/event-detail/event-detail.page.html

@@ -15,6 +15,7 @@
 <ion-content padding>
   <div *ngIf="loadedEvent">
   <ion-item-group>
+    <ion-item-sliding>
     <ion-item>
       <ion-label position="stacked">Assunto</ion-label>
       <ion-input [(ngModel)]="loadedEvent.Subject"></ion-input>
@@ -85,6 +86,35 @@
         </ion-card-content>
       </ion-card>
     </div>
+    <!-- <div class="div-attach">
+      <ion-item>
+        <ion-icon name="add" slot="end"></ion-icon>
+        <ion-label class="attach-label">Intervenientes</ion-label>
+      </ion-item>
+      <div id="AttachFiles"></div>
+      <ion-list [(ngModel)]="loadedEvent.EventType">
+        <ion-item lines="none">
+          <ion-icon name="attach"></ion-icon>
+          <ion-label color="secondary">Lei do orçamento geral do Estado</ion-label> 
+          <ion-icon name="trash" slot="end"></ion-icon>
+        </ion-item>
+      </ion-list>
+    </div>
+    <div class="div-attach">
+      <ion-item>
+        <ion-icon name="add" slot="end"></ion-icon>
+        <ion-label class="attach-label">Anexos</ion-label>
+      </ion-item>
+      <div id="AttachFiles"></div>
+      <ion-list [(ngModel)]="loadedEvent.EventType">
+        <ion-item lines="none">
+          <ion-icon name="attach"></ion-icon>
+          <ion-label color="secondary">Lei do orçamento geral do Estado</ion-label> 
+          <ion-icon name="trash" slot="end"></ion-icon>
+        </ion-item>
+      </ion-list>
+    </div> -->
+  </ion-item-sliding>
   </ion-item-group>
 </div>
    <!-- Skeleton screen -->
@@ -150,7 +180,11 @@
       </ion-label>
     </ion-item>
   </ion-list>
+
+  
+  
 </div>
+
 </ion-content>
 <ion-footer class="ion-no-border">
   <div class="event-detail-buttons">

src/app/pages/events/events.page.html

@@ -1,10 +1,20 @@
 <ion-header translucent="true">
   <ion-toolbar>
-      <ion-buttons slot="start" class="logout-button"  (click)="logout()">
+    <ion-item class="ion-text-header-top" lines="none">
+      <div class="div-logo">
+        <img src='assets/images/logo.png' alt='logo'>
+      </div>
+      <ion-label>
+        <h6 class="header-xsmall">Presidente da República</h6>
+        <h2 class="header-large">GABINETE DIGITAL</h2>
+      </ion-label>
+    </ion-item>
+      <!-- <ion-buttons slot="start" class="logout-button"  (click)="logout()">
         <ion-icon slot="start" name="log-out-outline"></ion-icon>
         <ion-label>Sair</ion-label>
-      </ion-buttons> 
+      </ion-buttons>  -->
   <!-- customized TOGGLE button -->
+  <ion-buttons slot="end">
   <label class="switch">
     <input type="checkbox" id="togBtn">
     <div (click)="showAlert()">
@@ -12,10 +22,11 @@
     <!--ADDED HTML --><span class="mdgpr">MDGPR</span></div><span class="pr">PR</span><!--END-->
   </div>
 </label>
+</ion-buttons>
 </ion-toolbar>
   <ion-toolbar>
     <ion-label>
-      <ion-item class="ion-text-header-top" lines="none">
+      <!-- <ion-item class="ion-text-header-top" lines="none">
         <div class="div-logo">
           <img src='assets/images/logo.png' alt='logo'>
         </div>
@@ -23,21 +34,18 @@
           <h6 class="header-xsmall">Presidente da República</h6>
           <h2 class="header-large">GABINETE DIGITAL</h2>
         </ion-label>
-      </ion-item>
+      </ion-item> -->
       <ion-item class="ion-text-right" lines="none">
         <ion-label class="ion-text-wrap">
-            <h3 class="header-medium"> {{greetting}} Sua Excelência <br />
-              Ministro Director do Gabinete do<br />
+            <h3 class="header-medium"> {{greetting}} Excelência <br />
+              Ministro Director do Gabinete do<!-- <br /> -->
               Presidente da República
             </h3>
-          <p class="p-small">{{customDate}}</p>
+          
         </ion-label>
       </ion-item>
     </ion-label>
-  </ion-toolbar> 
-</ion-header>
-
-<ion-content>
+  </ion-toolbar>
   <!-- TABS -->
   <ion-toolbar >
     <ion-segment [(ngModel)]="segment" (ionChange)="onSegmentChange()">
@@ -52,13 +60,20 @@
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+  <ion-label>
+    <p class="p-small">{{customDate}}</p>
+  </ion-label>
   <!-- COMBINADA -->
   <div [ngSwitch]="segment">
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <!-- <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-      <!-- <ion-refresher-content>
-      </ion-refresher-content> -->
-    </ion-refresher>
+       <ion-refresher-content>
+      </ion-refresher-content>
+    </ion-refresher> -->
     <ion-list *ngSwitchCase="'Combinada'" >
       <ion-item-group>
         <ion-item-sliding>

src/app/pages/events/events.page.scss

@@ -3,39 +3,49 @@ ion-toolbar{
   --background: white;
 }
 .ion-text-header-top{
+  width: 100%;
+
     text-align: center;
     padding-top: 15px;
+
+    /* border: 1px solid red; */
   }
   .div-logo{
-    width: 98px;
+    width: 60px;
+    /* border: 1px solid red; */
+    margin-right: 20px;
   }
   .div-logo img{
     width: 100%;
   }
   .header-large{
     font-family: Arial, Helvetica, sans-serif;
-    font-size: 16pt;
+    font-size: 12.5pt;
     /* font-weight: 600; */
   }
-  .header-medium{
-    font-size: 16pt;
-    font-family: roboto;
-    background: transparent;
-    margin-right: 5px;
-  }
   .header-xsmall{
     font-family: Arial, Helvetica, sans-serif;
-    font-size: 12.7pt;
+    font-size: 9.7pt;
     font-weight: bold;
     padding-bottom: 3.5px;
     margin-bottom: 3.5px;
     border-bottom: 1px solid #ccc;
   }
-  .p-small{
+  .header-medium{
     font-size: 12pt;
-    margin-top: 25px;
-    color:#000;
+    text-align: left;
+    font-family: roboto;
+    background: transparent;
     margin-right: 5px;
+    line-height: 25px;
+  }
+  
+  .p-small{
+    font-size: 13pt;
+    margin-top: 13px;
+    color:#000;
+    margin-right: 25px !important;
+    text-align: right;
   }
   
   /* CONTENT */
@@ -59,7 +69,7 @@ ion-toolbar{
       overflow: auto;
       /* border-bottom: 1px solid #ccc; */
       margin: 10px 0 5px 0;
-     /*  background: #cab0dc; */
+      background: #cab0dc;
       border-radius: 20px;
       padding: 10px;
       /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
@@ -69,7 +79,7 @@ ion-toolbar{
       overflow: auto;
       /* border-bottom: 1px solid #ccc; */
       margin: 10px 0 5px 0;
-      /* background: #cbeecb; */
+      background: #cbeecb;
       border-radius: 20px;
       padding: 10px;
       /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */