From fb7fd04fe9974fc932a0a64e978cb899498396ed Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Thu, 28 Sep 2023 16:29:02 -0700
Subject: [PATCH] Fix the lists!

---
 assets/styles/blog/002_grid.css    |  9 +++++++++
 assets/styles/blog/050_content.css | 20 --------------------
 assets/styles/root/002_columns.css | 19 +++++++++----------
 3 files changed, 18 insertions(+), 30 deletions(-)
 create mode 100644 assets/styles/blog/002_grid.css
 delete mode 100644 assets/styles/blog/050_content.css

diff --git a/assets/styles/blog/002_grid.css b/assets/styles/blog/002_grid.css
new file mode 100644
index 0000000..d1f289a
--- /dev/null
+++ b/assets/styles/blog/002_grid.css
@@ -0,0 +1,9 @@
+/* Eryn Wells <eryn@erynwells.me> */
+
+article > :is(h1, h2, h3, h4, h5, h6) {
+    grid-column: content-start / content-end;
+}
+
+.blog.list {
+    gap: 4rem 0;
+}
diff --git a/assets/styles/blog/050_content.css b/assets/styles/blog/050_content.css
deleted file mode 100644
index 1339721..0000000
--- a/assets/styles/blog/050_content.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Eryn Wells <eryn@erynwells.me> */
-
-:has(> img) {
-  grid-column: content-start / content-end;
-  line-height: 0;
-}
-
-@media (max-width: 639px) {
-  :has(> img) {
-    grid-column: gutter-start / gutter-end;
-  }
-}
-
-main {
-  gap: var(--body-item-spacing) 0;
-}
-
-article > :is(h1, h2, h3, h4, h5, h6) {
-    grid-column: content-start / content-end;
-}
diff --git a/assets/styles/root/002_columns.css b/assets/styles/root/002_columns.css
index fd4dbfa..fe6c053 100644
--- a/assets/styles/root/002_columns.css
+++ b/assets/styles/root/002_columns.css
@@ -1,5 +1,5 @@
 :root {
-  --body-item-spacing: 4rem;
+  --body-item-spacing: 2rem;
   --content-width: 80rem;
   --content-columns: 5;
   --gutter-width: 3rem;
@@ -135,10 +135,6 @@
     grid-column: wide-content-start / wide-content-end;
   }
 
-  p, ul {
-    grid-column: content-start / content-end;
-  }
-
   nav.bulleted>li:first-child::before {
     margin-inline: 0;
   }
@@ -147,20 +143,25 @@
     margin-inline: var(--nav-bulleted-spacing);
   }
 
+  ul, ol {
+    list-style-position: inside;
+  }
+
   ul,
   ol,
   dl,
   :is(ul, ol) > li,
   dl > dt {
-    margin-inline-start: calc(var(--body-item-spacing) + 2px);
+    margin-inline-start: var(--body-item-spacing);
   }
 
-  :is(ul, ol) > li {
-      margin-block-start: 1rem;
+  :is(ul, ol) > li:not(:last-child) {
+    margin-block-end: calc(var(--body-item-spacing) / 2);
   }
 
   :is(ul, ol) > li > :is(ul, ol) {
     margin-inline-start: 0;
+    margin-block-start: calc(var(--body-item-spacing) / 2);
   }
 
   table {
@@ -210,8 +211,6 @@
 
   @supports (grid-template-columns: subgrid) {
     .list > .post {
-      --body-item-spacing: 2rem;
-
       display: grid;
       grid-template-columns: subgrid;
       gap: var(--body-item-spacing) 0;