fixes merge conflicts

Author: tyrelchambers

src/components/JourneyCards/JourneyCards.astro

@@ -92,36 +92,39 @@ const columns = [
 ]
 ---
 
-<div class="journey-cards">
-  {
-    columns.map((column) => (
-      <div class="journey-column">
-        <header class="column-header">
-          <Typography variant="h5" className="column-title">
-            {column.title}
-          </Typography>
-        </header>
-        {column.items.map((item) => (
-          <a href={item.href} class="journey-card">
-            <div class="card-content">
-              <Typography variant="body-semi">{item.title}</Typography>
-              <Typography variant="body-s" color="muted">
-                {item.description}
-              </Typography>
-            </div>
-
-            <footer class="journey-footer">
-              <Tag size="sm" className="footer-tag">
-                <Typography variant="code-s">{item.badge}</Typography>
-              </Tag>
-              <img src="/assets/icons/upper-right-arrow.svg" class="footer-icon" />
-            </footer>
-          </a>
-        ))}
-      </div>
-    ))
-  }
-</div>
+<section>
+  <Typography variant="h4" className="section-title">Start your Chainlink journey</Typography>
+  <div class="journey-cards">
+    {
+      columns.map((column) => (
+        <div class="journey-column">
+          <header class="column-header">
+            <Typography variant="h5" className="column-title">
+              {column.title}
+            </Typography>
+          </header>
+          {column.items.map((item) => (
+            <a href={item.href} class="journey-card">
+              <div class="card-content">
+                <Typography variant="body-semi">{item.title}</Typography>
+                <Typography variant="body-s" color="muted">
+                  {item.description}
+                </Typography>
+              </div>
+
+              <footer class="journey-footer">
+                <Tag size="sm" className="footer-tag">
+                  <Typography variant="code-s">{item.badge}</Typography>
+                </Tag>
+                <img src="/assets/icons/upper-right-arrow.svg" class="footer-icon" />
+              </footer>
+            </a>
+          ))}
+        </div>
+      ))
+    }
+  </div>
+</section>
 
 <style>
   .journey-cards {
@@ -165,6 +168,11 @@ const columns = [
     justify-content: space-between;
   }
 
+  .section-title {
+    font-size: 32px;
+    margin-bottom: var(--space-10x);
+  }
+
   .footer {
     padding-top: var(--space-1x);
   }

src/pages/index.astro

@@ -4,10 +4,8 @@ import JourneyCards from "~/components/JourneyCards/JourneyCards.astro"
 import BaseLayout from "~/layouts/BaseLayout.astro"
 
 import * as CONFIG from "../config"
-import { Typography } from "@chainlink/blocks"
-import CardsWrapper from "~/components/Cards/CardsWrapper.astro"
-import type { ICard } from "~/components/Cards/types"
 import Demos from "~/components/Demos.astro"
+import { Typography } from "@chainlink/blocks"
 
 const formattedContentTitle = `${CONFIG.PAGE.titleFallback} | ${CONFIG.SITE.title}`
 ---
@@ -22,21 +20,24 @@ const formattedContentTitle = `${CONFIG.PAGE.titleFallback} | ${CONFIG.SITE.titl
         <ProductTabs />
       </div>
     </div>
-
-    <Demos />
-
-    <div class="recommended">
-      <h4>Recommended reading</h4>
-      <h2>We think you'd love to explore</h2>
-      <div>
-        <a href="/getting-started/conceptual-overview">General</a>
-        <a href="/resources/link-token-contracts">Link Token Contracts</a>
-        <a href="/ccip/getting-started">Getting Started with CCIP</a>
-        <a href="/ccip/directory">CCIP Directory</a>
-        <a href="/data-feeds/price-feeds/addresses">Data Feed Addresses</a>
-        <a href="/data-feeds/smartdata/addresses">SmartData Feed Addresses</a>
-        <a href="/data-streams/getting-started-hardhat">Getting Started with Data Streams</a>
-        <a href="/data-streams/crypto-streams">Data Streams Addresses</a>
+    <div class="wrapper">
+      <JourneyCards />
+
+      <Demos />
+
+      <div class="recommended">
+        <h4>Recommended reading</h4>
+        <h2>We think you'd love to explore</h2>
+        <div>
+          <a href="/getting-started/conceptual-overview">General</a>
+          <a href="/resources/link-token-contracts">Link Token Contracts</a>
+          <a href="/ccip/getting-started">Getting Started with CCIP</a>
+          <a href="/ccip/directory">CCIP Directory</a>
+          <a href="/data-feeds/price-feeds/addresses">Data Feed Addresses</a>
+          <a href="/data-feeds/smartdata/addresses">SmartData Feed Addresses</a>
+          <a href="/data-streams/getting-started-hardhat">Getting Started with Data Streams</a>
+          <a href="/data-streams/crypto-streams">Data Streams Addresses</a>
+        </div>
       </div>
     </div>
   </main>
@@ -141,15 +142,6 @@ const formattedContentTitle = `${CONFIG.PAGE.titleFallback} | ${CONFIG.SITE.titl
     background-color: var(--blue-100);
   }
 
-  .section-title {
-    font-size: 32px;
-    margin-bottom: var(--space-10x);
-  }
-
-  .section {
-    margin: 0 var(--space-6x);
-  }
-
   .wrapper {
     display: flex;
     flex-direction: column;