Merge branch 'amal' into 'master'

package-lock.json

@@ -379,7 +379,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -781,7 +782,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -836,6 +838,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -879,12 +882,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },
@@ -4287,7 +4292,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4689,7 +4695,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4744,6 +4751,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4787,12 +4795,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

src/app/purchase/address/address.component.scss

 .purchase_wrapper{
+    padding-top: 115px;
     .address_wrapper{
      h3{
         font-size: 20px;

src/app/purchase/searchbar/searchbar.component.scss

 .purchase_taskbar{
     width:100%;
-    padding-top: 30px;
+    padding-top: 115px;
     padding-bottom: 30px;
     .purchase_searchbar{
         width:calc(100% - 60%);
@@ -12,19 +12,21 @@
             top: 55px;
             width: 100%;
             z-index: 9999;
-            -webkit-box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.75);
--moz-box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.75);
-box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.75);
+            -webkit-box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.2);
+-moz-box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.2);
+box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.2);
             ul{
                 margin: 0px;
                 padding: 0px;
                 li{
                     list-style: none;
-                    padding: 8px;
+                    padding: 5px;
+                    padding-left: 10px;
                     cursor: pointer;
+                    border-bottom: 1px solid #f8f8f8;
                     .search_list_image{
-                        width:40px;
-                        height:40px;
+                        width:30px;
+                        height:30px;
                         background: #a8a8a8;
                         border-radius: 50%;
                         float: left;
@@ -37,8 +39,9 @@ box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.75);
                         }
                     }
                     p{
-                        width: calc(100% - 40px);
-                        padding: 10px;
+                        width: calc(100% - 30px);
+                        padding:3px;
+                        padding-left:15px;
                         margin: 0px;
                         float: left;
                     }

src/app/purchase/summary/summary.component.scss

 .purchase_wrapper{
+    padding-top: 115px;
     .summary_wrapper{
         h3{
             font-size: 20px;

src/styles.scss

@@ -89,7 +89,6 @@ body {
 }
 
 .purchase_wrapper{
-    padding-top:120px;
     background: #f1f3f6;
     .container-fluid {
         max-width: calc(100% - 15%);