Merge branch 'master' into adarsh

src/app/cart/cart.page.html

@@ -266,13 +266,21 @@
 
 <div *ngIf="isShow" [@slideInOut]>
     <div class="nav_header">
-        <button class="nav_btn nav_back floatLeft" (click)="istoggle();">
-            <img src="../assets/Group17_2.png" />
-        </button>
-        <div class="nav_title floatLeft">
-            <h4>CHANGE LOCATION</h4>
-        </div>
-        <div class="clear"></div>
+        <ion-grid class="no-gutter">
+            <ion-row class="no-gutter">
+                <ion-col class="no-gutter" size="2">
+                    <button class="nav_btn nav_back floatLeft" (click)="istoggle();">
+                        <img src="../assets/Group17_2.png" />
+                    </button>
+                </ion-col>
+                <ion-col class="no-gutter" size="8">
+                    <div class="nav_title floatLeft">
+                        <h4>CHANGE LOCATION</h4>
+                    </div>
+                </ion-col>
+                <ion-col class="no-gutter" size="2"></ion-col>
+            </ion-row>
+        </ion-grid>
     </div>
     <ion-content class="sort_wrappper">
         <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
@@ -280,12 +288,13 @@
         </agm-map>
         <div class="add_address_wrapper">
             <h5>
-                <span class="floatLeft">NEW ADDRESS</span>
+                <span class="floatLeft">SELECT ADDRESS</span>
                 <span class="floatRight" (click)="istoggle(); goToPage('nearby')">ADD NEW</span>
                 <div class="clear"></div>
             </h5>
             <ul *ngIf="addressService.nearestList && addressService.nearestList.length > 0">
-                <li *ngFor="let address of addressService.nearestList; let i = index">
+                <li *ngFor="let address of addressService.nearestList; let i = index" class="no-devlivery">
+                    <h4>DELIVERS TO</h4>
                     <div class="floatLeft">
                         {{address.default}}
                         <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address.addressId, i)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />

src/app/cart/cart.page.scss

@@ -534,13 +534,19 @@
         padding: 0px;
         font-weight: 800;
     }
+    h4 {
+        font-size: 14px;
+        color: #3d72e8;
+        margin-top: 5px;
+    }
     ul {
         margin: 0px;
         padding: 0px;
-        padding-top: 30px;
+        padding-top: 10px;
         li {
             list-style: none;
-            margin-bottom: 15px;
+            margin-bottom: 7px;
+            border-bottom: 1px solid #f1f1f1;
             p {
                 margin: 0px;
                 padding: 0px;
@@ -596,6 +602,19 @@
                 }
             }
         }
+        .no-devlivery {
+            .styled-checkbox {
+                &+label {
+                    color: #999;
+                }
+                &:checked+label:before {
+                    background: #999;
+                }
+            }
+            h4 {
+                color: #da0000;
+            }
+        }
     }
 }