From bb65a3d80f6a9dca84c203d7fbd2b40c6f353e2e Mon Sep 17 00:00:00 2001 From: David Eisinger Date: Tue, 24 Oct 2023 20:49:29 -0400 Subject: [PATCH] Misc. updates & reorganization --- content/elsewhere/_index.md | 5 ++++ content/journal/_index.md | 3 +++ themes/v2/assets/css/style.scss | 9 ++++++++ themes/v2/layouts/_default/baseof.html | 5 +++- themes/v2/layouts/_default/tag.html | 5 +++- themes/v2/layouts/_default/tag.terms.html | 2 +- themes/v2/layouts/elsewhere/list.html | 12 +++++++--- themes/v2/layouts/elsewhere/single.html | 12 ++++++++-- themes/v2/layouts/index.html | 28 ++++++++++++++++++++++- themes/v2/layouts/journal/list.html | 2 +- themes/v2/layouts/journal/single.html | 5 +++- themes/v2/layouts/notes/list.html | 2 +- themes/v2/layouts/notes/single.html | 5 +++- themes/v2/layouts/partials/head.html | 24 +++++++++---------- 14 files changed, 93 insertions(+), 26 deletions(-) create mode 100644 content/elsewhere/_index.md create mode 100644 content/journal/_index.md diff --git a/content/elsewhere/_index.md b/content/elsewhere/_index.md new file mode 100644 index 0000000..87c723a --- /dev/null +++ b/content/elsewhere/_index.md @@ -0,0 +1,5 @@ +--- +title: "Elsewhere" +--- + +Articles I've written in other places diff --git a/content/journal/_index.md b/content/journal/_index.md new file mode 100644 index 0000000..349c962 --- /dev/null +++ b/content/journal/_index.md @@ -0,0 +1,3 @@ +--- +title: "Journal" +--- diff --git a/themes/v2/assets/css/style.scss b/themes/v2/assets/css/style.scss index ad694ea..bf37940 100644 --- a/themes/v2/assets/css/style.scss +++ b/themes/v2/assets/css/style.scss @@ -16,6 +16,10 @@ body { h1, h2, h3 { font-size: 1em; margin: 1em 0; + + span { + color: #aaa; + } } h3 { @@ -111,6 +115,11 @@ code { img { width: 100%; height: auto; + + &.inline { + width: auto; + vertical-align: middle; + } } .image-set { diff --git a/themes/v2/layouts/_default/baseof.html b/themes/v2/layouts/_default/baseof.html index 5f8e2ec..3d2310e 100644 --- a/themes/v2/layouts/_default/baseof.html +++ b/themes/v2/layouts/_default/baseof.html @@ -1,6 +1,9 @@ - {{- partial "head.html" . -}} + + {{- partial "head.html" . -}} + {{- block "head" . }}{{- end }} + {{- partial "header.html" . -}}
diff --git a/themes/v2/layouts/_default/tag.html b/themes/v2/layouts/_default/tag.html index 35904f9..0552828 100644 --- a/themes/v2/layouts/_default/tag.html +++ b/themes/v2/layouts/_default/tag.html @@ -2,7 +2,10 @@
-

#{{ .Title }}

+

