diff --git a/config.yaml b/config.yaml index bbd5992..1a7b699 100644 --- a/config.yaml +++ b/config.yaml @@ -26,7 +26,7 @@ menu: - identifier: fediverse name: fediverse title: fediverse - url: https://fedi.vrifox.cc/vrifox + url: https://fedi.vrifox.cc/users/vrifox weight: 1 - identifier: git name: git diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 4a4b14f..28d17af 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,15 +1,12 @@ - {{ with .Title }} {{ . }} – {{ end }}{{ .Site.Title }} - {{ block "stylesheet" . }}{{ end }} - {{ partial "nav.html" . }} {{ block "main" . }}{{ end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index cecb289..1d60811 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,26 +1,28 @@ -{{ define "stylesheet" }}{{ $scss := resources.Get "/_default/list.scss" }}{{ $style := $scss | resources.ToCSS }} - -{{ end }} +{{- define "stylesheet" -}} + {{- $scss := resources.Get "/_default/list.scss" -}} + {{- $style := $scss | resources.ToCSS -}} + +{{- end -}} -{{ define "main" }} -
-
-
-
- {{ range .Pages }} - -
-

{{ .Title }}

- {{ with .Description }}

{{ . }}

{{ end }} -

- {{ .Date.Format "2 January 2006" }} - {{ with .Params.author }}by {{ end }}{{ .Params.author }} -

-
- - {{ end }} + {{- define "main" }} +
+
+
+
+ {{- range .Pages }} + +
+

{{ .Title }}

+ {{ with .Description }}

{{ . }}

{{ end }} +

+ {{ .Date.Format "2 January 2006" }} + {{- with .Params.author }}by {{ . }}{{ end }} +

+
+ + {{- end }} +
+
-
-
-
-{{ end }} + + {{- end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 9d99b49..83573d7 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,63 +1,69 @@ -{{ define "stylesheet" }}{{ $scss := resources.Get "/_default/single.scss" }}{{ $style := $scss | resources.ToCSS }} - -{{ end }} +{{- define "stylesheet" -}} + {{- $scss := resources.Get "/_default/single.scss" -}} + {{- $style := $scss | resources.ToCSS -}} + +{{- end -}} -{{ define "main" }} -
-
-
-
-

- {{ if eq .Params.type "post" }}{{ .Date.Format "2. January 2006" }}{{ end }} - {{ if eq .Params.type "singlepage" }}version: {{ .Date.Format "2006-01-02" }}{{ end }} - {{ with .Params.author }}by {{ end }}{{ .Params.author }} -

-

{{ .Title }}

- {{ with .Params.featured_image }}{{ end }} - {{ .Content }} - -
-
- {{ if ne .Params.type "singlepage" }} -
- - -
- {{ end }} -
-
-{{ end }} + {{- define "main" -}} +
+
+
+
+

+ {{ if eq .Params.type "post" }}{{ .Date.Format "2. January 2006" }}{{ end }} + {{- if eq .Params.type "singlepage" }}version: {{ .Date.Format "2006-01-02" }}{{ end }} + {{- with .Params.author }}by {{ . }}{{ end }} +

+

{{ .Title }}

+ {{ with .Params.featured_image }}{{ end }} + + {{ printf "" | safeHTML }} + {{ .Content }} + {{- printf "" | safeHTML }} + + +
+
+ {{- if ne .Params.type "singlepage" }} +
+ + +
+ {{- end }} +
+
+ {{- end }} diff --git a/layouts/index.html b/layouts/index.html index 80bc874..2eef76a 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,68 +1,74 @@ -{{ define "stylesheet" }}{{ $scss := resources.Get "/index.scss" }}{{ $style := $scss | resources.ToCSS }} - -{{ end }} +{{- define "stylesheet" -}} + {{- $scss := resources.Get "/index.scss" -}} + {{- $style := $scss | resources.ToCSS -}} + +{{- end -}} -{{ define "main" }} -
-
-
-

{{ .Params.heading }}

- {{.Params.subheading}} -
-
- - {{ range sort .Params.contact "weight" "asc" }} - - - - - {{ end }} -
{{ .name }} - {{ with .url }}{{ end }} - {{ .handle }} - {{ with .url }}{{ end }} - {{ with .hint }}{{ .name }}{{ end }} -
-
-
-
-
-
-
- - latest projects - -
- {{ range first 4 (where .Site.RegularPages "Type" "project") }} - -
-

{{ .Title }}

-

{{ with .Params.activetime }}{{ . }}{{ end }}
{{ with .Params.status }}{{ . }}{{ end }}

-
- - {{ end }} + {{- define "main" -}} +
+
+
+

{{ .Params.heading }}

+ {{.Params.subheading}} +
+
+ + {{- range sort .Params.contact "weight" "asc" }} + + + + + {{- end }} +
{{ .name }} + {{- with .url }}{{ end -}} + {{ .handle }} + {{- with .url }}{{ end -}} + {{- with .hint }}{{ .name }}{{ end -}} +
+
-
-
- - latest posts - -
- {{ range first 4 (where .Site.RegularPages "Type" "post") }} - -
-

{{ .Title }}

- {{ with .Description }}

{{ . }}

{{ end }} -

- {{ .Date.Format "2 January 2006" }} - {{ with .Params.author }}by {{ end }}{{ .Params.author }} -

-
- - {{ end }} + +
+
+
+ + latest projects + +
+ {{- range first 4 (where .Site.RegularPages "Type" "project") }} + +
+

{{ .Title }}

+

+ {{ with .Params.activetime }}{{ . }}{{ end }}
+ {{ with .Params.status }}{{ . }}{{ end }} +

+
+ + {{- end }} +
+
+
+
+ + latest posts + +
+ {{- range first 4 (where .Site.RegularPages "Type" "post") }} + +
+

{{ .Title }}

+ {{ with .Description }}

{{ . }}

{{ end }} +

+ {{ .Date.Format "2 January 2006" }} + {{ with .Params.author }}by {{ end }}{{ .Params.author }} +

+
+ + {{- end }} +
+
-
-
-
-{{ end }} + + {{- end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 72c3b0c..702b027 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,20 +1,21 @@ - + + diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 0297c19..860a053 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -1,47 +1,46 @@ -{{ $currentPage := . }} - - + {{ $currentPage := . }} +