Merge branch 'master' of https://github.com/Antima2004/ice-cream-parl…

…our-website
DharshiBalasubramaniyam · Nov 4, 2024 · 4c86cf3 · 4c86cf3
2 parents 8d80796 + 3681770
commit 4c86cf3
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/login.html b/login.html
@@ -55,8 +55,13 @@
     <!-- scroll progress -->
     <div class="scroll-progress"></div>
 
+<<<<<<< HEAD
      <!-- back to home page -->
      <a href="./index.html" class="homeBtn">
+=======
+    <!-- back to home page -->
+    <a href="index.html" class="homeBtn">
+>>>>>>> 368177064ff9707165a138e343927ad1f11c1dfc
         <i class="fas fa-home"></i>
       </a>
 

diff --git a/styles/login-signup.css b/styles/login-signup.css
@@ -1,4 +1,5 @@
 body {
+<<<<<<< HEAD
   padding: 25px 15px;
   display: flex;
   align-items: center;
@@ -25,8 +26,37 @@ body {
 .homeBtn:hover {
   background: #ffabd2;
   color: #ffffff;
+=======
+    padding: 25px 15px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    min-height: 100dvh;
+    background: linear-gradient(to top, var(--body-color), #ffabd2);
+>>>>>>> 368177064ff9707165a138e343927ad1f11c1dfc
 }
 
+.homeBtn {
+    position: absolute;
+    top: 20px;
+    left: 20px;
+    background: #ffffff;
+    color: #000000;
+    padding: 10px;
+    border-radius: 10px;
+    cursor: pointer;
+    transition: 0.3s;
+    text-decoration: none;
+    z-index: 10;
+  }
+
+
+  .homeBtn:hover {
+    background: #ffabd2;
+    color: #ffffff;
+  }
+
 #logo {
   display: flex;
   justify-content: center;