From d5857f9dbecd498e341c8cb5d0866749c5c554c7 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 10 Jan 2020 19:57:53 +0100 Subject: Squashed 'themes/xmin/' changes from 982dfb3..aa6eb5a aa6eb5a Make post template microformats-compatible 217445a Support XFN 6365d4b Improve semanticity ccbf84f Remove useless main tag ee3e939 Show tags as article metadata 6394af8 Add support for alternative output formats (e.g. RSS) b85fdab Remove non-semantic hr tags from layout 311e7f3 Make 404 page less shouty 773e2d4 Convert to block-based templates 791259e Alphabetically sort CSS properties f61a5f2 Use ISO8601 date format 6d06143 Remove custom fonts git-subtree-dir: themes/xmin git-subtree-split: aa6eb5a51f3bdbc4e7c621d2a36701ef57ce0143 --- layouts/_default/baseof.html | 31 +++++++++++++++++++++++++++++++ layouts/_default/list.html | 6 +++--- layouts/_default/single.html | 30 +++++++++++++++++++----------- layouts/_default/terms.html | 4 ++-- 4 files changed, 55 insertions(+), 16 deletions(-) create mode 100644 layouts/_default/baseof.html (limited to 'layouts/_default') diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html new file mode 100644 index 0000000..6757396 --- /dev/null +++ b/layouts/_default/baseof.html @@ -0,0 +1,31 @@ + + + + + + {{ .Title }} | {{ .Site.Title }} + + {{ range .AlternativeOutputFormats -}} + {{ printf `` .Permalink .Rel .MediaType.Type $.Site.Title | safeHTML }} + {{ end -}} + + + + + + {{ block "main" . }} + {{ end }} + + + + diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 06b290a..bf0af50 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,4 +1,4 @@ -{{ partial "header.html" . }} +{{ define "main" }} {{if not .IsHome }}

{{ .Title | markdownify }}

@@ -11,10 +11,10 @@ {{ if .IsHome }}{{ $pages = .Site.RegularPages }}{{ end }} {{ range (where $pages "Section" "!=" "") }}
  • - {{ .Date.Format "2006/01/02" }} + {{ .Date.Format "2006-01-02" }} {{ .Title | markdownify }}
    • {{ end }} -{{ partial "footer.html" . }} +{{- end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index de3f121..54acdc6 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,12 +1,20 @@ -{{ partial "header.html" . }} -
    -

    {{ .Title | markdownify }}

    -{{ with .Params.author }}

    {{ . }}

    {{ end }} -{{ if (gt .Params.date 0) }}

    {{ .Date.Format "2006/01/02" }}

    {{ end }} -
    +{{ define "main" }} +
    +
    +

    {{ .Title | markdownify }}

    + {{ with .Params.author }}

    {{ . }}

    {{ end }} + {{ if (gt .Params.date 0) }}{{ end }} +

    + {{ range $i := (slice "categories" "tags") }} + {{ with ($.Param $i) }} + {{ $i | title }}: {{ range $k := . }}{{$k}} {{ end }} + {{ end }} + {{ end }} +

    +
    -
    -{{ .Content }} -
    - -{{ partial "footer.html" . }} +
    + {{ .Content }} +
    +
    +{{- end }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 71f47e7..15de7a9 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,4 +1,4 @@ -{{ partial "header.html" . }} +{{ define "main" }}

    {{ .Title }}

    @@ -10,4 +10,4 @@ {{ end }} -{{ partial "footer.html" . }} +{{- end }} -- cgit 1.4.1