Merge pull request #49 from Abh1noob/master

feat: bg fix and remove kachra
CodeChefVIT · Feb 27, 2024 · 8044239 · 8044239
2 parents 9b8ae67 + 8358b82
commit 8044239
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 33 deletions.
diff --git a/devsoc24-landing/src/components/Timeline.tsx b/devsoc24-landing/src/components/Timeline.tsx
@@ -10,7 +10,7 @@ const Timeline: React.FC = () => {
   const y = useTransform(scrollYProgress, [0, 1], [0, -3250]);
   return (
     <div className="flex h-[1000px] items-center justify-center bg-[#020202]">
-      <div className="bg-logo font-disket overflow-hidden bg-[#020202]">
+      <div className="font-disket overflow-hidden bg-[#020202]">
         <motion.span style={{ y: y }} className="relative block">
           <Image
             className="absolute left-60 top-[1100px]"

diff --git a/devsoc24-landing/src/components/actionButton.tsx b/devsoc24-landing/src/components/actionButton.tsx
diff --git a/devsoc24-landing/src/components/main.tsx b/devsoc24-landing/src/components/main.tsx
@@ -38,7 +38,7 @@ function Main() {
     const intervals = [2000, 400, 600, 400];
     const timer = setTimeout(() => {
       setClassName(
-        "relative min-h-screen min-w-screen overlay_hero bg-span font-disket overflow-hidden flex flex-col items-center justify-center",
+        "relative min-h-screen min-w-screen overlay_hero bg-span font-disket overflow-hidden flex flex-col items-center justify-center z-50",
       );
     }, 400);
 
@@ -98,7 +98,7 @@ function Main() {
             />
           </div>
 
-          <div className="absolute top-6 m-0 w-full p-0">
+          <div className="absolute top-6 m-0 w-full p-0 z-50">
             <div className="flex items-center justify-center">
               <div className="relative hidden w-[33%] items-center justify-evenly lg:flex">
                 <div>
@@ -197,7 +197,7 @@ function Main() {
       </motion.div>
       <motion.div className="relative z-30">
         <div className="flex h-[1000px]  items-center justify-center overflow-hidden bg-[#020202]">
-          <div className="bg-logo font-disket overflow-hidden bg-[#020202]">
+          <div className="font-disket overflow-hidden bg-[#020202]">
             <motion.span style={{ y: y }} className="relative block">
               <Image
                 className="absolute left-60 top-[1100px]"

diff --git a/devsoc24-landing/src/pages/index.tsx b/devsoc24-landing/src/pages/index.tsx
@@ -1,12 +1,13 @@
 import React, { useState, useEffect } from "react";
 import Timeline from "@/components/Timeline";
 import About from "@/components/about";
-import ActionButton from "@/components/actionButton";
 import Main from "@/components/main";
 import SmoothScrolling from "@/components/smoothscrolling";
 import TypewriterEffect from "@/components/terminal/typewriter";
 import useGlitchStore from "@/store/store";
 import Footer from "@/components/footer";
+import bgimage from "@/assets/images/DEVSOCLOGOBIG.svg";
+import Image from "next/image";
 
 const help = [
   '<span class="">Initiating quantum decryption sequence...</span>',
@@ -56,10 +57,14 @@ export default function Home() {
             </div>
           ) : (
             <>
-              <Main />
-              <About />
-              <div className="fixed bottom-0 z-40 mb-10 flex w-full justify-center">
-                <ActionButton body="Kuch toh" link="/" />
+              <div className="fixed z-40 flex h-screen items-center justify-center">
+                <Image src={bgimage} alt="bg" />
+              </div>
+              <div className="z-50">
+                <Main />
+              </div>
+              <div className="">
+                <About />
               </div>
             </>
           )}

diff --git a/devsoc24-landing/src/styles/globals.css b/devsoc24-landing/src/styles/globals.css
@@ -222,12 +222,15 @@ html.lenis {
 }
 /* **************************************************************** */
 
-.bg-logo {
+/* Not Required Anymore */
+/* **************************************************************** */
+/* .bg-logo {
   background-image: url("../assets/images/DEVSOCLOGOBIG.svg");
   background-size: contain;
   background-repeat: no-repeat;
   background-position: center;
-}
+} */
+/* **************************************************************** */
 
 /* textarea {
   left: -1000px;