From 440cb442079b37e90026363c4b2b96d972e645d3 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Sun, 26 Dec 2021 10:35:01 +0100
Subject: [PATCH] Move sass lib folder down one level. Move css colour var
 generation to styles file.

---
 assets/sass/_colors.scss                                  | 8 --------
 assets/{ => sass}/lib/typey/stylesheets/_typey.scss       | 0
 .../{ => sass}/lib/typey/stylesheets/typey/_defaults.scss | 0
 .../lib/typey/stylesheets/typey/_font-stacks.scss         | 0
 .../typey/stylesheets/typey/functions/_depreciated.scss   | 0
 .../stylesheets/typey/functions/_em-calculators.scss      | 0
 .../lib/typey/stylesheets/typey/functions/_extras.scss    | 0
 .../lib/typey/stylesheets/typey/functions/_helpers.scss   | 0
 .../typey/stylesheets/typey/functions/_outputters.scss    | 0
 .../lib/typey/stylesheets/typey/functions/_sizers.scss    | 0
 .../typey/stylesheets/typey/functions/_validators.scss    | 0
 .../lib/typey/stylesheets/typey/mixins/_debug.scss        | 0
 .../stylesheets/typey/mixins/_define-type-sizing.scss     | 0
 .../lib/typey/stylesheets/typey/mixins/_font-size.scss    | 0
 .../lib/typey/stylesheets/typey/mixins/_line-height.scss  | 0
 .../lib/typey/stylesheets/typey/mixins/_spacing.scss      | 0
 .../lib/typey/stylesheets/typey/mixins/_type-layout.scss  | 0
 .../lib/typey/stylesheets/typey/mixins/_typeface.scss     | 0
 .../lib/typey/stylesheets/typey/mixins/_typeset.scss      | 0
 assets/sass/styles.scss                                   | 8 ++++++++
 layouts/partials/styles.html                              | 2 +-
 21 files changed, 9 insertions(+), 9 deletions(-)
 rename assets/{ => sass}/lib/typey/stylesheets/_typey.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/_defaults.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/_font-stacks.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/functions/_depreciated.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/functions/_em-calculators.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/functions/_extras.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/functions/_helpers.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/functions/_outputters.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/functions/_sizers.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/functions/_validators.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/mixins/_debug.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/mixins/_define-type-sizing.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/mixins/_font-size.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/mixins/_line-height.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/mixins/_spacing.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/mixins/_type-layout.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/mixins/_typeface.scss (100%)
 rename assets/{ => sass}/lib/typey/stylesheets/typey/mixins/_typeset.scss (100%)

diff --git a/assets/sass/_colors.scss b/assets/sass/_colors.scss
index dccda8f..6ad4d9a 100644
--- a/assets/sass/_colors.scss
+++ b/assets/sass/_colors.scss
@@ -78,11 +78,3 @@ $colors: (
 
   code:                   $nearblack,
 );
