Merge pull request #681 from khushi-joshi-05/sukhbir

Sukhbir
khushi-joshi-05 · May 30, 2024 · ed72773 · ed72773
2 parents 59a67a5 + 9a2ead9
commit ed72773
Show file tree

Hide file tree

Showing 40 changed files with 1,942 additions and 1,701 deletions.
diff --git a/Css-files/ContactUpdate.css b/Css-files/ContactUpdate.css
diff --git a/Css-files/cart.css b/Css-files/cart.css
@@ -1,17 +1,20 @@
 * {
     box-sizing: border-box;
 }
+
 .cart-section {
     align-items: center;
     padding: 25px 15px;
     flex-direction: column;
 }
+
 .cart {
     padding: 1% 2%;
     width: 80%;
     margin-top: 20px;
     flex-direction: column;
 }
+
 #cart-items {
     width: 100%;
 }
@@ -25,26 +28,32 @@
     padding: 20px 10px;
     border-bottom: 1px solid gray;
 }
+
 .cart-item:hover {
     background-color: rgb(229, 229, 229);
 }
+
 .cart-item img {
     border-radius: 50%;
     box-shadow: 0 0 5px rgb(196, 74, 74);
 }
+
 .detail {
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
     align-items: center;
     width: 60%;
 }
+
 .quantity-wrapper {
     padding: 5px;
     border-radius: 25px;
     border: 1px solid gray;
 }
-.quantity-wrapper *, .btn {
+
+.quantity-wrapper *,
+.btn {
     display: inline-block;
     width: 30px;
     height: 30px;
@@ -54,17 +63,21 @@
     transition: 0.3s;
     cursor: pointer;
 }
+
 .btn {
-    font-family:Verdana, Geneva, Tahoma, sans-serif;
+    font-family: Verdana, Geneva, Tahoma, sans-serif;
 
 }
+
 .remove {
     line-height: 25px;
 }
+
 .btn:hover {
     background-color: rgb(196, 74, 74);
     color: white;
 }
+
 .decrease-quantity.disable {
     opacity: 0.3;
     pointer-events: none;
@@ -76,43 +89,55 @@
     text-align: right;
     color: rgb(196, 74, 74);
 }
+
 #cart-total span {
     font-size: 13px;
     color: gray;
 }
+
 .empty-cart {
     display: flex;
     flex-direction: column;
     gap: 20px;
     align-items: center;
     justify-content: center;
 }
+
 .empty-cart * {
     text-align: center;
     color: black;
 }
+
 .empty-cart p {
     max-width: 500px;
     width: 100%;
 }
-.butt{
-    color: white;
-}
-.empty-cart h4, .empty-cart button {
-    margin: 20px;
-}
-input,
-textarea {
-    width: 100%;
-}
-@media all and (max-width: 768px) {
-    .cart {
-        width: 100%;
+
+<<<<<<< HEAD .empty-cart h4,
+.empty-cart button {
+    =======.butt {
+        color: white;
     }
-    .detail {
-        flex-direction: column;
-        justify-content: left;
-        align-items:flex-start;
-        gap: 5px;
+
+    .empty-cart h4,
+    .empty-cart button {
+        >>>>>>>59a67a53a38fb9bc9e0501c4444bec55e9a10769 margin: 20px;
     }
-}
+
+    input,
+    textarea {
+        width: 100%;
+    }
+
+    @media all and (max-width: 768px) {
+        .cart {
+            width: 100%;
+        }
+
+        .detail {
+            flex-direction: column;
+            justify-content: left;
+            align-items: flex-start;
+            gap: 5px;
+        }
+    }