From 6283825517f49afa18b4bb6f1d820a08f8f6e290 Mon Sep 17 00:00:00 2001 From: Alexandre Vicenzi Date: Mon, 10 Feb 2020 19:38:11 +0100 Subject: Lanyon update --- layouts/404.html | 9 +++-- layouts/_default/baseof.html | 66 +++++++++++++++++++++++++++++++++---- layouts/_default/list.html | 10 ++++-- layouts/_default/single.html | 11 +++++-- layouts/index.html | 39 ++++++++++++++-------- layouts/partials/footer.html | 5 +++ layouts/partials/head.html | 35 -------------------- layouts/partials/head_fonts.html | 1 - layouts/partials/hook_head_end.html | 0 layouts/partials/sidebar.html | 39 +++++++++++++++++----- layouts/partials/theme-color.html | 17 ++++++++++ 11 files changed, 159 insertions(+), 73 deletions(-) create mode 100644 layouts/partials/footer.html delete mode 100644 layouts/partials/head.html delete mode 100644 layouts/partials/head_fonts.html delete mode 100644 layouts/partials/hook_head_end.html create mode 100644 layouts/partials/theme-color.html (limited to 'layouts') diff --git a/layouts/404.html b/layouts/404.html index a919514..4f1c246 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,4 +1,7 @@ {{ define "main" -}} -

404: Page not found

-

Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. Head back home to try finding it again.

-{{- end }} \ No newline at end of file +

Page not found

+

+ Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. + Head back home to try finding it again. +

+{{- end }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 4fada03..658c98e 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,10 +1,62 @@ -{{ partial "head.html" . }} - + + + + + + {{ hugo.Generator }} + + + + {{ if .IsHome -}} + {{ .Site.Title }} + {{- else -}} + {{ .Title }} · {{ .Site.Title }} + {{- end }} + + + + + + + + {{ partial "theme-color.html" . }} + + {{ range $.Site.Params.customCss -}} + + {{- end}} + + + + + + + + + + {{ range .AlternativeOutputFormats -}} + {{ printf `` .Permalink .Rel .MediaType.Type $.Site.Title | safeHTML }} + {{ end -}} + + {{ partial "sidebar.html" . }} -
- {{ block "main" . -}}{{- end }} -
- {{ template "_internal/google_analytics_async.html" . }} - +
+ {{ block "main" . -}}{{- end }} +
+ + {{ partial "footer.html" . }} + + + + {{ range $.Site.Params.customJs -}} + + {{- end}} + + {{ template "_internal/google_analytics_async.html" . }} + diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 47a6453..b5b6ed3 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,9 +1,13 @@ {{ define "main" -}} {{- end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 735bbf7..b3554ca 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,12 +1,19 @@ {{ define "main" -}}

{{ .Title }}

- + + {{ if ne .Type "page" -}} +
+ · {{ .ReadingTime }} min read +
+ {{- end }} + {{ .Content }}
-{{ if .Site.DisqusShortname -}} +{{ if (and .Site.DisqusShortname (eq .Params.DisableComments false)) -}}

Comments

{{ template "_internal/disqus.html" . }} {{- end }} + {{- end }} diff --git a/layouts/index.html b/layouts/index.html index ec6d2eb..28e95ae 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,18 +1,29 @@ {{ define "main" -}}
-{{ range .Site.RegularPages -}} -
-

- {{ .Title }} -

- - {{ .Summary }} - {{ if .Truncated }} -
- Read More… -
- {{ end }} -
-{{- end }} + {{ range .Site.RegularPages -}} + {{ if and (or (eq .Type "post") (eq .Type "article")) (or (not (isset .Params "Hidden")) (eq .Params.Hidden false)) -}} +
+

+ {{ .Title }} +

+ +
+ · {{ .ReadingTime }} min read +
+ + {{ if .Description }} + {{ .Description }} + {{ else }} + {{ .Summary }} + {{ end }} + + {{ if .Truncated }} +
+ Read More +
+ {{ end }} +
+ {{- end }} + {{- end }}
{{- end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html new file mode 100644 index 0000000..d8e44e7 --- /dev/null +++ b/layouts/partials/footer.html @@ -0,0 +1,5 @@ + diff --git a/layouts/partials/head.html b/layouts/partials/head.html deleted file mode 100644 index 56a3157..0000000 --- a/layouts/partials/head.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - {{ hugo.Generator }} - - - - - {{ if .IsHome -}} - {{ .Site.Title }} - {{- else -}} - {{ .Title }} · {{ .Site.Title }} - {{- end }} - - - - - - - - {{ partial "head_fonts.html" . }} - - - - - - - {{ range .AlternativeOutputFormats -}} - {{ printf `` .Permalink .Rel .MediaType.Type $.Site.Title | safeHTML }} - {{ end -}} - - {{ partial "hook_head_end.html" . }} - diff --git a/layouts/partials/head_fonts.html b/layouts/partials/head_fonts.html deleted file mode 100644 index 4729eb2..0000000 --- a/layouts/partials/head_fonts.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/layouts/partials/hook_head_end.html b/layouts/partials/hook_head_end.html deleted file mode 100644 index e69de29..0000000 diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 162fcad..22ecbf5 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,21 +1,44 @@ diff --git a/layouts/partials/theme-color.html b/layouts/partials/theme-color.html new file mode 100644 index 0000000..0f624af --- /dev/null +++ b/layouts/partials/theme-color.html @@ -0,0 +1,17 @@ +{{ with $.Site.Params.themeColor }} + +{{ end }} -- cgit v1.2.1