From 2a900ce835ee2cb0887026f83c9e8b77e644d3fe Mon Sep 17 00:00:00 2001
From: Lewis Dale <lewis.dale@fortacode.co.uk>
Date: Fri, 12 Apr 2024 07:42:01 +0100
Subject: [PATCH] Undo nav changes, increase paragraph text size

---
 src/_includes/base.njk                     | 28 ++++++++++------------
 src/blog/index.html                        |  2 +-
 src/css/exceptions/callout.css             |  5 +++-
 src/css/exceptions/color-scheme-picker.css |  4 +---
 src/css/exceptions/home.css                |  4 ++--
 src/css/exceptions/nav-container.css       |  4 ----
 src/css/globals.css                        | 13 ++++------
 src/index.html                             |  4 +---
 8 files changed, 27 insertions(+), 37 deletions(-)
 delete mode 100644 src/css/exceptions/nav-container.css
diff --git a/src/_includes/base.njk b/src/_includes/base.njk
index 5707192..ba88cb2 100644
--- a/src/_includes/base.njk
+++ b/src/_includes/base.njk
@@ -41,23 +41,21 @@
 		{% ogImage "./src/_includes/components/ogImage.njk", { title: pageTitle or title, subTitle: description } %}
 	</head>
 	<body>
-		<header>
+		<header class="wrapper-lg row space-between">
 			<a href="/" class="site-title">LD</a>
-			<div class="nav-container wrapper-lg row space-between w-full">
-					<nav>
-						<ul class="row" role='list'>
-							<li><a href="/">Home</a></li>
-							<li><a href="/blog">Blog</a></li>
-							<li><a href="/blogroll">Blogroll</a></li>
-							<li><a href="/events/2024">Events</a></li>
-							<li><a href="/links">Links</a></li>
-						</ul>
-					</nav>
+			<nav>
+				<ul class="row" role='list'>
+					<li><a href="/">Home</a></li>
+					<li><a href="/blog">Blog</a></li>
+					<li><a href="/blogroll">Blogroll</a></li>
+					<li><a href="/events/2024">Events</a></li>
+					<li><a href="/links">Links</a></li>
+				</ul>
+			</nav>
 
-					<a href="/feed/" class="rss" aria-label="RSS feed">
-						<i class="fa-solid fa-rss"></i>
-					</a>
-			</div>
+			<a href="/feed/" class="rss" aria-label="RSS feed">
+				<i class="fa-solid fa-rss"></i>
+			</a>
 			<fieldset class="color-scheme">
 				<legend>Change your colour scheme</legend>
 				<label>
diff --git a/src/blog/index.html b/src/blog/index.html
index 8e8068f..9e8b13a 100644
--- a/src/blog/index.html
+++ b/src/blog/index.html
@@ -22,7 +22,7 @@ eleventyImport:
         <li class="stack-xs">
             <h2><a href="{{ item.url }}">{{ item.data.title | safe }}</a></h2>
             <time class="block" datetime="{{ item.date | dateToRfc3339 }}">{{ item.date | dateDisplay }}</time>
-            <div class="e-content p-summary">{{ item.content | excerpt }}</div>
+            <p class="e-content p-summary">{{ item.content | excerpt }}</p>
             <a href="{{ item.url }}" class="inline-block">Read more</a>
         </li>
         {% endfor %}
diff --git a/src/css/exceptions/callout.css b/src/css/exceptions/callout.css
index 849817f..b84b5d2 100644
--- a/src/css/exceptions/callout.css
+++ b/src/css/exceptions/callout.css
@@ -4,6 +4,9 @@
     border-radius: 10px;
     color: var(--color-primary);
     height: fit-content;
-    max-width: 60ch;
     padding: var(--space-size-xs);
+    text-align: center;
+    p {
+        margin: 0 auto;
+    }
 }
\ No newline at end of file
diff --git a/src/css/exceptions/color-scheme-picker.css b/src/css/exceptions/color-scheme-picker.css
index 9e18d40..ecb67a0 100644
--- a/src/css/exceptions/color-scheme-picker.css
+++ b/src/css/exceptions/color-scheme-picker.css
@@ -4,9 +4,7 @@
 	padding: 0;
 	display: flex;
 	gap: var(--space-size-xs);
-	/* grid-column: auto/span 2; */
-	justify-content: end;
-	width: 100%;
+	justify-content: flex-end;
 
 	legend {
 		position:absolute;
diff --git a/src/css/exceptions/home.css b/src/css/exceptions/home.css
index ddda52f..a12562b 100644
--- a/src/css/exceptions/home.css
+++ b/src/css/exceptions/home.css
@@ -29,7 +29,7 @@
     font-weight: 300;
   }
 
-  p {
+  /* p {
     max-width: 50ch;
-  }
+  } */
 }
diff --git a/src/css/exceptions/nav-container.css b/src/css/exceptions/nav-container.css
deleted file mode 100644
index 46a623f..0000000
--- a/src/css/exceptions/nav-container.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.nav-container {
-    --grid-item-size: clamp(30rem, 70vw, var(--screen-lg));
-    grid-column: auto / span 4;
-}
\ No newline at end of file
diff --git a/src/css/globals.css b/src/css/globals.css
index d80fbb9..2be0c18 100644
--- a/src/css/globals.css
+++ b/src/css/globals.css
@@ -153,18 +153,15 @@ nav {
 }
 
 header {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(var(--grid-item-size, clamp(2rem, 10vw, 10rem)), 1fr));
-    grid-gap: 10px;
-    padding: var(--space-size-m);
-    place-items: center;
-    justify-content: center;
-    width: 100%;
+   flex-wrap: wrap;
+   padding-top: var(--space-size-s);
+   padding-bottom: var(--space-size-s);
 }
 
 p {
     line-height: 1.6;
-    max-width: 65ch;
+    max-width: 70ch;
+    text-wrap: balance;
 
     &:has(> picture) {
         max-width: 100%;
diff --git a/src/index.html b/src/index.html
index c9608f0..1196271 100644
--- a/src/index.html
+++ b/src/index.html
@@ -15,12 +15,10 @@ layout: base.njk
 			</p>
 		</aside>
 
-		{% image metadata.author.avatar, "My face", "box circle u-photo", "300px", [300] %}
-
 		<p class="inline-block max-w-[45ch] p-note">
 			I'm a software engineer who loves building things for the web. I consider myself a generalist, but on a given day I'll probably be working with Typescript, HTML and CSS, and on occasion a touch of .NET. I work for <a href="https://triptease.com" target="_blank" rel="noreferrer" class="p-org">Triptease</a> as a Senior Software Engineer, and on the side I'm learning Rust by building a <a href="/post/creating-a-sinclair-basic-interpreter/">Sinclair BASIC Interpreter</a>.
 		</p>
-
+		{% image metadata.author.avatar, "My face", "box circle u-photo", "300px", [300] %}
 	
     <p class="p-note">
 			When I'm not working I love cycling, reading fiction (mostly sci-fi and ghost stories), and spending time with my family &amp; our border collie. 
