Merge branch 'amal' into 'master'

.angulardoc.json

+{
+  "repoId": "77875709-463a-40d5-86b9-f06a889adc49",
+  "lastSync": 0
+}
\ No newline at end of file

package.json

@@ -85,4 +85,4 @@
             "android"
         ]
     }
-}
\ No newline at end of file
+}

src/app/complete/complete.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
 
         <button class="nav_btn nav_messenger floatRight">
       </button>
         <div class="clear"></div>
     </div>
+<ion-content>
+    
     <div class="banner_section">
         <img src="../assets/tick.png">
         <h5>YOU HAVE COMPLETED THIS RIDE</h5>

src/app/forgotpass/forgotpass.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
         <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
     </button>
         <div class="nav_title floatLeft">
@@ -7,6 +6,8 @@
         </div>
         <div class="clear"></div>
     </div>
+<ion-content>
+    
     <div class="login_wrapper">
         <div class="login_inner">
             <div class="row">

src/app/home/home.page.html

-<ion-content>
-    <div class="nav_header">
+ <div class="nav_header">
         <div class="logo_sec floatLeft">
             <img src="../../assets/[email protected]">
         </div>
@@ -8,6 +7,8 @@
         <button class="rider_status online floatRight" (click)="changeStatus()" [hidden]="status == 0">ONLINE</button>
         <div class="clear"></div>
     </div>
+<ion-content>
+   
     <div class="home_wrapper">
         <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng">
             <agm-direction [origin]="origin" [destination]="destination" [renderOptions]="renderOptions" [markerOptions]="markerOptions">

src/app/login/login.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
         <button class="nav_btn floatLeft">
         </button>
         <div class="nav_title floatLeft">
@@ -7,6 +6,8 @@
         </div>
         <div class="clear"></div>
     </div>
+<ion-content>
+    
     <div class="login_wrapper">
         <div class="logo_wrapper">
             <img src="../../assets/[email protected]">

src/app/password/password.page.html

-<ion-content>
-    <div class="nav_header">
+ <div class="nav_header">
         <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
     </button>
         <div class="nav_title floatLeft">
@@ -7,6 +6,8 @@
         </div>
         <div class="clear"></div>
     </div>
+<ion-content>
+   
     <div class="login_wrapper">
         <div class="login_inner">
             <div class="row">

src/app/ridedetails/ridedetails.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
         <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
       </button>
         <div class="nav_title floatLeft">
@@ -9,6 +8,8 @@
         </button>
         <div class="clear"></div>
     </div>
+<ion-content>
+    
     <div class="ridedetail_wrapper" *ngIf="order">
         <div class="order_acceptance">
             <div class="order_acceptance_inner">

src/app/riderlounge/riderlounge.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
         <button class="nav_btn floatLeft">
           <div class="nav_circle">
             
@@ -12,6 +11,8 @@
     </button>
         <div class="clear"></div>
     </div>
+<ion-content>
+    
     <div class="rider_lounge_wrapper" *ngIf="order">
         <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng">
             <agm-direction [origin]="origin" [destination]="destination" [renderOptions]="renderOptions" [markerOptions]="markerOptions">

src/app/signup/signup.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
         <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
     </button>
         <div class="nav_title floatLeft">
@@ -7,6 +6,8 @@
         </div>
         <div class="clear"></div>
     </div>
+<ion-content>
+    
     <div class="login_wrapper">
         <div class="login_inner">
             <div class="row">

src/app/upload/upload.page.html

-<ion-content>
-    <div class="nav_header">
+ <div class="nav_header">
         <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
        </button>
         <div class="nav_title floatLeft">
@@ -7,6 +6,8 @@
         </div>
         <div class="clear"></div>
     </div>
+<ion-content>
+   
     <div class="document_upload_wrapper">
         <div class="row">
             <div class="document_upload_box">

src/app/verification/verification.page.html

-<ion-content>
-    <div class="nav_header">
+<div class="nav_header">
         <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
     </button>
         <div class="nav_title floatLeft">
@@ -7,6 +6,7 @@
         </div>
         <div class="clear"></div>
     </div>
+<ion-content>
     <div class="login_wrapper">
         <div class="login_inner">
             <div class="row">