Merge branch 'main' into new_branch

Anjaliavv51 · Oct 2, 2024 · 92d55b0 · 92d55b0
2 parents 6e5722d + 781d25a
commit 92d55b0
Show file tree

Hide file tree

Showing 17 changed files with 383 additions and 93 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/Retro.iml b/.idea/Retro.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Coverpage.html b/Coverpage.html
@@ -6,6 +6,7 @@
     <title>Retro</title>
     <meta http-equiv="refresh" content="30">
     <link rel="shortcut icon" type="image/x-icon" href="./Favicon image/favicon-32x32.png">
+    <link rel="stylesheet" href="./style.css">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <style id="background-color">
         body {

diff --git a/Css-files/content.css b/Css-files/content.css
@@ -344,42 +344,97 @@ div.deals:hover{
 
 /* footer */
 .foot-panel2{
-    background-color: transparent;
-    color:white;
-    height: 300px;
-    display: flex;
-    justify-content: space-evenly;
+  background-color: transparent;
+  color:white;
+  height: 300px;
+  display: flex;
+  justify-content: space-evenly;
 }
 
 .footer-colums{
-    margin-top: 20px;
+  margin-top: 20px;
 }
 
 .footer-colums p{
-    font-weight: 700;
+  font-weight: 700;
 }
 
 .footer-colums a{
-    display: block;
-    font-size: 0.85rem;
-    margin-top: 10px;
-    color: #dddddd;
+  display: block;
+  font-size: 0.85rem;
+  margin-top: 10px;
+  color: #dddddd;
+}
+
+.follow-us{
+  margin-bottom: 20px;
+}
+
+.social-icons a {
+  font-size: 1.2rem;
+  padding: 8px;
+  margin: 15px;
+  text-decoration: none;
+  /* color: white; */
+}
+
+.fa-facebook{
+  color: hsl(203, 30%, 26%);
+  font-size: 1.2rem;
+  padding: 8px;
+  margin: 15px;
+}
+
+.fa-facebook:hover {
+
+  transform: scale(1.5);
+  color:#3B5998;
+  transition: transform 0.2s ease, color 0.2s ease;
+}
+
+.fa-instagram{
+  color: hsl(203, 30%, 26%);
+  font-size: 1.2rem;
+  padding: 8px;
+  margin: 15px;
+}
+.fa-instagram:hover {
+  transform: scale(1.5);
+  color:#D62976;
+  transition: transform 0.2s ease, color 0.2s ease;
 }
+.fa-x-twitter{
+  color: hsl(203, 30%, 26%);
+  font-size: 1.2rem;
+  padding: 8px;
+  margin: 15px;
+
+}
+
+.fa-x-twitter:hover {
+  color:black;
+  transform: scale(1.5);
+  transition: transform 0.2s ease, color 0.2s ease;
+}
+
 
 .foot_panel4{
-    background-color: transparent;
-    color: white;
-    height: 160px;
-    font-size: 0.9rem;
-    text-align: center;
+  background-color: transparent;
+  /* color:hsl(203, 30%, 26%); */
+  height: 160px;
+  /* font-size: 0.9rem; */
+  text-align: center;
+  /* margin-bottom: 8px; */
 }
 
+
+
 .pages{
-    padding-top: 25px;
+  padding-top: 25px;
 }
 
 .copyright{
-   padding-top: 10px;
+  padding-top: 10px;
 }
 
 form {
@@ -418,7 +473,7 @@ textarea {
     font-size: 1.2rem;
     padding: 15px;
     text-decoration: none;
-    color: white;
+    color: hsl(203, 30%, 26%);
 }
 
 .fa-facebook:hover {
@@ -499,6 +554,10 @@ textarea {
         transform: translateY(-50%); /* Center the icon vertically */
         color: gray; /* Icon color */
     }
+.input-icon input, 
+.input-icon textarea {
+      padding-left: 30px; /* Adjust padding to create space for the icon */
+}
 
 #contactForm {
   display: flex;
@@ -518,6 +577,8 @@ textarea {
   border: none;
 }
 
+
+
 #contactForm h3 {
   height: 30px;
   color: #141414;

diff --git a/Css-files/style.css b/Css-files/style.css
@@ -455,7 +455,7 @@ ul a{
 
 .foot_panel4{
     background-color: rgb(66, 16, 16);
-    color: white;
+    color: hsl(203, 30%, 26%);
     height: 160px;
     font-size: 0.9rem;
     text-align: center;
@@ -518,13 +518,11 @@ textarea {
     font-size: 1.2rem;
     padding: 15px;
     text-decoration: none;
-    color: white;
-}
-.fb{
-    color: #1877F2;
-    cursor: pointer;
+    color: hsl(203, 30%, 26%) ;
 }
 
+
+
 .instagram{
     color: #dd4c8d;
     cursor: pointer;
@@ -781,3 +779,8 @@ input, textarea {
     }
 }
 
+
+fa-facebook:hover {
+    font-size: 2rem !important; /* Increase the size of the icon */
+    color: #4267B2;   /* Change the color to #4267B2 */
+}
diff --git a/Html-files/Electronic.html b/Html-files/Electronic.html
@@ -243,14 +243,57 @@
               margin-top: 10px;
               color: #dddddd;
           }
+          .fa-facebook{
+                color: white;
+                font-size: 1.2rem;
+                padding: 8px;
+                margin: 15px;
+            }
+
+            .fa-facebook:hover {
+
+                transform: scale(1.5);
+                color:#3B5998;
+                transition: transform 0.2s ease, color 0.2s ease;
+            }
+
+            .fa-instagram{
+                color: white;
+                font-size: 1.2rem;
+                padding: 8px;
+                margin: 15px;
+            }
+            .fa-instagram:hover {
+                transform: scale(1.5);
+                color:#D62976;
+                transition: transform 0.2s ease, color 0.2s ease;
+            }
+
+            .fa-x-twitter{
+                color: hsl(203, 30%, 26%);
+                font-size: 1.2rem;
+                padding: 8px;
+                margin: 15px;
+
+            }
+
+            .fa-x-twitter:hover {
+                color:black;
+                transform: scale(1.5);
+                transition: transform 0.2s ease, color 0.2s ease;
+            }
+
+
 
           .foot_panel4 {
               background-color: transparent;
-              color: white;
+              /* color: white; */
               height: 160px;
               font-size: 0.9rem;
               text-align: center;
-          }
+            }
+
+
 
           form {
               padding-top: 20px;
@@ -279,16 +322,33 @@
             background-color: rgb(196, 89, 89);
           }
 
-          .social-icons a {
-              font-size: 1.2rem;
-              padding: 15px;
-              text-decoration: none;
-              color: white;
-          }
-
-          .fa-facebook:hover { color: #3B5998; }
-          .fa-instagram:hover { color: #D62976; }
-          .fa-twitter:hover { color: #00B6F1; }
+
+.social-icons a {
+  font-size: 1.2rem;
+  padding: 8px;
+  margin: 15px;
+  text-decoration: none;
+  color: rgb(248, 243, 243);
+}
+
+.social-icons a:hover {
+  color: brown;
+  background-color: hsl(203%, 29%, 91%);
+  border-radius: 10px;
+  transform: scale(1.5); /* Increase size */
+  transition: transform 0.3s ease; /* Smooth transition effect */
+}
+.fa-brands.fa-facebook:hover {
+  color: #3B5998 !important;
+}
+
+.fa-brands.fa-instagram:hover {
+  color: #D62976 !important;
+}
+
+.fa-brands.fa-x-twitter:hover {
+  color: #181e20 !important;
+}
 
           #sr {
               display: none;
@@ -616,14 +676,15 @@ <h3 style="font-family: var(--ff-philosopher);color: black;">Contact Us!</h3>
 
         <div class="foot_panel4"  style="font-family: Garamond;">
             <div class="pages">
-                <h4 style="font-family: var(--ff-philosopher);color: black;">Follow Us</h4>
+                <h2 style="font-family: var(--ff-philosopher);color: black;">Follow Us</h2>
 
+
                 <div class="social-icons">
-                    <div class="social-icons">
-                        <a class="fa-brands fa-facebook" href="https://facebook.com" target="_blank"></a>
-                        <a class="fa-brands fa-instagram" href="https://instagram.com" target="_blank"></a>
-                        <a class="fa-brands fa-x-twitter" href="https://twitter.com" target="_blank"></a>
-                    </div>
+                    <a class="fa-brands fa-facebook" href="https://facebook.com" style="color: hsl(203, 29%, 91%);"></a>
+                    <a class="fa-brands fa-instagram" href="https://instagram.com" style="color: hsl(203, 29%, 91%);"></a>
+                    <a class="fa-brands fa-x-twitter" href="https://twitter.com" style="color: hsl(203, 29%, 91%);"></a>
+                </div>
+
                 </div>
                 <p style="margin-bottom:0;font-family: var(--ff-philosopher);color: white;">Stay connected with us on social media for the latest updates, latest collection, and vintage adventures.
                 </p>

diff --git a/Html-files/cart.html b/Html-files/cart.html
@@ -242,7 +242,7 @@
       border: 3px solid whitesmoke;
     }
   </style>
-</head>
+  </head>
 
 <body>
   <div id="preloader">
@@ -405,15 +405,19 @@ <h4 style="color: hsl(203, 30%,26%);font-family: var(--ff-philosopher);">Follow
 
         <div class="foot_panel4">
             <div class="pages">
-                <h4 style="color: hsl(203, 30%,26%);font-family: var(--ff-philosopher);">Follow Us</h4>
+                <h4 style="color: hsl(203, 30%,26%);font-family: var(--ff-philosopher); margin: 10px;">Follow Us</h4>
                 <div class="social-icons">
-                    <i class="fa-brands fa-facebook"></i>&nbsp;&nbsp;&nbsp;&nbsp;
-                    <i class="fa-brands fa-instagram"></i>&nbsp;&nbsp;&nbsp;&nbsp;
-                    <i class="fa-brands fa-x-twitter"></i>&nbsp;&nbsp;&nbsp;
-                </div>
-                <p style="margin-bottom:0;font-family: var(--ff-philosopher);">Stay connected with us on social media for the latest updates, latest collection, and vintage adventures.
+
+
+                  <a class="fa-brands fa-facebook" href="https://facebook.com" style="color: hsl(203, 30%, 26%);"></a>
+                  <a class="fa-brands fa-instagram" href="https://instagram.com" style="color: hsl(203, 30%, 26%);"></a>
+                  <a class="fa-brands fa-x-twitter" href="https://twitter.com" style="color: hsl(203, 30%, 26%);"></a>
+
+              </div>
+
+                <p style="margin-bottom:0;font-family: var(--ff-philosopher); margin-top: 5px;">Stay connected with us on social media for the latest updates, latest collection, and vintage adventures.
                 </p>
-                <div class="copyright" style="color: hsl(203, 30%,26%);font-family: var(--ff-philosopher);">
+                <div class="copyright" style="color: hsl(203, 30%,26%);font-family: var(--ff-philosopher); margin: 3px;">
                     © 2024 Retro . All Rights Reserved. | <span id="author">
                         <a href="https://www.linkedin.com" target="_blank" style="text-decoration: none;">Retro Team</a>
                     </span><p></p>