From b3ac900cef2496542a34684539e860e8cdadb334 Mon Sep 17 00:00:00 2001
From: Mahimatestgithub <guptamahima7848@gmail.com>
Date: Tue, 29 Oct 2024 13:59:09 +0530
Subject: [PATCH 1/2] done

---
 src/App.jsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index 1f83ca68..ecac6994 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -157,13 +157,8 @@ export default function App() {
           {/* Other user routes */}
           <Route path="contributors" element={<Contributors />} />
           <Route path="about-us" element={<AboutUs />} />
-<<<<<<< HEAD
           <Route path="help" element={<Help />} /> {/* Help page route */}
           <Route path="privacy-policy" element={<Privacy />} />
-=======
-          <Route path="help" element={<Help />} />
-          <Route path="privacy" element={<Privacy />} />
->>>>>>> 5eed12d9 (revert sadaf commit for category changes)
           {/* Privacy policy page route */}
           <Route path="cart" element={<Cart />} /> 
           <Route

From 3c717ecd39a453bbbe97e03de48656c19e7aa5c7 Mon Sep 17 00:00:00 2001
From: Mahimatestgithub <guptamahima7848@gmail.com>
Date: Tue, 29 Oct 2024 14:09:35 +0530
Subject: [PATCH 2/2] added hover to social icons

---
 src/User/components/Footer/Footer.css | 30 +++++++++++++++++++++------
 src/User/components/Footer/Footer.jsx |  3 +++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/User/components/Footer/Footer.css b/src/User/components/Footer/Footer.css
index a8e1a48e..e9d80ac7 100644
--- a/src/User/components/Footer/Footer.css
+++ b/src/User/components/Footer/Footer.css
@@ -1,3 +1,4 @@
+/* Existing Footer Styles */
 .footer {
   background-color: #2e2e2e;
   color: #fff;
@@ -9,13 +10,11 @@
 .footer-top {
   display: flex;
   flex-direction: column;
-  /* gap: 20px; */
   align-items: center;
 }
 
 .footer-top .logo img {
   width: 80px;
-  /* Adjusted size for better visibility */
 }
 
 .footer-top .social-media {
@@ -33,7 +32,6 @@
 
 .footer-top .social-icons a img {
   width: 30px;
-  /* Adjusted size for consistency */
 }
 
 .footer-top .contact-info,
@@ -47,7 +45,6 @@
   align-items: center;
   justify-content: center;
   gap: 10px;
-  /* Space between image and text */
   margin: 5px 0;
   color: #fff;
   text-decoration: none;
@@ -60,7 +57,6 @@
 
 .footer-top .address img {
   width: 24px;
-  /* Adjusted size for better alignment */
   height: 24px;
 }
 
@@ -95,6 +91,28 @@
   text-decoration: underline;
 }
 
+/* Social Media Icon Hover Effects */
+.footer-top .social-icons a {
+  transition: transform 0.3s, filter 0.3s;
+}
+
+.footer-top .social-icons a:hover {
+  transform: scale(1.1);
+}
+
+.footer-top .social-icons a:nth-child(1):hover img {
+  filter: brightness(1.2) saturate(1.2);
+}
+
+.footer-top .social-icons a:nth-child(2):hover img {
+  filter: brightness(1.2) saturate(1.2);
+}
+
+.footer-top .social-icons a:nth-child(6):hover img {
+  filter: brightness(1.2) saturate(1.2);
+}
+
+/* Responsive Styles */
 @media (min-width: 768px) {
   .footer-top {
     flex-direction: row;
@@ -123,4 +141,4 @@
     text-align: right;
     justify-content: flex-end;
   }
-}
\ No newline at end of file
+}
diff --git a/src/User/components/Footer/Footer.jsx b/src/User/components/Footer/Footer.jsx
index 3403cf03..f25dd454 100644
--- a/src/User/components/Footer/Footer.jsx
+++ b/src/User/components/Footer/Footer.jsx
@@ -161,6 +161,9 @@ const Footer = () => {
             </p>
           </div>
           <br />
+
+
+
           <div className="social-media flex flex-col justify-center items-center">
             <p className="text-sm text-center text-gray-400 sm:items-center underline">
               SOCIALS: