From ed45333838105e2638eb561b6cf36ad6c607e0cf Mon Sep 17 00:00:00 2001 From: Jez Cope Date: Sat, 3 Apr 2021 21:03:34 +0100 Subject: [PATCH] Oops, a big commit with loads of stuff! --- assets/style/main.sass | 17 +++++++++-- layouts/_default/baseof.html | 1 + layouts/_default/li.html | 6 ++++ layouts/_default/list.html | 30 ++++++++++++------- layouts/_default/single.html | 48 +++++++++++++----------------- layouts/_default/summary.html | 34 ++++++++++----------- layouts/link/summary.html | 14 ++++----- layouts/note/summary.html | 17 +++++------ layouts/page/single.html | 26 ++++++++++++++++ layouts/partials/header.html | 10 +++---- layouts/partials/scripts.html | 1 + layouts/partials/tags.html | 3 ++ layouts/shortcodes/admonition.html | 2 +- layouts/tags/li.html | 5 ++++ static/js/navbar.js | 25 ++++++++++++++++ 15 files changed, 158 insertions(+), 81 deletions(-) create mode 100644 layouts/_default/li.html create mode 100644 layouts/page/single.html create mode 100644 layouts/partials/scripts.html create mode 100644 layouts/partials/tags.html create mode 100644 layouts/tags/li.html create mode 100644 static/js/navbar.js diff --git a/assets/style/main.sass b/assets/style/main.sass index 707111b..5da8998 100644 --- a/assets/style/main.sass +++ b/assets/style/main.sass @@ -89,6 +89,20 @@ h6, .content h6 ul list-style-type: "- " + &.taxonomy-list + column-count: 4 + +.summary + @extend .hero + @extend .my-5 + @extend .px-3 + @extend .py-5 + +.single + @extend .my-5 + @extend .px-3 + @extend .py-5 + .site-title @extend h1 @@ -97,6 +111,3 @@ h6, .content h6 &:before content: none - -.hero - background-color: $white-ter diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 45d3e6f..41e7a9f 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -17,5 +17,6 @@ {{ partial "header" . }} {{ block "main" . }}{{ end }} {{ partial "footer" . }} + {{ partial "scripts" . }} diff --git a/layouts/_default/li.html b/layouts/_default/li.html new file mode 100644 index 0000000..60d7742 --- /dev/null +++ b/layouts/_default/li.html @@ -0,0 +1,6 @@ +
  • + {{ .Date.Format .Site.Params.DateFormat }}: + + {{ .Title }} + +
    • diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 68fb00c..0464027 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,16 +1,24 @@ {{ define "main" }}
    - {{ if or .Title .Content }} -
    - {{ with .Title }}

    {{ . }}

    {{ end }} - {{ with .Content }}
    {{ . }}
    {{ end }} -
    - {{ end }} +
    + {{ if or .Title .Content }} +
    +
    + {{ with .Title }}

    {{ . }}

    {{ end }} + {{ with .Content }}
    {{ . }}
    {{ end }} +
    +
    + {{ end }} - {{ range .Paginator.Pages }} - {{ .Render "summary" }} - {{ end }} - {{ partial "pagination.html" . }} +
    +
    +
      + {{ range sort .Pages "Title" "asc" }} + {{ .Render "li" }} + {{ end }} +
    +
    +
    +
    -{{ partial "sidebar.html" . }} {{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 4094dde..9c04ec7 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,34 +1,28 @@ {{ define "main" }} -
    -
    -
    -
    -

    - {{ if ne .Type "posts" }}[{{ .Type | upper }}]{{ end }} - {{ .Title }} -

    -
    -
    -
    -
    - - {{ with .Params.tags }} -
    -
      - {{ range . }} -
    • {{ . }}
      • - {{ end }} -
    -
    - {{ end }} -
    -
    -
    - {{ .Content }} +
    +
    +
    +
    +
    +

    + {{ if ne .Type "posts" }}[{{ .Type | upper }}]{{ end }} + {{ .Title }} +

    +
    +
    + + {{ partial "tags.html" .Params.tags }} +
    +
    +
    + {{ .Content }} +
    +
    +
    + {{ partial "comments.html" . }}
    - {{ partial "comments.html" . }}
    {{ end }} diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index fed7fbd..2da7c32 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -1,21 +1,21 @@ -
    -
    -
    -

    {{ .Title }}

    +
    +
    +
    +
    +

    {{ .Title }}

    +
    -
    -
    -
    - - {{ range .Params.tags }} - {{ . }} - {{ end }} -
    -
    - {{ .Summary }} - {{ if .Truncated }} - Read more... - {{ end }} +
    +
    + + {{ partial "tags.html" .Params.tags }} +
    +
    + {{ .Summary }} + {{ if .Truncated }} + Read more... + {{ end }} +
    diff --git a/layouts/link/summary.html b/layouts/link/summary.html index c538741..6c71de1 100644 --- a/layouts/link/summary.html +++ b/layouts/link/summary.html @@ -1,5 +1,5 @@ -
    -
    +
    +

    [LINK] {{ .Title }}

    @@ -8,16 +8,14 @@
    - {{ range .Params.tags }} - {{ . }} - {{ end }} + {{ partial "tags.html" .Params.tags }}
    {{ .Content }}

    - go >> + >>>

    -
    -
    +
    +
    diff --git a/layouts/note/summary.html b/layouts/note/summary.html index 18e64b9..5e03ff2 100644 --- a/layouts/note/summary.html +++ b/layouts/note/summary.html @@ -1,16 +1,15 @@ -
    -
    +
    +
    - {{ range .Params.tags }} - {{ . }} - {{ end }} + {{ partial "tags.html" .Params.tags }}
    -
    +
    +
    {{ .Content }} - +
    -
    -
    +
    +
    diff --git a/layouts/page/single.html b/layouts/page/single.html new file mode 100644 index 0000000..d7a7cd4 --- /dev/null +++ b/layouts/page/single.html @@ -0,0 +1,26 @@ +{{ define "main" }} +
    +
    +
    +
    +
    +

    + {{ .Title }} +

    +
    +
    +
    +
    + {{ partial "tags.html" .Params.tags }} +
    +
    +
    + {{ .Content }} +
    +
    +
    + {{ partial "comments.html" . }} +
    +
    +
    +{{ end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 45d5f63..bc42571 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,21 +1,21 @@ -
    +
    -
    - +
    {{ with .Site.Menus.main }} -
    +