Merge branch 'master' into adarsh

src/app/address/address.page.html

@@ -13,26 +13,28 @@
         <ion-grid *ngFor="let address of addressService.addressList; let i = index">
             <ion-row>
                 <ion-col size="1">
-          <input type="radio" id="address_{{i}}" class="address-radio" name="address"
-            (change)="setDefault(address.addressId)" [checked]="address.defaultVal == 1" />
+                    <input type="radio" id="address_{{i}}" class="address-radio" name="address" (change)="setDefault(address.addressId)" [checked]="address.defaultVal == 1" />
                 </ion-col>
                 <ion-col size="9">
                     <h1>{{address.addressType}}</h1>
                     <h1>{{address.address}}</h1>
                     <p>{{address.building}}, {{address.landmark}}</p>
                 </ion-col>
-        <ion-col size="2" [hidden]="address.defaultVal == 1"><button class="show-btn"
-            (click)="addressService.deleteAddress(address.addressId)">
+                <ion-col size="2" [hidden]="address.defaultVal == 1"><button class="show-btn" (click)="addressService.deleteAddress(address.addressId)">
             <img src="../../assets/delete.png" /></button></ion-col>
             </ion-row>
         </ion-grid>
+
+    </div>
+</ion-content>
+
+<ion-footer>
     <div class="address-btn-wrapper">
         <button class="show-btn" (click)="goToPage('nearby')">
       Add New Address
     </button>
     </div>
-  </div>
-</ion-content>
+</ion-footer>
 <div class="loader" *ngIf="loader">
     <div class="lds-ripple">
         <div></div>

src/app/address/address.page.scss

@@ -9,14 +9,14 @@
         background-size: 25px;
         height: auto;
         padding: 15px;
-    border-radius: 5px;
+        border-radius: 50%;
         outline: none;
         transition: all 0.6s ease-in-out;
     }
     .address-radio:checked {
         background-image: url('../../assets/radio-checked.png');
     }
-  .address-radio:checked + .show-btn {
+    .address-radio:checked+.show-btn {
         opacity: 1;
     }
     h1 {
@@ -39,14 +39,14 @@
 }
 
 .address-btn-wrapper {
-  padding: 15px;
-  padding-top: 0;
-  padding-bottom: 10px;
-  background-color: #fff;
     position: fixed;
-  bottom: 0px;
+    bottom: 0;
     left: 0;
     right: 0;
+    background-color: #fff;
+    padding: 20px;
+    text-align: center;
+    z-index: 9;
     button {
         width: 100%;
         background-color: #29285b;

src/app/storelist/storelist.page.scss

@@ -145,12 +145,12 @@
                     width: 120px;
                     height: 125px;
                     float: left;
-                    background-color: #a8a8a8;
+                    // background-color: #f1f1f1;
                     border-radius: 8px;
                     img {
                         width: 100%;
                         height: 100%;
-                        object-fit: cover;
+                        object-fit: contain;
                         object-position: center;
                     }
                 }