From d0b426c3fa6acdc8cdb4a42d23b59544ee3b4691 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Wed, 22 Apr 2020 12:14:28 +0200 Subject: [PATCH] Fix html errors. --- layouts/_default/baseof.html | 8 +++--- layouts/_default/list.html | 46 ++++++++++++---------------------- layouts/_default/single.html | 48 ++++++++++++++---------------------- layouts/_default/terms.html | 43 ++++++++++++-------------------- layouts/index.html | 29 +++++++++++----------- layouts/partials/footer.html | 3 +++ layouts/partials/head.html | 19 +++++++------- 7 files changed, 81 insertions(+), 115 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 5f8e2ec..b941097 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,11 +1,11 @@ - {{- partial "head.html" . -}} + {{- partial "header.html" . -}} - {{- partial "header.html" . -}} -
+
+ {{- partial "head.html" . -}} {{- block "main" . }}{{- end }} -
{{- partial "footer.html" . -}} +
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 32f5e0b..41a4c6f 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,31 +1,17 @@ - - -{{ partial "header.html" . }} +{{ define "main" }} +{{ if isset .Data "Term" }} +

Entries tagged - "{{ .Data.Term }}"

+{{ else }} +

All articles

+{{ end }} - -
- {{ partial "head.html" . }} - - {{ if isset .Data "Term" }} -

Entries tagged - "{{ .Data.Term }}"

- {{ else }} -

All articles

- {{ end }} - - - {{ partial "footer.html" . }} -
- - - - - + +{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index cfdb8fc..e072801 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,22 +1,15 @@ - - -{{ partial "header.html" . }} - -
- {{ partial "head.html" . }} +{{ define "main" }}
-
+

{{ .Title }}

Posted on {{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} DRAFT {{ end }}
-
- {{ if isset .Params "tldr" }} -
- tl;dr: - {{ .Params.tldr }} -
{{ end }} -
+ {{ if isset .Params "tldr" }} +
+ tl;dr: + {{ .Params.tldr }} +
{{ end }}
{{ .Content }} @@ -24,20 +17,17 @@
{{ if ne .Type "page" }} - {{ if gt .Params.tags 0 }} - - {{ end }} + {{ if gt .Params.tags 0 }} + + {{ end }} {{ end }}
- - - {{ partial "footer.html" . }} -
- - + + +{{ end }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index cec21f6..fea9c2f 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,31 +1,20 @@ - - -{{ partial "header.html" . }} +{{ define "main" }} +

All tags

- -
- {{ partial "head.html" . }} +{{ $biggest := 1 }} +{{ $smallest := 1 }} +{{ $max := 3 }} +{{ $min := 1 }} +{{ $size := $min }} -

All tags

- - {{ $biggest := 1 }} - {{ $smallest := 1 }} - {{ $max := 3 }} - {{ $min := 1 }} - {{ $size := $min }} - - {{ $data := .Data }} -
-
    +{{ $data := .Data }} +
    +
      {{ range $key, $value := .Data.Terms.ByCount }} - {{ $size := (add (mul (div $value.Count $biggest) (sub $max $min)) $min) }} - {{ $size := (cond (eq $biggest $smallest) $min $size) }} -
    • {{ $value.Name }}
      • + {{ $size := (add (mul (div $value.Count $biggest) (sub $max $min)) $min) }} + {{ $size := (cond (eq $biggest $smallest) $min $size) }} +
    • {{ $value.Name }}
      • {{ end }} -
    -
    - {{ partial "footer.html" . }} -
- - - + +
+{{ end }} diff --git a/layouts/index.html b/layouts/index.html index 29443fe..77490de 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,28 +1,29 @@ -{{ partial "header.html" . }} - - {{ partial "head.html" . }} - + {{ partial "header.html" . }} + +
+ {{ partial "head.html" . }} +
-
- {{- if isset .Site.Params "subtitle" -}} -

{{ .Site.Params.Subtitle | markdownify }}

- {{- end -}} -
+
+ {{- if isset .Site.Params "subtitle" -}} +

{{ .Site.Params.Subtitle | markdownify }}

+ {{- end -}} +
{{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }} {{ $paginator := .Paginate (where $pages "Params.hidden" "ne" true) }} {{ range $paginator.Pages }}

{{.Title}}

-
+
{{ if isset .Params "description" }} {{ .Description }} {{ else }} {{ .Summary }}… {{ end }} -
+
Read more ⟶
{{ end }} @@ -31,7 +32,5 @@ {{ partial "footer.html" . }}
- - - - \ No newline at end of file + + diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 9b006d1..a209a00 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -8,7 +8,10 @@ {{ if not .Site.IsServer }} {{ template "_internal/google_analytics_async.html" . }} {{ end }} + +{{- if (isset .Site.Params "social") -}} +{{- end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 00c79da..ab3f39d 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,11 +1,10 @@ -
-
- {{ .Site.Title }} -
- -
\ No newline at end of file +
+ {{ .Site.Title }} +
+ +