Merge branch 'CodeChefVIT:master' into master

CodeChefVIT · Feb 29, 2024 · aec9328 · aec9328
2 parents 70b7319 + 37b110a
commit aec9328
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/devsoc24-landing/src/components/main.tsx b/devsoc24-landing/src/components/main.tsx
@@ -28,7 +28,9 @@ const timelineTexts = [
   "Coming Soon!",
   "Coming Soon!",
   "Coming Soon!",
-  "Coming Soon!"
+  "Coming Soon!",
+  "Coming Soon!",
+  "Coming Soon!",
 ];
 
 function Main() {
@@ -225,8 +227,8 @@ function Main() {
         </div>
       </motion.div>
       <motion.div className="relative">
-        <div className="flex h-[1000px] items-center justify-center overflow-hidden bg-[#020202]">
-          <div className="font-disket min-w-screen min-w-screen overflow-hidden bg-[#020202]">
+        <div className="flex h-fit items-center justify-center bg-[#020202]">
+          <div className="font-disket min-w-screen overflow-hidden bg-[#020202]">
             <motion.span style={{ y: y }} className="relative block">
               <Image
                 className="absolute left-60 top-[1100px]"
@@ -245,7 +247,7 @@ function Main() {
                 width={100}
               />
             </motion.span>
-            <div className="h-[1080px] w-full flex-wrap overflow-x-auto">
+            <div className="h-fit w-full flex-wrap overflow-hidden">
               <div className="mt-48 flex w-full justify-center max-sm:mt-10">
                 <Image
                   className="mx-20"
@@ -272,9 +274,9 @@ function Main() {
               <div className="mt-14 flex w-full justify-center max-sm:mt-3">
                 <LearnMoreBtn link={""} />
               </div>
-              <div className="container flex h-fit flex-wrap items-center justify-center gap-10 max-sm:pt-32 max-xl:pt-16 max-md:pt-4 text-center max-[415px]:pt-4 xl:pt-32" id="timeline-section">
+              <div className="container flex h-fit flex-wrap items-center justify-center gap-10 max-sm:pt-32 max-xl:pt-16 max-md:pt-4 text-center max-[415px]:pt-4 xl:pt-32 mb-32" id="timeline-section">
                 {showBoxes &&
-                  Array.from({ length: 6 }).map((_, index) => (
+                  Array.from({ length: 8 }).map((_, index) => (
                     <motion.div
                       key={index}
                       initial={{ opacity: 0, y: 20 }}

diff --git a/devsoc24-landing/src/components/terminal/page.tsx b/devsoc24-landing/src/components/terminal/page.tsx
@@ -378,7 +378,6 @@ const Terminal = () => {
 
   useEffect(() => {
     const helpOutput = commandOutputs.initial ?? [];
-
     const displayOutput = helpOutput.map(() => "");
     setCommands([{ command: "initial", output: helpOutput, displayOutput }]);
   }, []);
@@ -439,7 +438,7 @@ const Terminal = () => {
             <div className="command-line font-diatype ">
               <span className="font-diatype ">
                 [email protected]
-                {selectedComponent === "DEVSOC 2024"
+                {selectedComponent === "DEVSOC 2024" || !selectedComponent
                   ? ""
                   : "/" + selectedComponent?.toString().toLowerCase()}
                 &nbsp;~ %&nbsp;
@@ -461,7 +460,7 @@ const Terminal = () => {
           <div id="liner" className="ml-[10px] flex-1">
             <span className="font-diatype ">
               [email protected]
-              {selectedComponent === "DEVSOC 2024"
+              {selectedComponent === "DEVSOC 2024" || !selectedComponent
                 ? ""
                 : "/" + selectedComponent?.toString().toLowerCase()}
               &nbsp;~ %&nbsp;

diff --git a/devsoc24-landing/src/pages/terminal.tsx b/devsoc24-landing/src/pages/terminal.tsx
@@ -204,7 +204,7 @@ export default function Home() {
               </div>
               <div className="flex flex-col-reverse md:flex-row">
                 {showTerminal ? (
-                  <div className="bottom-0 z-50 md:relative md:min-h-[96vh] w-[95vw] md:w-[20vw]">
+                  <div className="bottom-0 z-50 md:relative min-h-[96vh] w-[20vw]">
                     <Terminal />
                   </div>
                 ) : (