fix: merge confilct (#290)

Author: Marvelousmicheal

app/(landing)/blog/page.tsx

@@ -7,6 +7,7 @@ import TestimonialSection from '@/components/testimonials/TestimonialsSection';
 import { testimonials } from '@/components/testimonials/data/testimonial';
 import { Skeleton } from '@/components/ui/skeleton';
 import BlogCardSkeleton from '@/components/landing-page/blog/BlogCardSkeleton';
+import BlogHero from '@/components/landing-page/blog/BlogHero';
 
 export const metadata: Metadata = generatePageMetadata('blog');
 
@@ -64,6 +65,7 @@ function BlogGridLoading() {
 const BlogPage = async () => {
   return (
     <div className='min-h-screen bg-[#030303]'>
+      <BlogHero />
       <Suspense fallback={<BlogGridLoading />}>
         <StreamingBlogGridWrapper />
       </Suspense>

components/landing-page/blog/BlogHero.tsx

@@ -0,0 +1,36 @@
+function BlogHero() {
+  return (
+    <section className='relative mx-auto flex min-h-[500px] max-w-6xl flex-col justify-center gap-6 overflow-hidden px-5 pb-[50px] md:gap-[52px] md:px-0'>
+      <main className='flex flex-col items-start justify-between gap-6 md:flex-row md:items-end md:gap-0'>
+        <h1 className='text-[32px] font-normal text-white md:text-5xl'>
+          <span className='mb-1 bg-gradient-to-r from-[#3AE6B2] to-[#A7F95080] bg-clip-text text-transparent'>
+            Insights That Matter
+          </span>
+          <br />
+          Stories From Boundless
+        </h1>
+
+        <main className='w-full md:w-[429px]'>
+          <p className='text-base font-normal text-white'>
+            {' '}
+            News, updates, and thought pieces crafted to keep you ahead in the
+            Boundless ecosystem.
+          </p>
+        </main>
+      </main>
+      <main className='bg-primary flex flex-col items-center justify-between rounded-[10px] py-2.5 pr-2.5 pl-6 md:w-[570px] md:flex-row'>
+        <p className='text-background text-base font-medium'>
+          Never miss important updates
+        </p>
+        <button
+          type='button'
+          className='bg-background rounded-[10px] px-6 py-2 text-base font-medium text-white transition hover:opacity-90'
+        >
+          Subscribe to Our Newsletter
+        </button>
+      </main>
+    </section>
+  );
+}
+
+export default BlogHero;