From fe69df713650768cfa04854d267e4294c3f25dd4 Mon Sep 17 00:00:00 2001
From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com>
Date: Thu, 24 Aug 2023 09:07:16 +0100
Subject: Simplifies grid padding

---
 public/css/layout/grid.css             | 7 +------
 public/css/layout/grid.md.css          | 8 +-------
 public/css/modules/skip-to-content.css | 2 +-
 public/css/variables/spacing.css       | 6 +++---
 public/css/variables/spacing.lg.css    | 2 +-
 public/css/variables/spacing.md.css    | 2 +-
 public/css/variables/spacing.xl.css    | 2 +-
 public/css/variables/spacing.xxl.css   | 2 +-
 8 files changed, 10 insertions(+), 21 deletions(-)

(limited to 'public/css')

diff --git a/public/css/layout/grid.css b/public/css/layout/grid.css
index 2bf211d..a4fb251 100644
--- a/public/css/layout/grid.css
+++ b/public/css/layout/grid.css
@@ -4,12 +4,7 @@
   nav,
   :is(main, article) > section:not(:is(section, header) :is(section, header))
 ):not(.section--full-width) {
-  padding-inline: calc(0.5 * (
-    100vw - (var(--grid-padding-start) + (
-      var(--grid-column-width) * var(--grid-column-count) +
-      var(--grid-gutter-width) * (var(--grid-column-count) - 1)
-    )
-  )));
+  padding-inline: calc(var(--grid-padding) + 0.5 * (100vw - var(--grid-total-width)));
 }
 
 .grid-span-1 {
diff --git a/public/css/layout/grid.md.css b/public/css/layout/grid.md.css
index 5a681c1..f0c8478 100644
--- a/public/css/layout/grid.md.css
+++ b/public/css/layout/grid.md.css
@@ -4,11 +4,5 @@
   nav,
   :is(main, article) > section:not(:is(section, header) :is(section, header))
 ) {
-  padding-inline-start: var(--grid-padding-start);
-  padding-inline-end: calc(
-    100vw - (var(--grid-padding-start) + (
-      var(--grid-column-width) * var(--grid-column-count) +
-      var(--grid-gutter-width) * (var(--grid-column-count) - 1)
-    ))
-  );
+  padding-inline: var(--grid-padding);
 }
\ No newline at end of file
diff --git a/public/css/modules/skip-to-content.css b/public/css/modules/skip-to-content.css
index d8650d7..a752b29 100644
--- a/public/css/modules/skip-to-content.css
+++ b/public/css/modules/skip-to-content.css
@@ -1,6 +1,6 @@
 .skip-to-content {
   position: absolute;
-  left: var(--grid-padding-start);
+  left: var(--grid-padding);
   top: -10rem;
   opacity: 0;
   transition: top 300ms, opacity 300ms;
diff --git a/public/css/variables/spacing.css b/public/css/variables/spacing.css
index 3ca646c..dc92dcb 100644
--- a/public/css/variables/spacing.css
+++ b/public/css/variables/spacing.css
@@ -11,12 +11,12 @@
   --padding-block-md: calc(8 * var(--relative-eighth-rem));
   --padding-block-sm: calc(5 * var(--relative-eighth-rem));
 
-  --grid-padding-start: calc(var(--grid-padding-start-relative-eighth-rem) * var(--relative-eighth-rem));
+  --grid-padding: calc(var(--grid-padding-relative-eighth-rem) * var(--relative-eighth-rem));
   --grid-column-width: calc(var(--grid-column-width-relative-eighth-rem) * var(--relative-eighth-rem));
   --grid-gutter-width: calc(var(--grid-gutter-width-relative-eighth-rem) * var(--relative-eighth-rem));
   
   --grid-total-relative-eighth-rem-width: calc(
-    var(--grid-padding-start-relative-eighth-rem) * 2 +
+    var(--grid-padding-relative-eighth-rem) * 2 +
     var(--grid-column-width-relative-eighth-rem) * var(--grid-column-count) + 
     var(--grid-gutter-width-relative-eighth-rem) * (var(--grid-column-count) - 1)
   );
@@ -34,7 +34,7 @@
   /* small screens */
 
   --grid-total-width: 30rem;
-  --grid-padding-start-relative-eighth-rem: 12;
+  --grid-padding-relative-eighth-rem: 12;
   --grid-column-count: 4;
   --grid-prose-column-count: 4;
 }
diff --git a/public/css/variables/spacing.lg.css b/public/css/variables/spacing.lg.css
index 5c3f78c..bc18bfd 100644
--- a/public/css/variables/spacing.lg.css
+++ b/public/css/variables/spacing.lg.css
@@ -1,6 +1,6 @@
 :root {
   --grid-total-width: 64rem;
-  --grid-padding-start-relative-eighth-rem: 20;
+  --grid-padding-relative-eighth-rem: 20;
   --grid-column-count: 12;
   --grid-prose-column-count: 8;
 }
\ No newline at end of file
diff --git a/public/css/variables/spacing.md.css b/public/css/variables/spacing.md.css
index 4b66743..0028e8a 100644
--- a/public/css/variables/spacing.md.css
+++ b/public/css/variables/spacing.md.css
@@ -1,6 +1,6 @@
 :root {
   --grid-total-width: 48rem;
-  --grid-padding-start-relative-eighth-rem: 16;
+  --grid-padding-relative-eighth-rem: 16;
   --grid-column-count: 8;
   --grid-prose-column-count: 8;
 }
\ No newline at end of file
diff --git a/public/css/variables/spacing.xl.css b/public/css/variables/spacing.xl.css
index 1481962..fc8b1f3 100644
--- a/public/css/variables/spacing.xl.css
+++ b/public/css/variables/spacing.xl.css
@@ -1,6 +1,6 @@
 :root {
   --grid-total-width: 80rem;
-  --grid-padding-start-relative-eighth-rem: 26;
+  --grid-padding-relative-eighth-rem: 26;
   --grid-column-count: 12;
   --grid-prose-column-count: 8;
   --width-prose: calc(
diff --git a/public/css/variables/spacing.xxl.css b/public/css/variables/spacing.xxl.css
index e584668..17d2f66 100644
--- a/public/css/variables/spacing.xxl.css
+++ b/public/css/variables/spacing.xxl.css
@@ -1,6 +1,6 @@
 :root {
   --grid-total-width: 100rem;
-  --grid-padding-start-relative-eighth-rem: 32;
+  --grid-padding-relative-eighth-rem: 32;
   --grid-column-count: 12;
   --grid-prose-column-count: 8;
 }
\ No newline at end of file
-- 
cgit v1.2.3