-
-// Convert colour map to css4 variables.
-// Use like this: var(--color-brand)
-:root {
-  @each $name, $color in $colors {
-    --color-#{$name}: #{$color};
-  }
-}
diff --git a/assets/lib/typey/stylesheets/_typey.scss b/assets/sass/lib/typey/stylesheets/_typey.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/_typey.scss
rename to assets/sass/lib/typey/stylesheets/_typey.scss
diff --git a/assets/lib/typey/stylesheets/typey/_defaults.scss b/assets/sass/lib/typey/stylesheets/typey/_defaults.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/_defaults.scss
rename to assets/sass/lib/typey/stylesheets/typey/_defaults.scss
diff --git a/assets/lib/typey/stylesheets/typey/_font-stacks.scss b/assets/sass/lib/typey/stylesheets/typey/_font-stacks.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/_font-stacks.scss
rename to assets/sass/lib/typey/stylesheets/typey/_font-stacks.scss
diff --git a/assets/lib/typey/stylesheets/typey/functions/_depreciated.scss b/assets/sass/lib/typey/stylesheets/typey/functions/_depreciated.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/functions/_depreciated.scss
rename to assets/sass/lib/typey/stylesheets/typey/functions/_depreciated.scss
diff --git a/assets/lib/typey/stylesheets/typey/functions/_em-calculators.scss b/assets/sass/lib/typey/stylesheets/typey/functions/_em-calculators.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/functions/_em-calculators.scss
rename to assets/sass/lib/typey/stylesheets/typey/functions/_em-calculators.scss
diff --git a/assets/lib/typey/stylesheets/typey/functions/_extras.scss b/assets/sass/lib/typey/stylesheets/typey/functions/_extras.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/functions/_extras.scss
rename to assets/sass/lib/typey/stylesheets/typey/functions/_extras.scss
diff --git a/assets/lib/typey/stylesheets/typey/functions/_helpers.scss b/assets/sass/lib/typey/stylesheets/typey/functions/_helpers.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/functions/_helpers.scss
rename to assets/sass/lib/typey/stylesheets/typey/functions/_helpers.scss
diff --git a/assets/lib/typey/stylesheets/typey/functions/_outputters.scss b/assets/sass/lib/typey/stylesheets/typey/functions/_outputters.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/functions/_outputters.scss
rename to assets/sass/lib/typey/stylesheets/typey/functions/_outputters.scss
diff --git a/assets/lib/typey/stylesheets/typey/functions/_sizers.scss b/assets/sass/lib/typey/stylesheets/typey/functions/_sizers.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/functions/_sizers.scss
rename to assets/sass/lib/typey/stylesheets/typey/functions/_sizers.scss
diff --git a/assets/lib/typey/stylesheets/typey/functions/_validators.scss b/assets/sass/lib/typey/stylesheets/typey/functions/_validators.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/functions/_validators.scss
rename to assets/sass/lib/typey/stylesheets/typey/functions/_validators.scss
diff --git a/assets/lib/typey/stylesheets/typey/mixins/_debug.scss b/assets/sass/lib/typey/stylesheets/typey/mixins/_debug.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/mixins/_debug.scss
rename to assets/sass/lib/typey/stylesheets/typey/mixins/_debug.scss
diff --git a/assets/lib/typey/stylesheets/typey/mixins/_define-type-sizing.scss b/assets/sass/lib/typey/stylesheets/typey/mixins/_define-type-sizing.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/mixins/_define-type-sizing.scss
rename to assets/sass/lib/typey/stylesheets/typey/mixins/_define-type-sizing.scss
diff --git a/assets/lib/typey/stylesheets/typey/mixins/_font-size.scss b/assets/sass/lib/typey/stylesheets/typey/mixins/_font-size.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/mixins/_font-size.scss
rename to assets/sass/lib/typey/stylesheets/typey/mixins/_font-size.scss
diff --git a/assets/lib/typey/stylesheets/typey/mixins/_line-height.scss b/assets/sass/lib/typey/stylesheets/typey/mixins/_line-height.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/mixins/_line-height.scss
rename to assets/sass/lib/typey/stylesheets/typey/mixins/_line-height.scss
diff --git a/assets/lib/typey/stylesheets/typey/mixins/_spacing.scss b/assets/sass/lib/typey/stylesheets/typey/mixins/_spacing.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/mixins/_spacing.scss
rename to assets/sass/lib/typey/stylesheets/typey/mixins/_spacing.scss
diff --git a/assets/lib/typey/stylesheets/typey/mixins/_type-layout.scss b/assets/sass/lib/typey/stylesheets/typey/mixins/_type-layout.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/mixins/_type-layout.scss
rename to assets/sass/lib/typey/stylesheets/typey/mixins/_type-layout.scss
diff --git a/assets/lib/typey/stylesheets/typey/mixins/_typeface.scss b/assets/sass/lib/typey/stylesheets/typey/mixins/_typeface.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/mixins/_typeface.scss
rename to assets/sass/lib/typey/stylesheets/typey/mixins/_typeface.scss
diff --git a/assets/lib/typey/stylesheets/typey/mixins/_typeset.scss b/assets/sass/lib/typey/stylesheets/typey/mixins/_typeset.scss
similarity index 100%
rename from assets/lib/typey/stylesheets/typey/mixins/_typeset.scss
rename to assets/sass/lib/typey/stylesheets/typey/mixins/_typeset.scss
diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss
index b8abd9f..2b078f1 100644
--- a/assets/sass/styles.scss
+++ b/assets/sass/styles.scss
@@ -6,6 +6,14 @@
 
 @import 'init';
 
+// Convert colour map to css4 variables.
+// Use like this: var(--color-brand)
+:root {
+  @each $name, $color in $colors {
+    --color-#{$name}: #{$color};
+  }
+}
+
 // Ensure fonts get loaded first to minimize front-end performance impact.
 
 @import 'fonts';
diff --git a/layouts/partials/styles.html b/layouts/partials/styles.html
index 947f2bd..287acd0 100644
--- a/layouts/partials/styles.html
+++ b/layouts/partials/styles.html
@@ -1,4 +1,4 @@
-{{ $main_options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed" "enableSourceMap" false "includePaths" (slice "assets/lib/typey/stylesheets")) -}}
+{{ $main_options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed" "enableSourceMap" false "includePaths" (slice "assets/sass/lib/typey/stylesheets")) -}}
 {{ if eq hugo.Environment "development" -}}
   {{ $main_options = merge $main_options (dict "outputStyle" "nested" "enableSourceMap" true) -}}
 {{ end -}}