diff options
| author | Alan Pearce | 2020-01-10 19:57:53 +0100 |
|---|---|---|
| committer | Alan Pearce | 2020-01-10 19:57:53 +0100 |
| commit | cdd34e9bfbfa6a23b93cedcffaa8d8f9e862fc84 (patch) | |
| tree | 22c02e0642ca4055a768cc8f1ebff95741c273dc /themes/xmin/layouts | |
| parent | eea42a5b1b05fbbdc9f33df41576de0232fcbd4d (diff) | |
| parent | d5857f9dbecd498e341c8cb5d0866749c5c554c7 (diff) | |
| download | website-cdd34e9bfbfa6a23b93cedcffaa8d8f9e862fc84.tar.lz website-cdd34e9bfbfa6a23b93cedcffaa8d8f9e862fc84.tar.zst website-cdd34e9bfbfa6a23b93cedcffaa8d8f9e862fc84.zip | |
Merge commit 'd5857f9dbecd498e341c8cb5d0866749c5c554c7'
Diffstat (limited to 'themes/xmin/layouts')
| -rw-r--r-- | themes/xmin/layouts/404.html | 6 | ||||
| -rw-r--r-- | themes/xmin/layouts/_default/baseof.html | 31 | ||||
| -rw-r--r-- | themes/xmin/layouts/_default/list.html | 6 | ||||
| -rw-r--r-- | themes/xmin/layouts/_default/single.html | 30 | ||||
| -rw-r--r-- | themes/xmin/layouts/_default/terms.html | 4 | ||||
| -rw-r--r-- | themes/xmin/layouts/partials/header.html | 1 |
6 files changed, 58 insertions, 20 deletions
diff --git a/themes/xmin/layouts/404.html b/themes/xmin/layouts/404.html index c2e4e40..2f77920 100644 --- a/themes/xmin/layouts/404.html +++ b/themes/xmin/layouts/404.html @@ -1,5 +1,5 @@ -{{ partial "header.html" . }} +{{ define "main" }} -404 NOT FOUND +404 Not Found -{{ partial "footer.html" . }} +{{- end }} diff --git a/themes/xmin/layouts/_default/baseof.html b/themes/xmin/layouts/_default/baseof.html new file mode 100644 index 0000000..6757396 --- /dev/null +++ b/themes/xmin/layouts/_default/baseof.html @@ -0,0 +1,31 @@ +<!DOCTYPE html> +<html lang="{{ .Site.LanguageCode }}"> + <head profile="//gmpg.org/xfn/11"> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <title>{{ .Title }} | {{ .Site.Title }}</title> + <link rel="stylesheet" href="{{ "/css/style.css" | relURL }}" /> + {{ range .AlternativeOutputFormats -}} + {{ printf `<link href="%s" rel="%s" type="%s" title="%s" />` .Permalink .Rel .MediaType.Type $.Site.Title | safeHTML }} + {{ end -}} + </head> + + <body> + <nav> + <ul> + {{ range .Site.Menus.main }} + <li><a href="{{ .URL | relURL }}">{{ .Name }}</a></li> + {{ end }} + </ul> + </nav> + + {{ block "main" . }} + {{ end }} + + <footer> + {{ with .Site.Params.footer }} + {{ . | markdownify }} + {{ end }} + </footer> + </body> +</html> diff --git a/themes/xmin/layouts/_default/list.html b/themes/xmin/layouts/_default/list.html index 06b290a..bf0af50 100644 --- a/themes/xmin/layouts/_default/list.html +++ b/themes/xmin/layouts/_default/list.html @@ -1,4 +1,4 @@ -{{ partial "header.html" . }} +{{ define "main" }} {{if not .IsHome }} <h1>{{ .Title | markdownify }}</h1> @@ -11,10 +11,10 @@ {{ if .IsHome }}{{ $pages = .Site.RegularPages }}{{ end }} {{ range (where $pages "Section" "!=" "") }} <li> - <span class="date">{{ .Date.Format "2006/01/02" }}</span> + <span class="date">{{ .Date.Format "2006-01-02" }}</span> <a href="{{ .RelPermalink }}">{{ .Title | markdownify }}</a> </li> {{ end }} </ul> -{{ partial "footer.html" . }} +{{- end }} diff --git a/themes/xmin/layouts/_default/single.html b/themes/xmin/layouts/_default/single.html index de3f121..54acdc6 100644 --- a/themes/xmin/layouts/_default/single.html +++ b/themes/xmin/layouts/_default/single.html @@ -1,12 +1,20 @@ -{{ partial "header.html" . }} -<div class="article-meta"> -<h1><span class="title">{{ .Title | markdownify }}</span></h1> -{{ with .Params.author }}<h2 class="author">{{ . }}</h2>{{ end }} -{{ if (gt .Params.date 0) }}<h2 class="date">{{ .Date.Format "2006/01/02" }}</h2>{{ end }} -</div> +{{ define "main" }} +<article class="h-entry"> + <header> + <h1><span class="title p-name">{{ .Title | markdownify }}</span></h1> + {{ with .Params.author }}<h2 class="author">{{ . }}</h2>{{ end }} + {{ if (gt .Params.date 0) }}<time class="dt-published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "2006-01-02" }}</time>{{ end }} + <p class="terms"> + {{ range $i := (slice "categories" "tags") }} + {{ with ($.Param $i) }} + {{ $i | title }}: {{ range $k := . }}<a href="{{ relURL (print "/" $i "/" $k | urlize) }}">{{$k}}</a> {{ end }} + {{ end }} + {{ end }} + </p> + </header> -<main> -{{ .Content }} -</main> - -{{ partial "footer.html" . }} + <main class="e-content"> + {{ .Content }} + </main> +</article> +{{- end }} diff --git a/themes/xmin/layouts/_default/terms.html b/themes/xmin/layouts/_default/terms.html index 71f47e7..15de7a9 100644 --- a/themes/xmin/layouts/_default/terms.html +++ b/themes/xmin/layouts/_default/terms.html @@ -1,4 +1,4 @@ -{{ partial "header.html" . }} +{{ define "main" }} <h1>{{ .Title }}</h1> @@ -10,4 +10,4 @@ {{ end }} </ul> -{{ partial "footer.html" . }} +{{- end }} diff --git a/themes/xmin/layouts/partials/header.html b/themes/xmin/layouts/partials/header.html index 4f431eb..b3dbf64 100644 --- a/themes/xmin/layouts/partials/header.html +++ b/themes/xmin/layouts/partials/header.html @@ -5,7 +5,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>{{ .Title }} | {{ .Site.Title }}</title> <link rel="stylesheet" href="{{ "/css/style.css" | relURL }}" /> - <link rel="stylesheet" href="{{ "/css/fonts.css" | relURL }}" /> {{ partial "head_custom.html" . }} </head> |