diff options
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | assets/css/default.css | 40 | ||||
-rw-r--r-- | shell.nix | 6 | ||||
-rw-r--r-- | themes/default/layouts/_default/_markup/render-codeblock-goat.html | 2 | ||||
-rw-r--r-- | themes/default/layouts/_default/_markup/render-codeblock.html | 2 | ||||
-rw-r--r-- | themes/default/layouts/_default/baseof.html | 2 | ||||
-rw-r--r-- | themes/default/layouts/partials/author-card.html | 4 | ||||
-rw-r--r-- | themes/default/layouts/partials/context-profile.html | 8 | ||||
-rw-r--r-- | themes/default/layouts/partials/gallery-images.html | 4 | ||||
-rw-r--r-- | themes/default/layouts/partials/meta.html | 2 | ||||
-rw-r--r-- | themes/default/layouts/partials/navigator-middle.html | 3 | ||||
-rw-r--r-- | themes/default/layouts/partials/web-ring.html | 4 | ||||
-rw-r--r-- | themes/default/layouts/shortcodes/imgur-video.html | 6 | ||||
-rw-r--r-- | themes/default/layouts/shortcodes/video.html | 4 |
14 files changed, 48 insertions, 42 deletions
@@ -34,6 +34,9 @@ else grep -rl "Default" data/authors/$(user).yaml | xargs sed --in-place "s/Default/$$_name/g" endif +test: + validatornu public/index.html + icons: rm -rf static/icons mkdir -p static/icons/feather static/icons/tabler diff --git a/assets/css/default.css b/assets/css/default.css index 90f2ac1..228cb09 100644 --- a/assets/css/default.css +++ b/assets/css/default.css @@ -242,14 +242,6 @@ nav ul { padding: 0; } -footer { - text-align: center; - color: #444; - color: var(--fade); - margin: 1rem 0; - font-size: 85%; -} - figcaption a { color: inherit; } @@ -700,7 +692,7 @@ micro-metadata { } micro-metadata h2 { - margin-right: 0.5rem; + display: inline; } micro-metadata a { @@ -803,7 +795,8 @@ micro-header h1 { margin-bottom: 0.25rem; } -micro-header h2 { +micro-header h2, +micro-header h3 { font-weight: 400; color: #444; color: var(--fade); @@ -941,13 +934,13 @@ column-middle nav { z-index: 100; } -column-middle nav section h1, +column-middle nav section h2, column-middle nav section small { margin: 0; } micro-author micro-header, -column-middle nav section h1, +column-middle nav section h2, column-middle nav section small { white-space: nowrap; overflow: hidden; @@ -959,6 +952,10 @@ column-middle nav section { padding: 0 0.5rem; } +column-middle main > footer { + margin: 0 0 1rem 0; +} + icon-button a { color: inherit; display: flex; @@ -1062,7 +1059,7 @@ gallery-images > h1 { font-size: 110%; } -gallery-images section { +gallery-images aside { display: flex; flex-wrap: wrap; } @@ -1124,13 +1121,13 @@ web-ring-item:not(:last-child) { } micro-tags a, -web-ring section, +web-ring aside, author-list section { background-color: #f9f9f9; background-color: var(--widget-background); } -web-ring section { +web-ring aside { border-radius: 1rem; padding: 1rem; } @@ -1325,13 +1322,13 @@ context-profile a { display: inline; } -context-profile h2 { +context-profile aside p { color: #333; color: var(--fade); - font-weight: 400; + margin: 0; } -context-profile section { +context-profile div { display: flex; align-items: center; } @@ -1404,12 +1401,13 @@ blockquote:not(:last-child) { margin-bottom: 0.75rem; } +footer, figcaption { - font-size: 85%; - margin-top: 0.5rem; - text-align: center; color: #444; color: var(--fade); + font-size: 85%; + margin: 0.5rem 0; + text-align: center; } sup { @@ -12,6 +12,11 @@ let sha256 = "07jk987zh7kxynjj21038j0qnd996bl949x1wm3g1iggjz0shgb4"; }) { }; + validatornu = pkgs.callPackage (builtins.fetchurl { + url = "https://raw.githubusercontent.com/tdro/dotfiles/032efcf7f4b1c7304ce5f3f64f64c175ba59eb6d/.config/nixpkgs/packages/validatornu/default.nix"; + sha256 = "1ify40x9547z04hcibk76m45d02xg3dlvwc57n8vxcbax82yb9pj"; + }) { }; + mkShellPure = pkgs.callPackage (builtins.fetchurl { url = "https://raw.githubusercontent.com/tdro/dotfiles/b710281b132056105709c03dda1899a6afc68a93/.config/nixpkgs/helpers/mkShellPure.nix"; sha256 = "1ciwifsx2hrp0ymm077zfb5q8ravrk545bda1q249y2spw9np4ms"; @@ -20,6 +25,7 @@ let in mkShellPure { packages = [ hugo + validatornu pkgs.busybox pkgs.deno pkgs.entr diff --git a/themes/default/layouts/_default/_markup/render-codeblock-goat.html b/themes/default/layouts/_default/_markup/render-codeblock-goat.html index e83d7de..76dcb33 100644 --- a/themes/default/layouts/_default/_markup/render-codeblock-goat.html +++ b/themes/default/layouts/_default/_markup/render-codeblock-goat.html @@ -15,5 +15,5 @@ {{ .Inner }} </svg> {{ end }} - <figcaption>{{ $caption | markdownify }}</figcaption> + <footer>{{ $caption | markdownify }}</footer> </diagram-container> diff --git a/themes/default/layouts/_default/_markup/render-codeblock.html b/themes/default/layouts/_default/_markup/render-codeblock.html index 9dba950..1555553 100644 --- a/themes/default/layouts/_default/_markup/render-codeblock.html +++ b/themes/default/layouts/_default/_markup/render-codeblock.html @@ -15,5 +15,5 @@ </code-block> {{ with $caption }} - <figcaption>{{ . | markdownify }}</figcaption> + <footer>{{ . | markdownify }}</footer> {{ end }} diff --git a/themes/default/layouts/_default/baseof.html b/themes/default/layouts/_default/baseof.html index 6aa06e8..3ee2e03 100644 --- a/themes/default/layouts/_default/baseof.html +++ b/themes/default/layouts/_default/baseof.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="en-us"> +<html lang="en-us" itemscope itemtype="http://schema.org/BlogPosting"> <head> <title> {{- block "title" . -}}{{- end -}} diff --git a/themes/default/layouts/partials/author-card.html b/themes/default/layouts/partials/author-card.html index f534a45..e2a2623 100644 --- a/themes/default/layouts/partials/author-card.html +++ b/themes/default/layouts/partials/author-card.html @@ -11,8 +11,8 @@ </figure> </micro-thumbnail> <micro-header> - <h1>{{ .Data.name }}</h1> - <h2><a title="" href="{{ "" | absURL }}/{{ .Data.user }}">@{{ .Data.user }}</a></h2> + <h2><b>{{ .Data.name }}</b></h2> + <h3><a title="" href="{{ "" | absURL }}/{{ .Data.user }}">@{{ .Data.user }}</a></h3> </micro-header> <a title="RSS" href="{{ "" | absURL }}/{{ .Data.user }}/rss.xml"> {{ safeHTML (readFile "static/icons/feather/rss.svg") }} diff --git a/themes/default/layouts/partials/context-profile.html b/themes/default/layouts/partials/context-profile.html index cb0f71f..056009c 100644 --- a/themes/default/layouts/partials/context-profile.html +++ b/themes/default/layouts/partials/context-profile.html @@ -2,7 +2,7 @@ <context-profile> <context-menu> - <section> + <div> <aside> <figure> <a title="{{ $author.name }}" href="{{ .Site.BaseURL }}/{{ $author.user }}"> @@ -13,10 +13,10 @@ </figure> </aside> <aside> - <h1>{{ $author.name }}</h1> - <h2>@{{ $author.user }}</h2> + <h2>{{ $author.name }}</h2> + <p>@{{ $author.user }}</p> </aside> - </section> + </div> <p>{{- $author.description | markdownify -}}</p> </context-menu> </context-profile> diff --git a/themes/default/layouts/partials/gallery-images.html b/themes/default/layouts/partials/gallery-images.html index f3790ba..9f5793a 100644 --- a/themes/default/layouts/partials/gallery-images.html +++ b/themes/default/layouts/partials/gallery-images.html @@ -2,7 +2,7 @@ <gallery-images> <h1>Picture Gallery</h1> - <section> + <aside> {{ partial "gallery-walk.html" $folder }} - </section> + </aside> </gallery-images> diff --git a/themes/default/layouts/partials/meta.html b/themes/default/layouts/partials/meta.html index 8173f1f..5325e06 100644 --- a/themes/default/layouts/partials/meta.html +++ b/themes/default/layouts/partials/meta.html @@ -26,7 +26,7 @@ </anchored-entry> {{ end }} - <b>{{ partial "author-name.html" . }}</b> + <h2><b>{{ partial "author-name.html" . }}</b></h2> · {{ partial "handle.html" . }} diff --git a/themes/default/layouts/partials/navigator-middle.html b/themes/default/layouts/partials/navigator-middle.html index fa4e10d..cca3466 100644 --- a/themes/default/layouts/partials/navigator-middle.html +++ b/themes/default/layouts/partials/navigator-middle.html @@ -22,7 +22,7 @@ <section> {{ with .Title }} - <h1>{{ . }}</h1> + <h2>{{ . }}</h2> {{ end }} {{ with .Subtitle }} <small>{{ . }}</small> @@ -42,7 +42,6 @@ type="search" autocomplete="off" spellcheck="false" - role="searchbox" aria-autocomplete="list" aria-label="search input" /> diff --git a/themes/default/layouts/partials/web-ring.html b/themes/default/layouts/partials/web-ring.html index 4ddfa14..cca6027 100644 --- a/themes/default/layouts/partials/web-ring.html +++ b/themes/default/layouts/partials/web-ring.html @@ -98,7 +98,7 @@ <web-ring> <h1>Web Ring</h1> - <section> + <aside> {{ range sort $feeds "FeedDateTime" "desc" }} <web-ring-item> <header> @@ -132,7 +132,7 @@ </a> </web-ring-item> {{ end }} - </section> + </aside> </web-ring> {{ end -}} diff --git a/themes/default/layouts/shortcodes/imgur-video.html b/themes/default/layouts/shortcodes/imgur-video.html index e6fabdd..8f99036 100644 --- a/themes/default/layouts/shortcodes/imgur-video.html +++ b/themes/default/layouts/shortcodes/imgur-video.html @@ -9,12 +9,12 @@ data-context="false"> <a href="//imgur.com/{{ $id }}"></a> </blockquote> - <script async src="//s.imgur.com/min/embed.js" charset="utf-8"></script> + <script async src="//s.imgur.com/min/embed.js"></script> <noscript> <a href="//imgur.com/{{ $id }}">imgur.com/{{ $id }}</a> </noscript> - <figcaption> + <footer> {{ $title | markdownify }}: {{ print "[Link](https://imgur.com/" $id ")" | markdownify }} - </figcaption> + </footer> </imgur-video> diff --git a/themes/default/layouts/shortcodes/video.html b/themes/default/layouts/shortcodes/video.html index 6d62abb..ecbe20e 100644 --- a/themes/default/layouts/shortcodes/video.html +++ b/themes/default/layouts/shortcodes/video.html @@ -37,8 +37,8 @@ <a href="{{ $source }}{{ $mime }}#t={{ $start }},{{ $end }}">link to the video</a> instead. </p> </video> - <figcaption> + <footer> {{ $caption | markdownify }}: {{ print "[Link](" $source $mime ")" | markdownify }} - </figcaption> + </footer> </video-container> |