From 34ec240dc02c7c8812e29a0d6cc28b45e82bd018 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn_wells@apple.com>
Date: Thu, 6 Jun 2024 20:59:24 -0700
Subject: [PATCH] Fix all the build errors

---
 assets/css/spacing.css               | 45 ++++++++++++----------------
 assets/css/typography.css            | 22 ++++++++++++++
 layouts/partials/size_scale.html     | 10 +++++++
 layouts/partials/spacing_css.html    |  2 +-
 layouts/partials/system_css.html     |  6 ++++
 layouts/partials/typography_css.html |  5 ++++
 6 files changed, 63 insertions(+), 27 deletions(-)
 create mode 100644 assets/css/typography.css
 create mode 100644 layouts/partials/size_scale.html
 create mode 100644 layouts/partials/system_css.html
 create mode 100644 layouts/partials/typography_css.html

diff --git a/assets/css/spacing.css b/assets/css/spacing.css
index 8cc58a7..8d85618 100644
--- a/assets/css/spacing.css
+++ b/assets/css/spacing.css
@@ -1,33 +1,26 @@
-/* spacing.css
- * Eryn Wells <eryn@erynwells.me>
- * vim: set sw=2 sts=2:
- */
+{{/*
+  spacing.css
+  Eryn Wells <eryn@erynwells.me>
+  vim: set sw=2 sts=2:
+*/}}
 
-{{ $spacingBase := 1 }}
-{{ $spacingUnit := "em" }}
-{{ $spacingFactor := 1.618 }}
+{{- $spacingBase := 1 -}}
+{{- $spacingUnit := "rem" -}}
+{{- $spacingFactor := 1.618 -}}
 
-{{ $scale := (dict
-    "xxs" -3
-    "xs"  -2
-    "s"   -1
-    "m"    1
-    "l"    2
-    "xl"   3
-    "xxl"  4
-) }}
+{{- $scale := partial "size_scale.html" . }}
 
 :root {
-    {{ range $name, $exponent := $scale }}
-        {{ $value := $spacingBase * (math.Pow $spacingFactor $exponent) }}
-        --spacing-{{ $name }}: {{ $value }}{{ $spacingUnit }};
-    {{ end }}
+{{- range $scale -}}
+  {{ $value := mul $spacingBase (math.Pow $spacingFactor .Value) }}
+  --spacing-{{ .Name }}: {{ printf "%.3f" $value }}{{ $spacingUnit }};
+{{- end }}
 }
 
-{{ range $name, $exponent := $scale }}
-    /* Spacing utility classes: {{ $name }} */
-    .sp-bls-{{ $name }} { margin-block-start: var(--spacing-{{ $name }}); }
-    .sp-ble-{{ $name }} { margin-block-end: var(--spacing-{{ $name }}); }
-    .sp-ins-{{ $name }} { margin-inline-start: var(--spacing-{{ $name }}); }
-    .sp-ine-{{ $name }} { margin-inline-end: var(--spacing-{{ $name }}); }
+{{ range $scale }}
+{{ printf "/* Spacing utility classes: %s */" .Name }}
+.sp-bls-{{ .Name }} { margin-block-start: var(--spacing-{{ .Name }}); }
+.sp-ble-{{ .Name }} { margin-block-end: var(--spacing-{{ .Name }}); }
+.sp-ins-{{ .Name }} { margin-inline-start: var(--spacing-{{ .Name }}); }
+.sp-ine-{{ .Name }} { margin-inline-end: var(--spacing-{{ .Name }}); }
 {{ end }}
diff --git a/assets/css/typography.css b/assets/css/typography.css
new file mode 100644
index 0000000..58482e2
--- /dev/null
+++ b/assets/css/typography.css
@@ -0,0 +1,22 @@
+{{/*
+  typography.css
+  Eryn Wells <eryn@erynwells.me>
+  vim: set sw=2 sts=2:
+*/}}
+
+{{- $fontSizeBase := 1 -}}
+{{- $fontSizeUnit := "rem" -}}
+{{- $fontSizeFactor := 1.200 -}}
+
+{{- $scale := partial "size_scale.html" . -}}
+
+:root {
+{{- range $scale -}}
+  {{ $value := mul $fontSizeBase (math.Pow $fontSizeFactor .Value) }}
+  --font-size-{{ .Name }}: {{ printf "%.3f" $value }}{{ $fontSizeUnit }};
+{{- end }}
+}
+
+{{ range $scale }}
+.font-size-{{ .Name }} { font-size: var(--font-size-{{ .Name }}); }
+{{- end }}
diff --git a/layouts/partials/size_scale.html b/layouts/partials/size_scale.html
new file mode 100644
index 0000000..68d05fd
--- /dev/null
+++ b/layouts/partials/size_scale.html
@@ -0,0 +1,10 @@
+{{- $scale := slice
+    (dict "Name" "xxs" "Value" -3)
+    (dict "Name" "xs"  "Value" -2)
+    (dict "Name" "s"   "Value" -1)
+    (dict "Name" "m"   "Value"  0)
+    (dict "Name" "l"   "Value"  1)
+    (dict "Name" "xl"  "Value"  2)
+    (dict "Name" "xxl" "Value"  3)
+-}}
+{{ return $scale }}
diff --git a/layouts/partials/spacing_css.html b/layouts/partials/spacing_css.html
index 2d9627b..abb7d3e 100644
--- a/layouts/partials/spacing_css.html
+++ b/layouts/partials/spacing_css.html
@@ -1,5 +1,5 @@
 {{
     $spacingCSS := resources.Get "css/spacing.css"
-                 | resources.ExecuteAsTemplate "spacing.css" .
+                 | resources.ExecuteAsTemplate "css/spacing.css" .
 }}
 {{ return $spacingCSS }}
diff --git a/layouts/partials/system_css.html b/layouts/partials/system_css.html
new file mode 100644
index 0000000..f666221
--- /dev/null
+++ b/layouts/partials/system_css.html
@@ -0,0 +1,6 @@
+{{ $spacingCSS := partial "spacing_css.html" . }}
+{{ $typographyCSS := partial "typography_css.html" . }}
+
+{{ $css := (slice $spacingCSS $typographyCSS) | resources.Concat "css/system.css" }}
+
+{{ return $css }}
diff --git a/layouts/partials/typography_css.html b/layouts/partials/typography_css.html
new file mode 100644
index 0000000..9dd24dc
--- /dev/null
+++ b/layouts/partials/typography_css.html
@@ -0,0 +1,5 @@
+{{
+    $css := resources.Get "css/typography.css"
+          | resources.ExecuteAsTemplate "css/spacing.css" .
+}}
+{{ return $css }}