Skip to content

Commit 6ca4cc4

Browse files
committed
Issue #9: More consistent margins, spacing across the site
1 parent 6946213 commit 6ca4cc4

File tree

6 files changed

+20
-16
lines changed

6 files changed

+20
-16
lines changed

src/components/Header.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const currentPath = Astro.url.pathname;
99
---
1010

1111
<header class="sticky top-0 z-50 w-full bg-background/95 backdrop-blur-sm border-b supports-[backdrop-filter]:bg-background/60">
12-
<div class="flex h-16 items-center gap-8 p-8">
12+
<div class="flex h-16 items-center gap-8 py-8 px-16">
1313
<!-- Left Section: Logo + Navigation -->
1414
<div class="flex items-center gap-8 whitespace-nowrap">
1515
<MobileNav />

src/components/blockopensource/FooterBlockOS.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const currentYear = new Date().getFullYear();
1111
const copyrightText = footerBlockOSData.copyright || `© ${currentYear} ${footerBlockOSData.companyName}. All rights reserved.`;
1212
---
1313

14-
<footer class="bg-background border-t border-border mx-8 py-8">
14+
<footer class="bg-background border-t border-border mx-16 pt-8 pb-16">
1515
<div class="container mx-0 px-0">
1616
<div class="flex flex-col lg:flex-row lg:items-start gap-8 lg:gap-0 mb-12 md:mb-8">
1717
<!-- Block Logo and Name - Left Side -->
@@ -57,7 +57,7 @@ const copyrightText = footerBlockOSData.copyright || `© ${currentYear} ${footer
5757
</div>
5858

5959
<!-- Footer Bottom -->
60-
<div class="mt-8">
60+
<div class="mt-16">
6161
<div class="flex justify-between items-center gap-4 md:flex-col md:text-center md:gap-6">
6262
<div class="text-sm text-muted-foreground">
6363
{copyrightText}

src/components/blog/BlogSection.astro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ const getAuthorName = (authorId: string) => {
7373
---
7474

7575
<section class={`bg-grey-50 text-foreground ${sectionClasses}`}>
76-
<div class="container min-w-0 py-8 px-6 mx-auto sm:px-25 sm:py-6">
76+
<div class="container px-0 mx-0">
7777

7878
<!-- Modern Layout Header -->
7979
{layout === 'modern' && (
80-
<div class="flex flex-col mb-24 mx-auto md:mb-18">
81-
<h1 class="mb-2">{title}</h1>
80+
<div class="flex flex-col mb-24 mx-auto md:mb-18 pt-0 mt-0">
81+
<h1 class="mb-2 mt-4">{title}</h1>
8282

8383
{description && (
8484
<p class="text-lg leading-relaxed text-muted-foreground m-0 md:text-base">{description}</p>

src/layouts/ContentPageLayout.astro

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const { title, description, headings, showTitleAsH1 = true, showBreadcrumbs = tr
3939
---
4040

4141
<BaseLayout title={title} description={description}>
42-
<div class="relative mx-8 px-0 min-h-[calc(100vh-4rem)]">
42+
<div class="relative mx-18 px-0 min-h-[calc(100vh-4rem)]">
4343

4444
<div class={`
4545
relative min-h-[calc(100vh-64px)] max-w-[2400px]
@@ -63,12 +63,12 @@ const { title, description, headings, showTitleAsH1 = true, showBreadcrumbs = tr
6363
</nav>
6464
)}
6565

66-
<main class="container min-w-0 py-0 px-0">
66+
<main class="container min-w-0 py-8 px-0">
6767
<div id="mainContent" class="prose prose-slate dark:prose-invert">
6868

6969
{/** Breadcrumbs */}
7070
{showBreadcrumbs && (
71-
<div class="mb-6 mt-2">
71+
<div class="mb-8 mt-0">
7272
<Breadcrumbs
7373
indexText="Home"
7474
mainBemClass="c-breadcrumbs"
@@ -94,7 +94,7 @@ const { title, description, headings, showTitleAsH1 = true, showBreadcrumbs = tr
9494

9595
{headings && headings.length > 0 && (
9696
<aside class="relative bg-background/80 backdrop-blur-sm hidden xl:block">
97-
<div class="sticky top-32 h-fit py-6 px-6">
97+
<div class="sticky top-32 h-fit mb-16 py-6 px-6">
9898
<TableOfContents headings={headings} />
9999
</div>
100100
</aside>

src/pages/blog/[...slug].astro

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import AuthorCard from '@/components/blog/AuthorCard.astro';
77
import MDXComponents from '@/components/mdx/MDXComponents';
88
import "@/styles/breadcrumbs.css";
99
import { Image } from "astro:assets";
10-
import { getUrlRelativeToBase } from "@/lib/utils";
1110
1211
/**
1312
* Magic required function for dynamic routes; deteremines the slug
@@ -61,7 +60,7 @@ if (!images[imagePath]) throw new Error(`"${imagePath}" does not exist`);
6160
maxWidth="wide"
6261
showTitleAsH1={false}>
6362

64-
<div class="flex flex-col lg:flex-row mb-2 border rounded-md bg-muted overflow-hidden">
63+
<div class="flex flex-col lg:flex-row mt-8 mb-8 border rounded-md bg-muted overflow-hidden">
6564

6665
<div class="flex-1 ml-6 lg:ml-6 ml-0 p-4 lg:p-6">
6766
<h1 class="pb-0 mb-0 text-muted-background leading-tight">{title}</h1>
@@ -82,5 +81,7 @@ if (!images[imagePath]) throw new Error(`"${imagePath}" does not exist`);
8281
</div>
8382
)}
8483
</div>
85-
<Content components={MDXComponents} />
84+
<div class="mb-16">
85+
<Content components={MDXComponents} />
86+
</div>
8687
</ContentPageLayout>

src/pages/blog/index.astro

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
import BaseLayout from "@/layouts/BaseLayout.astro";
2+
import ContentPageLayout from "@/layouts/ContentPageLayout.astro";
33
import BlogSection from "@/components/blog/BlogSection.astro"
44
import { getCollection } from "astro:content";
55
@@ -16,7 +16,9 @@ const postCategories = [...new Set(posts.flatMap(post => post.data.tags || []))]
1616
allCategories.push(...postCategories.map(cat => cat.charAt(0).toUpperCase() + cat.slice(1)));
1717
---
1818

19-
<BaseLayout title={title} description="Thoughts from the project team">
19+
<ContentPageLayout title={title}
20+
showBreadcrumbs={false}
21+
showTitleAsH1={false}>
2022

2123
<BlogSection
2224
title={title}
@@ -31,4 +33,5 @@ allCategories.push(...postCategories.map(cat => cat.charAt(0).toUpperCase() + ca
3133
categories={allCategories}
3234
activeCategory="All"
3335
/>
34-
</BaseLayout>
36+
37+
</ContentPageLayout>

0 commit comments

Comments
 (0)