+ Tags > + #{{ .Title }} +

    {{ range .RegularPages }} diff --git a/themes/v2/layouts/_default/tag.terms.html b/themes/v2/layouts/_default/tag.terms.html index ea22b07..175b11a 100644 --- a/themes/v2/layouts/_default/tag.terms.html +++ b/themes/v2/layouts/_default/tag.terms.html @@ -2,7 +2,7 @@
    -

    {{ .Title }}

    +

    {{ .Title }}

      {{ range .Data.Terms.Alphabetical }} diff --git a/themes/v2/layouts/elsewhere/list.html b/themes/v2/layouts/elsewhere/list.html index 2053397..19c539c 100644 --- a/themes/v2/layouts/elsewhere/list.html +++ b/themes/v2/layouts/elsewhere/list.html @@ -2,14 +2,20 @@
      -

      Elsewhere

      +

      Elsewhere

      + + {{ .Content }}
        {{ range (where .Site.RegularPages "Type" "in" "elsewhere") }} + {{ $url := urls.Parse .Params.canonical_url }} + {{ $host := strings.Replace $url.Hostname "www." "" }} +
      • {{ .Title }} - {{ .Date | time.Format "(2006-01-02)" }} - {{ if .Params.needs_review }}NEEDS REVIEW{{ end }} + + ({{ $host }}, {{ .Date | time.Format "2006-01-02" }}) +
        • {{ end }}
      diff --git a/themes/v2/layouts/elsewhere/single.html b/themes/v2/layouts/elsewhere/single.html index cd24b53..d83be3e 100644 --- a/themes/v2/layouts/elsewhere/single.html +++ b/themes/v2/layouts/elsewhere/single.html @@ -1,13 +1,21 @@ +{{ define "head" }} + +{{ end }} + {{ define "main" }} {{ $url := urls.Parse .Params.canonical_url }} + {{ $host := strings.Replace $url.Hostname "www." "" }}
      -

      {{ .Title }}

      +

      + Elsewhere > + {{ .Title }} +

      Posted {{ .Date | time.Format "2006-01-02" }} - on {{ $url.Hostname }} + on {{ $host }}

      {{ .Content }} diff --git a/themes/v2/layouts/index.html b/themes/v2/layouts/index.html index 42fb090..e312391 100644 --- a/themes/v2/layouts/index.html +++ b/themes/v2/layouts/index.html @@ -9,7 +9,7 @@
        - {{ range (where .Site.RegularPages "Type" "in" "journal") }} + {{ range first 5 (where .Site.RegularPages "Type" "in" "journal") }}

      • {{ .Title }} @@ -22,5 +22,31 @@

      +
      +
      + +

      + Elsewhere +

      + +
        + {{ range where (where .Site.RegularPages "Type" "in" "elsewhere") "Params.featured" "=" true }} + {{ $url := urls.Parse .Params.canonical_url }} + {{ $host := strings.Replace $url.Hostname "www." "" }} + +
      • +

        + {{ .Title }} + + ({{ $host }}, {{ .Date | time.Format "2006-01-02" }}) + +

        + + {{ .Summary }} +
        • + {{ end }} +
      +
      + {{- partial "pinboard.html" . -}} {{ end }} diff --git a/themes/v2/layouts/journal/list.html b/themes/v2/layouts/journal/list.html index d7bd5a1..90cc713 100644 --- a/themes/v2/layouts/journal/list.html +++ b/themes/v2/layouts/journal/list.html @@ -2,7 +2,7 @@
      -

      Journal

      +

      Journal

        {{ range (where .Site.RegularPages "Type" "in" "journal") }} diff --git a/themes/v2/layouts/journal/single.html b/themes/v2/layouts/journal/single.html index 7694593..00b1b3d 100644 --- a/themes/v2/layouts/journal/single.html +++ b/themes/v2/layouts/journal/single.html @@ -1,7 +1,10 @@ {{ define "main" }}
        -

        {{ .Title }}

        +

        + Journal > + {{ .Title }} +

        Posted {{ .Date | time.Format "2006-01-02" }} diff --git a/themes/v2/layouts/notes/list.html b/themes/v2/layouts/notes/list.html index c878e29..fcbb8eb 100644 --- a/themes/v2/layouts/notes/list.html +++ b/themes/v2/layouts/notes/list.html @@ -2,7 +2,7 @@
        -

        Notes

        +

        Notes

          {{ range (where .Site.RegularPages.ByLastmod.Reverse "Type" "in" "notes") }} diff --git a/themes/v2/layouts/notes/single.html b/themes/v2/layouts/notes/single.html index 0e14d4d..7368910 100644 --- a/themes/v2/layouts/notes/single.html +++ b/themes/v2/layouts/notes/single.html @@ -1,7 +1,10 @@ {{ define "main" }}
          -

          {{ .Title }}

          +

          + Notes > + {{ .Title }} +

          {{ .Content }} diff --git a/themes/v2/layouts/partials/head.html b/themes/v2/layouts/partials/head.html index 5ebca2d..6cc846b 100644 --- a/themes/v2/layouts/partials/head.html +++ b/themes/v2/layouts/partials/head.html @@ -1,13 +1,11 @@ - - - - {{- if .Page.IsHome -}} - {{ .Site.Title }} - {{- else -}} - {{ .Title }} – {{ .Site.Title }} - {{- end -}} - - {{ $css := resources.Get "css/style.scss" | toCSS | minify | fingerprint }} - - - + + + {{- if .Page.IsHome -}} + {{ .Site.Title }} + {{- else -}} + {{ .Title }} – {{ .Site.Title }} + {{- end -}} + +{{ $css := resources.Get "css/style.scss" | toCSS | minify | fingerprint }} + +