conflixx

src/app/home/home.page.scss

@@ -276,87 +276,70 @@
       padding: 0px;
       font-weight: 800;
     }
-<<<<<<< HEAD
-    ul {
-      margin: 0px;
-      padding: 0px;
-      padding-top: 30px;
-      li {
-        list-style: none;
-        margin-bottom: 15px;
-        p {
-          margin: 0px;
-          padding: 0px;
-          color: rgba(176, 174, 199, 1);
-          padding-top: 5px;
-          padding-bottom: 5px;
-=======
     .add_address_wrapper {
-        position: fixed;
-        bottom: 0px;
-        left: 0px;
-        right: 0px;
-        padding: 20px 20px 50px 20px;
-        border-top-left-radius: 15px;
-        border-top-right-radius: 15px;
-        background: #fff;
-        -webkit-box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
-        -moz-box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
-        box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
-        h5 {
-            color: rgba(41, 40, 91, 1);
-            margin: 0px;
-            padding: 0px;
-            font-weight: 800;
->>>>>>> a9bd8295df980b5b3661ca885b051970c7f081fc
+      position: fixed;
+      bottom: 0px;
+      left: 0px;
+      right: 0px;
+      padding: 20px 20px 50px 20px;
+      border-top-left-radius: 15px;
+      border-top-right-radius: 15px;
+      background: #fff;
+      -webkit-box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
+      -moz-box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
+      box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
+      h5 {
+        color: rgba(41, 40, 91, 1);
+        margin: 0px;
+        padding: 0px;
+        font-weight: 800;
+      }
+      .styled-checkbox {
+        position: absolute; // take it out of document flow
+        opacity: 0; // hide it
+        & + label {
+          position: relative;
+          cursor: pointer;
+          padding: 0;
+          width: 100%;
         }
-        .styled-checkbox {
-          position: absolute; // take it out of document flow
-          opacity: 0; // hide it
-          & + label {
-            position: relative;
-            cursor: pointer;
-            padding: 0;
-            width: 100%;
-          }
-          // Box.
-          & + label:before {
-            content: '';
-            margin-right: 10px;
-            display: inline-block;
-            vertical-align: text-top;
-            width: 20px;
-            height: 20px;
-            border-radius: 50%;
-            background: white;
-            border: 1px solid rgba(215, 213, 228, 1);
-          }
-          &:checked + label:before {
-            background: #29285b;
-          }
-          // Disabled state label.
-          &:disabled + label {
-            color: #b8b8b8;
-            cursor: auto;
-          }
-          // Disabled box.
-          &:disabled + label:before {
-            box-shadow: none;
-            background: #ddd;
-          }
-          // Checkmark. Could be replaced with an image
-          &:checked + label:after {
-            content: '';
-            position: absolute;
-            left: 6px;
-            top: 10px;
-            background: white;
-            width: 2px;
-            height: 2px;
-            box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white,
-              4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white;
-            transform: rotate(45deg);
-          }
+        // Box.
+        & + label:before {
+          content: '';
+          margin-right: 10px;
+          display: inline-block;
+          vertical-align: text-top;
+          width: 20px;
+          height: 20px;
+          border-radius: 50%;
+          background: white;
+          border: 1px solid rgba(215, 213, 228, 1);
+        }
+        &:checked + label:before {
+          background: #29285b;
+        }
+        // Disabled state label.
+        &:disabled + label {
+          color: #b8b8b8;
+          cursor: auto;
+        }
+        // Disabled box.
+        &:disabled + label:before {
+          box-shadow: none;
+          background: #ddd;
+        }
+        // Checkmark. Could be replaced with an image
+        &:checked + label:after {
+          content: '';
+          position: absolute;
+          left: 6px;
+          top: 10px;
+          background: white;
+          width: 2px;
+          height: 2px;
+          box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white,
+            4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white;
+          transform: rotate(45deg);
         }
       }
     }