From cdc13f1bf79371100668742d0cf5d26ac79023cb Mon Sep 17 00:00:00 2001 From: vimux Date: Wed, 14 Nov 2018 13:34:07 -0500 Subject: [PATCH] Improve semantic layout --- layouts/404.html | 12 +++++++----- layouts/_default/baseof.html | 2 +- layouts/_default/list.html | 16 +++++++++------- layouts/_default/single.html | 32 +++++++++++++++++--------------- layouts/index.html | 34 ++++++++++++++++++---------------- 5 files changed, 52 insertions(+), 44 deletions(-) diff --git a/layouts/404.html b/layouts/404.html index 5d5132a..7fd04c0 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,7 +1,9 @@ {{ define "main" }} -
-

{{ T "page404_title" }}

-

{{ T "page404_lead" }}

- {{ T "page404_link" }} -
+
+
+

{{ T "page404_title" }}

+

{{ T "page404_lead" }}

+ {{ T "page404_link" }} +
+
{{ end }} \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 0208370..a7a0bca 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -26,7 +26,7 @@ {{ partial "header" . }} -
+
{{ block "main" . }} {{- if or .Title .Content }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index bd8a291..07d2608 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,10 +1,12 @@ {{ define "main" }} -
- {{ range .Paginator.Pages }} -
- {{ .Render "summary" }} -
- {{ end }} -
+
+
+ {{ range .Paginator.Pages }} +
+ {{ .Render "summary" }} +
+ {{ end }} +
+
{{ partial "pagination.html" . }} {{ end }} \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b841ac2..c862940 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,19 +1,21 @@ {{ define "main" }} -
-
- {{- partial "post_thumbnail.html" (dict "page" . ) }} -
{{ partial "post_meta.html" . }}
-

{{ .Title }}

- {{- partial "post_toc.html" . }} -
{{ .Content }}
- {{ if or (.Param "share") (isset $.Params "tags") }} -
- {{ partial "post_tags.html" . }} - {{ partial "post_share.html" . }} -
- {{ end }} -
-
+
+
+
+ {{- partial "post_thumbnail.html" (dict "page" . ) }} +
{{ partial "post_meta.html" . }}
+

{{ .Title }}

+ {{- partial "post_toc.html" . }} +
{{ .Content }}
+ {{ if or (.Param "share") (isset $.Params "tags") }} +
+ {{ partial "post_tags.html" . }} + {{ partial "post_share.html" . }} +
+ {{ end }} +
+
+
{{ partial "related.html" . }} {{ partial "comments.html" . }} {{ end }} \ No newline at end of file diff --git a/layouts/index.html b/layouts/index.html index 6ec6de9..9b76715 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,20 +1,22 @@ {{ define "main" }} -
- {{ $mainSections := .Site.Params.mainSections | default (slice "post") }} - {{ $paginator := .Paginate ( where .Data.Pages "Section" "in" $mainSections ) }} - {{ range $paginator.Pages }} -
- {{ .Render "summary" }} +
+
+ {{ $mainSections := .Site.Params.mainSections | default (slice "post") }} + {{ $paginator := .Paginate ( where .Data.Pages "Section" "in" $mainSections ) }} + {{ range $paginator.Pages }} +
+ {{ .Render "summary" }} +
+ {{ end }}
- {{ end }} -
- {{- if eq $paginator.TotalNumberOfElements 0 }} -
-
¯\_(ツ)_/¯
-

{{ T "empty_title" }}

-

{{ T "empty_text_start" | safeHTML }} ({{ delimit (apply $mainSections "printf" "content/%s" ".") ", " | safeHTML }}), {{ T "empty_text_end" }}.

-

{{ T "empty_tip" | safeHTML }}

-
- {{- end }} + {{- if eq $paginator.TotalNumberOfElements 0 }} +
+
¯\_(ツ)_/¯
+

{{ T "empty_title" }}

+

{{ T "empty_text_start" | safeHTML }} ({{ delimit (apply $mainSections "printf" "content/%s" ".") ", " | safeHTML }}), {{ T "empty_text_end" }}.

+

{{ T "empty_tip" | safeHTML }}

+
+ {{- end }} + {{ partial "pagination.html" . }} {{ end }} \ No newline at end of file