From 5d1e103d5cf9810de9a3ddf6eaaee0ef11242ed7 Mon Sep 17 00:00:00 2001
From: Anton Livaja <anton@livaja.me>
Date: Tue, 23 Apr 2024 11:52:01 -0400
Subject: [PATCH] fix: paths

---
 _config.yml                               | 2 +-
 _includes/header.html                     | 4 ++--
 _layouts/landing.html                     | 1 -
 _posts/2024-03-28-introducing-distrust.md | 2 +-
 blog.md                                   | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/_config.yml b/_config.yml
index 3a19d64..3f78cad 100644
--- a/_config.yml
+++ b/_config.yml
@@ -20,7 +20,7 @@ footer: '© 2025 Distrust LLC'
 
 theme: jekyll-theme-console
 
-permalink: /:title/
+permalink: blog/:title/
 
 plugins:
 - jekyll-feed
diff --git a/_includes/header.html b/_includes/header.html
index af71bdb..e85cf5d 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -3,7 +3,7 @@
   <div class="menu">
     <div class="left-menu">
       <a id="home-link" href="/index.html">
-        <img class="menu-logo" src="../assets/base/distrust-text-white.svg"
+        <img class="menu-logo" src="/assets/base/distrust-text-white.svg"
           alt="Distrust broken chain logo with white text" />
       </a>
     </div>
@@ -22,7 +22,7 @@
         </li>
         <li class="show">
           <a href="/feed.xml" style="vertical-align: middle;">
-            <img style="filter: grayscale(100%); width: 22px; vertical-align: sub" src="../assets/base/rss.png" />
+            <img style="filter: grayscale(100%); width: 22px; vertical-align: sub" src="/assets/base/rss.png" />
           </a>
         </li>
 
diff --git a/_layouts/landing.html b/_layouts/landing.html
index dac4063..9bcce22 100644
--- a/_layouts/landing.html
+++ b/_layouts/landing.html
@@ -57,7 +57,6 @@
 					</div>
 				</section>
 
-<<<<<<< HEAD
 				<section>
 					<div class="center">
 						<div class="capsule">what we do</div>
diff --git a/_posts/2024-03-28-introducing-distrust.md b/_posts/2024-03-28-introducing-distrust.md
index 5a03fed..5a9bf47 100644
--- a/_posts/2024-03-28-introducing-distrust.md
+++ b/_posts/2024-03-28-introducing-distrust.md
@@ -2,7 +2,7 @@
 layout: post
 title: Adventures In Supply Chain Integrity
 date: 2024-03-28
-cover_image: "../assets/images/whale_shark.jpg"
+cover_image: "/assets/images/whale_shark.jpg"
 authors:
   - name: Ryan Heywood
     bio: Professional bonker / twerker.
diff --git a/blog.md b/blog.md
index 3d464f1..9b35887 100644
--- a/blog.md
+++ b/blog.md
@@ -6,13 +6,13 @@ permalink: /blog.html
 <div class="posts">
   {% for post in site.posts %}
     <article class="post">
-      <h1><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></h1>
+      <h1><a href="{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h1>
 
       <div class="entry">
         {{ post.excerpt }}
       </div>
       <h4>Written on {{ post.date | date: "%B %e, %Y" }}</h4>
-      <a href="{{ site.baseurl }}{{ post.url }}" class="read-more">Read More</a>
+      <a href="{{ post.url }}" class="read-more">Read More</a>
     </article>
   {% endfor %}
 </div>