diff --git a/.gitignore b/.gitignore index 9b9dd599..1923c663 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ public/ builds/ _vendor/ +assets/jsconfig.json hugo_stats.json .hugo_build.lock diff --git a/assets/sass/components/_global.scss b/assets/sass/components/_global.scss index 5fdd62b6..d0cd9253 100644 --- a/assets/sass/components/_global.scss +++ b/assets/sass/components/_global.scss @@ -27,6 +27,8 @@ body { } code, +kbd, +samp, pre, .monospace { font-family: settings.$font-stack-mono; @@ -42,6 +44,8 @@ pre, } code, + kbd, + samp, pre, .monospace { font-family: settings.$font-stack-mono-variable; @@ -55,6 +59,8 @@ pre, // Roboto Mono doesn't have this problem, but the above fix breaks it, of course. code, + kbd, + samp, pre, .monospace { font-style: italic !important; diff --git a/assets/sass/pages/_contact.scss b/assets/sass/pages/_contact.scss index d3f64bbc..ee6881e6 100644 --- a/assets/sass/pages/_contact.scss +++ b/assets/sass/pages/_contact.scss @@ -88,7 +88,7 @@ div.layout-contact { ); } - svg.emoji { + .emoji { margin-left: 0; margin-right: 0.4em; cursor: inherit; diff --git a/assets/sass/pages/_home.scss b/assets/sass/pages/_home.scss index 270ed489..786653a3 100644 --- a/assets/sass/pages/_home.scss +++ b/assets/sass/pages/_home.scss @@ -135,9 +135,13 @@ div.layout-home { font-weight: 500; letter-spacing: -0.014em; - img.emoji { + .emoji { margin-left: 0.1em; // a little extra social distancing for the hand } + + .wave { + margin-left: 2px; + } } h2 { @@ -163,7 +167,7 @@ div.layout-home { word-spacing: -0.3em; margin-right: 0.1em; - img.emoji { + .emoji { vertical-align: -0.2em; // magic number to align with text :\ padding: 0; } @@ -190,10 +194,6 @@ div.layout-home { ) ); } - - &.wave { - margin-left: 2px; - } } } diff --git a/assets/sass/pages/_single.scss b/assets/sass/pages/_single.scss index b71fabf3..18358a43 100644 --- a/assets/sass/pages/_single.scss +++ b/assets/sass/pages/_single.scss @@ -36,7 +36,7 @@ div.layout-single { margin-right: 0.4em; user-select: none; - img.emoji { + .emoji { margin-right: 0.25em; vertical-align: -0.22em; cursor: inherit; diff --git a/config.yml b/config.yml index 8a5c6047..39485c6c 100644 --- a/config.yml +++ b/config.yml @@ -155,7 +155,6 @@ imaging: quality: 100 build: - noJSConfigInAssets: true # don't use cache for SCSS compilation, better to throw error than be stale useResourceCacheWhen: never diff --git a/content/uses/index.md b/content/uses/index.md index 19e2eff6..45101135 100644 --- a/content/uses/index.md +++ b/content/uses/index.md @@ -5,7 +5,7 @@ description: "Things I use daily." image: "images/bigsur.png" layout: etc css: | - h2 img.emoji { + h2 .emoji { margin-right: 2px; } --- diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index 52a0a2c1..5e903fbb 100644 --- a/layouts/_default/_markup/render-link.html +++ b/layouts/_default/_markup/render-link.html @@ -1 +1 @@ -{{ .Text | safeHTML }} \ No newline at end of file +{{ .Text | safeHTML }} \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index f07e3904..54e20d20 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,23 +1,23 @@ -{{ printf "" | safeHTML -}} -{{ printf "" (print .Site.Params.baseURL "/humans.txt") | safeHTML }} -{{- printf "" | safeHTML }} {{- partial "functions/prepare-meta" . -}} {{- partial "functions/prepare-js" . -}} {{- partial "functions/prepare-css" . -}} - +{{ printf "" (print .Site.Params.baseURL "/humans.txt") | safeHTML }} + + -{{ partial "head/_head" . }} + {{ partial "head/_head" . }} -{{ partialCached "page/header" . }} -
-{{ block "main" . }}{{ end }} -
-{{ partial "page/footer" . }} -{{ template "__body_js" . }} + {{ partialCached "page/header" . }} +
+ {{ block "main" . }}{{ end }} +
+ {{ partial "page/footer" . }} + {{ template "__body_js" . }} + {{- partial "functions/debug" . -}} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index f8ddaa45..9ad8911e 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,21 +1,21 @@ {{ define "main" }}
{{- with .Pages }} - {{- range .GroupByDate "2006" }} -
-

{{ .Key }}

- -
- {{- end }} {{- end }}
{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 9e80458b..3fb8ab30 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -10,28 +10,28 @@ {{ with .Params.tags }} -
- 🏷️ - {{ range first 5 . }} - {{ . }} - {{ end }} -
+
+ 🏷️ + {{ range first 5 . }} + {{ . }} + {{ end }} +
{{ end }} {{ with .Scratch.Get "sourceURL" }} -
- - ✏️ - Improve This Post - -
+
+ + ✏️ + Improve This Post + +
{{ end }} {{ if eq hugo.Environment "production" }} -
- 👀 -
-
+
+ 👀 +
+
{{ end }} diff --git a/layouts/partials/functions/debug.html b/layouts/partials/functions/debug.html index d4b99c86..4c570e75 100644 --- a/layouts/partials/functions/debug.html +++ b/layouts/partials/functions/debug.html @@ -1,6 +1,6 @@ {{/* Output these variables for debugging purposes: */}} -{{- printf "" | safeHTML }} +{{- print "" | safeHTML }} {{ with hugo }}{{ with .Environment }}{{ printf "" . | safeHTML }}{{ end }}{{ end }} {{ with .GitInfo }}{{ with .AbbreviatedHash }}{{ printf "" . | safeHTML }}{{ end }}{{ end }} {{ with .File }}{{ with .Path }}{{ printf "" . | safeHTML }}{{ end }}{{ end }} -{{- printf "" | safeHTML }} +{{- print "" | safeHTML }} diff --git a/layouts/partials/functions/prepare-css.html b/layouts/partials/functions/prepare-css.html index a80cbee0..0128d633 100644 --- a/layouts/partials/functions/prepare-css.html +++ b/layouts/partials/functions/prepare-css.html @@ -8,10 +8,10 @@ {{/* Page-specific styles set via front matter, piped through PostCSS and inlined */}} {{- with .Params.css -}} {{/* NOTE: This file doesn't end up getting published (which is good) */}} - {{- $target := path.Join $.File.Dir "css/inline.scss" -}} + {{- $target := path.Join $.File.Dir "css/inline.css" -}} {{- $css := . | resources.FromString $target -}} - + {{- end -}} {{- end -}} diff --git a/layouts/partials/functions/prepare-js.html b/layouts/partials/functions/prepare-js.html index 6375f134..46eb56a6 100644 --- a/layouts/partials/functions/prepare-js.html +++ b/layouts/partials/functions/prepare-js.html @@ -1,6 +1,16 @@ -{{/* Pull in JS processed by Webpack */}} +{{- define "__head_js" -}} + {{/* A super tiny script to restore dark mode off the bat (to hopefully avoid blinding flashes of white) */}} + {{ $themeScript := resources.Get "js/restore-theme.js" | js.Build (dict "target" "es2015" "format" "iife") }} + + {{ with $themeScript }} + + {{ end }} +{{- end -}} {{- define "__body_js" -}} + {{/* Pull in JS processed by Webpack */}} {{ with partial "functions/webpack" (dict "context" . "src" "main.js") }} {{ end }} diff --git a/layouts/partials/head/_head.html b/layouts/partials/head/_head.html index d70c0af8..0695951d 100644 --- a/layouts/partials/head/_head.html +++ b/layouts/partials/head/_head.html @@ -1,9 +1,9 @@ {{ partial "head/meta" . -}} {{ partial "head/open-graph" . -}} {{ partial "head/canonical" . -}} -{{ partialCached "head/restore-theme" . -}} {{ partialCached "head/preload" . -}} -{{ partial "head/styles" . -}} +{{ template "__head_css" . -}} {{ partialCached "head/favicons" . -}} {{ partialCached "head/misc" . -}} +{{ template "__head_js" . -}} {{ partial "head/schema" . -}} diff --git a/layouts/partials/head/misc.html b/layouts/partials/head/misc.html index 6190ac53..8c2257eb 100644 --- a/layouts/partials/head/misc.html +++ b/layouts/partials/head/misc.html @@ -1,6 +1,6 @@ {{ with .Site.Params.social.webmentionIO }} - - + + {{ end }} diff --git a/layouts/partials/head/open-graph.html b/layouts/partials/head/open-graph.html index f418e2b0..c92fbbcd 100644 --- a/layouts/partials/head/open-graph.html +++ b/layouts/partials/head/open-graph.html @@ -6,44 +6,48 @@ {{- with .Scratch.Get "pageImage" }} - - - - - + + + + + {{ end -}} {{- if and .IsPage (eq .Type .Site.Params.mainSection) }} -{{- if not .PublishDate.IsZero }} - - -{{- else if not .Date.IsZero }} - - -{{- end }} -{{- with .Site.Author.social.facebook }} -{{ end }} -{{- with .Params.tags }}{{ range . }} -{{ end }}{{ end }} + {{- if not .PublishDate.IsZero }} + + + {{- else if not .Date.IsZero }} + + + {{- end }} + {{- with .Site.Author.social.facebook }} + + {{- end }} + {{- with .Params.tags }}{{ range . }} + + {{- end }}{{ end }} {{ end -}} {{- with .Site.Author.social.facebookid }} - + {{ end -}} {{- with .Site.Params.social.facebookAppID }} - + {{ end -}} {{- with .Site.Author.social.twitter }} - - + + {{ end -}} -{{ with .Site.Author.social.twitterid }}{{ end }} +{{ with .Site.Author.social.twitterid }} + +{{ end }} {{- with .Site.Author.monetization }} - + {{ end -}} diff --git a/layouts/partials/head/restore-theme.html b/layouts/partials/head/restore-theme.html deleted file mode 100644 index 2a80268b..00000000 --- a/layouts/partials/head/restore-theme.html +++ /dev/null @@ -1,6 +0,0 @@ -{{ $themeScript := resources.Get "js/restore-theme.js" | js.Build (dict "target" "es2015" "format" "iife") }} -{{ with $themeScript }} - -{{ end }} diff --git a/layouts/partials/head/styles.html b/layouts/partials/head/styles.html deleted file mode 100644 index 98c644ae..00000000 --- a/layouts/partials/head/styles.html +++ /dev/null @@ -1 +0,0 @@ -{{ template "__head_css" . }} diff --git a/layouts/partials/page/header.html b/layouts/partials/page/header.html index 726b4e67..bc8805ff 100644 --- a/layouts/partials/page/header.html +++ b/layouts/partials/page/header.html @@ -9,13 +9,14 @@ diff --git a/layouts/shortcodes/image.html b/layouts/shortcodes/image.html index d99c9ee7..b1bda4fc 100644 --- a/layouts/shortcodes/image.html +++ b/layouts/shortcodes/image.html @@ -1,7 +1,7 @@ {{- $optimized := partial "functions/optimize-image" . -}}
- {{ with .Get "link" }}{{ end }} + {{ with .Get "link" }}{{ end }}