Rollback toogle button

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

@@ -1,4 +1,12 @@
 <ion-header translucent="true">
+  <ion-toolbar>
+  <!-- customized TOGGLE button -->
+  <label class="switch"><input type="checkbox" id="togBtn">
+    <div class="slider round" (click)="showAlert()">
+    <!--ADDED HTML --><span class="mdgpr">MDGPR</span><span class="pr">PR</span><!--END-->
+  </div>
+</label>
+</ion-toolbar>
   <ion-toolbar>
     <ion-title>
       <ion-item class="ion-text-header-top" lines="none">
@@ -20,27 +28,10 @@
         </ion-label>
       </ion-item>
     </ion-title>
-
-    <!-- customized TOGGLE button -->
-    <label class="switch"><input type="checkbox" id="togBtn">
-      <div class="slider round">
-      <!--ADDED HTML --><span class="mdgpr" (click)="showAlert()">MDGPR</span><span class="pr">PR</span><!--END-->
-    </div>
-  </label>
-
   </ion-toolbar> 
 </ion-header>
 
 <ion-content>
-  <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-    <ion-refresher-content
-      pullingIcon="chevron-down-circle-outline"
-      pullingText="deslize para actualizar"
-      refreshingSpinner="circles"
-      refreshingText="A actualizar...">
-    </ion-refresher-content>
-  </ion-refresher>
   <!-- TABS -->
   <ion-toolbar >
     <ion-segment [(ngModel)]="segment" (ionChange)="onSegmentChange()">
@@ -57,6 +48,11 @@
   </ion-toolbar>
   <!-- COMBINADA -->
   <div [ngSwitch]="segment">
+    <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-list *ngSwitchCase="'Combinada'" >
       <ion-item-group>
         <ion-item-sliding>

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

@@ -146,10 +146,7 @@
       color: #666666;
       font-size: 20px;
     }
-
-
-
-
+    
     .switch {
       position: relative;
       display: inline-block;
@@ -168,8 +165,7 @@
       left: 0;
       right: 0;
       bottom: 0;
-      background-color: #ffffff;
-      border: 1px solid #e16817;
+      background-color: #e16817;
       -webkit-transition: .4s;
       transition: .4s;
     }
@@ -188,7 +184,7 @@
     
     input:checked + .slider {
       background-color: #e16817;
-      border: 1px solid #ffffff;
+      /* border: 1px solid #ffffff; */
     }
     
     input:focus + .slider {
@@ -206,18 +202,17 @@
     {
       display: none;
       text-align: left !important;
-      
-      color: white;
-      left: 23px !important; 
+      left: 25px !important; 
     }
     .mdgpr
     {
-      left: 58px !important;
-      color: #e16817;
+
+      left: 60px !important; 
     }
     
     .pr, .mdgpr
     {
+      color: white;
       position: absolute;
       transform: translate(-50%,-50%);
       top: 50%;
@@ -232,7 +227,6 @@
     
     input:checked + .slider .mdgpr
     {display: none;
-      color: white;
     }
     
     /*--------- END --------*/
@@ -245,5 +239,4 @@
     
     .slider.round:before {
       border-radius: 50%;
-      border: 1px solid #e16817;
     }

src/app/pages/events/events.page.ts

@@ -57,10 +57,10 @@ export class EventsPage implements OnInit {
 
   doRefresh(event) {
     this.RefreshEvents();
-
-    setTimeout(() => {
-      event.target.complete();
-    }, 2000);
+    event.target.complete();
+    // setTimeout(() => {
+    //   event.target.complete();
+    // }, 2000);
   }
 
   onSegmentChange(){