fixed conflict

nexlabsweb3 · Dec 2, 2024 · 0c5a664 · 0c5a664
2 parents 7c3208e + 8ec80d6
commit 0c5a664
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 15 deletions.
diff --git a/frontend/public/HeroBottomBg.png b/frontend/public/HeroBottomBg.png
diff --git a/frontend/public/HeroTopBg.png b/frontend/public/HeroTopBg.png
diff --git a/frontend/public/Landing page.png b/frontend/public/Landing page.png
diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx
@@ -25,10 +25,7 @@ export default function RootLayout({
       </head>
       <body
         className={`${inter.className} ${poppins.variable}
-         ${bowlby_one.variable} ${roboto.variable} 
-         bg-secondary-light dark:bg-secondary 
-         text-textPrimary-light dark:text-textPrimary
-         transition-colors duration-200`}
+         ${bowlby_one.variable} ${roboto.variable} bg-secondary `}
       >
         <StarknetProvider>
           <AlertProvider>

diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
@@ -10,8 +10,16 @@ export default function Home() {
 
   return (
     <Layout>
-      <HeroSection />
-      <ContentSection />
+      <main className="">
+        <section className="bg-mainBg bg-cover lg:pt-36 pb-5">
+          <header className="container mx-auto">
+            <HeroSection />
+          </header>
+        </section>
+        <main className="">
+          <ContentSection />
+        </main>
+      </main>
     </Layout>
   );
 }
diff --git a/frontend/src/components/ContentSection.tsx b/frontend/src/components/ContentSection.tsx
@@ -12,11 +12,19 @@ import ScanButton from './ScanButton';
 import { poppins, roboto } from '@/app/fonts';
 
 const ContentSection = () => (
-  <section className="my-[7.5rem] md:my-[6.5rem]">
-    <ContentHeader />
-    <ContentCTA />
-    <ContentCTAMobile />
-    <GuideContent />
+  <section className="">
+    <div className="bg-manufacturer-bg bg-cover bg-center py-10">
+      <div className="container mx-auto">
+        <ContentHeader />
+        <ContentCTA />
+        <ContentCTAMobile />
+      </div>
+    </div>
+    <div className="bg-HeroBottomBg bg-cover">
+      <div className="mx-auto container">
+        <GuideContent />
+      </div>
+    </div>
   </section>
 );
 
@@ -141,7 +149,7 @@ const AuthenticityParagraph = () => (
 const GuideContent = () => (
   <div
     className={`relative flex flex-col lg:flex-row justify-center
-      items-center gap-6 lg:gap-32 my-28 px-8
+      items-center gap-6 lg:gap-32 mb-28 px-8
       shadow-2xl rounded-2xl bg-[#232323] py-12
       lg:shadow-none lg:rounded-none lg:bg-inherit lg:py-0`}
   >

diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
@@ -17,9 +17,9 @@ const NavBar = (props: any) => {
   return (
     <nav
       className={`flex items-center justify-between px-4 lg:px-20
-        xl:px-0 2xl:px-0 py-4 mb-12 container mx-auto font-roboto
-        bg-white/90 dark:bg-[#1e1e1e]/80 backdrop-blur-sm sticky top-0 z-10
-        lg:static lg:bg-none`}
+        xl:px-0 2xl:px-0 py-4 mb-4 container mx-auto font-roboto
+        bg-[#1e1e1e]/80 backdrop-blur-sm sticky top-0 z-10
+        lg:absolute lg:left-[50%] lg:right-[50%] lg:bg-transparent lg:-translate-x-[50%] lg:pt-10`}
       {...props}
     >
       <div className="flex items-center gap-14">

diff --git a/frontend/tailwind.config.ts b/frontend/tailwind.config.ts
@@ -9,6 +9,9 @@ const config: Config = {
   theme: {
     extend: {
       backgroundImage: {
+        mainBg: "url('/HeroTopBg.png')",
+        HeroMidBg: "url('/manufacturer-bg.png')",
+        HeroBottomBg: "url('/HeroBottomBg.png')",
         hero: "url('/hero-bg.png')",
         producer: "url('/producer-bg.png')",
         'hero-2': "url('/hero-bg-mobile.png')",