diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 3576c0b..e6962ee 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,37 +1,34 @@ {{ define "main" }} {{ $baseurl := .Site.BaseURL }} +
+
+ {{ if eq .Data.Singular "tag" }} +

#{{ .Title | lower }}

+ {{ else }} +

{{ .Title }}

+ {{ end }} -
-
-
- {{ if eq .Data.Singular "tag" }} -

#{{ .Title | lower }}

- {{ else }} -

{{ .Title }}

+ {{ .Content }} + +
+ {{ range (.Paginate (.Data.Pages.GroupByDate "2006")).PageGroups }} +

{{ .Key }}

+ {{ range .Pages }} +
+ {{ .Title }} + {{ if .Params.tags }} +
+ {{ range $i, $t := .Params.tags }} + #{{ $t }} + {{ end }} +
+ {{ end }} + + {{ partial "aside" . }} +
+
{{ end }} - - {{ .Content }} - -
- {{ range (.Paginate (.Data.Pages.GroupByDate "2006")).PageGroups }} -

{{ .Key }}

- {{ range .Pages }} -
- {{ .Title }} - {{ if .Params.tags }} -
- {{ range $i, $t := .Params.tags }} - #{{ $t }} - {{ end }} -
- {{ end }} - - {{ partial "aside" . }} -
-
- {{ end }} - {{ end }} -
+ {{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 0e6f311..10bbe8e 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,10 +1,5 @@ {{ define "main" }} - -
-
- {{ partial "article" . }} - {{ partial "single_footer" . }} -
- +{{ partial "article" . }} +{{ partial "single_footer" . }} {{ end }} diff --git a/layouts/index.html b/layouts/index.html index afaef07..8a4b2b3 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,38 +1,25 @@ {{ define "main" }} -
-
-
-
-
-
- {{ range $index, $page := first 10 (where .Site.RegularPages "Section" "in" .Site.Params.mainSections) }} - - {{ end }} -
-
-
+{{ range $index, $page := first 10 (where .Site.RegularPages "Section" "in" .Site.Params.mainSections) }} +
+ + {{ .Title }} + {{ if .Params.tags }} +
+ {{ range $i, $t := .Params.tags }} + + #{{ $t }} + + {{ end }}
-
-
- + {{ end }} + + {{ partial "aside" . }} +
+

{{ .Summary }}

+ {{ if .Truncated }} + {{ .Site.Params.i18n_read_more }} + {{ end }} +
+ +{{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/article.html b/layouts/partials/article.html index 17d1e49..b83d941 100644 --- a/layouts/partials/article.html +++ b/layouts/partials/article.html @@ -1,16 +1,16 @@ -
- {{ .Title }} - {{ if .Params.tags }} -
- {{ range $i, $t := .Params.tags }} - #{{ $t }} - {{ end }} -
+{{ .Title }} + {{ if .Params.tags }} +
+ {{ range $i, $t := .Params.tags }} + #{{ $t }} {{ end }} - - {{ partial "aside" . }} -
- +
+ {{ end }} + +{{ partial "aside" . }} +
+
+
{{.Content}} +
-
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 871be4f..1611ec2 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,15 +1,16 @@ - - -
-
-
-
{{ .Site.Copyright | markdownify }} | Rendered by - Hugo | - Subscribe -
+
- - - + + + \ No newline at end of file diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 09de252..7750d63 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -3,23 +3,31 @@ - {{ .Site.Title }} + {{ if ne .Page.Title .Site.Title }}{{ .Page.Title }} | {{ .Site.Title }} {{ else }}{{ .Site.Title }}{{ end }} {{ partial "meta" . }} {{ partial "header_includes" . -}} -
- - -
\ No newline at end of file +
+
\ No newline at end of file diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index cddb333..2abbc82 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -1,9 +1,7 @@ {{ $pag := $.Paginator }} {{ if gt $pag.TotalPages 1 }}