diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..8a3acc9 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 + +trim_trailing_whitespace = true +insert_final_newline = true + +[*.css] +indent_style = tab diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 660734d..2685816 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,21 +1,12 @@ - - + {{ partial "head.html" . }} - - {{ partial "header.html" . }} - -
-
- {{ block "main" . }}{{ end }} -
-
- +
+ {{- block "main" . -}}{{- end -}} +
{{ partial "footer.html" . }} {{ partial "custom_footer.html" . }} - - diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 7af7288..27d9e7d 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,24 +1,23 @@ -{{ define "main" }} +{{ define "main" -}}
- +{{ $paginator := .Paginate (where .Site.Pages.ByDate.Reverse "Type" "post") (index .Site.Params "archive-paginate" | default 25) }}

subscribe via RSS

-{{ end }} +{{- end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index d24d6b4..fcafc02 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,13 +1,12 @@ -{{ define "main" }} -
- +{{ define "main" -}} +
-

{{ .Title }}

+ {{ with .Title -}} +

{{ . }}

+ {{- end }}
- -
- {{ .Content }} -
- -
-{{ end }} \ No newline at end of file +
+ {{- .Content -}} +
+ +{{- end }} diff --git a/layouts/index.html b/layouts/index.html index 3434cf8..accac61 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,24 +1,24 @@ -{{ define "main" }} +{{ define "main" -}}

subscribe via RSS

-{{ end }} +{{- end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 6ddc6f7..76e121e 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -4,9 +4,9 @@ - {{ block "title" . }} + {{- block "title" . -}} {{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ .Site.Title }} - {{ .Title }}{{ end }} - {{ end }} + {{- end -}} @@ -16,28 +16,37 @@ - {{ if .RSSLink -}} - - - - - {{ end -}} + {{ if .RSSLink -}} + + + + + {{- end }} - - {{ with .Site.Params.twitter_username }} - - {{ end }} - {{ with .Site.Params.github_username }} - - {{ end }} - {{ with .Site.Params.instagram_username }} - - {{ end }} - - - - - - + + {{ with .Site.Params.twitter_username -}} + + {{- end }} + {{ with .Site.Params.github_username -}} + + {{- end }} + {{ with .Site.Params.instagram_username -}} + + {{- end }} + + + + + + + {{ range .Site.Params.plugins_css -}} + + {{ end }} + {{ range $filename := .Site.Params.plugins_html -}} + {{ partial $filename $ }} + {{ end }} + {{ range .Site.Params.plugins_js -}} + + {{ end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 992ff3a..94bb74c 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -14,13 +14,13 @@
- {{ range .Site.Menus.main }} - {{ if .Page.Params.redirect }} - {{ .Name }} - {{ else }} - {{ .Name }} - {{ end }} - {{ end }} + {{ range .Site.Menus.main }} + {{ if .Page.Params.redirect }} + {{ .Name }} + {{ else }} + {{ .Name }} + {{ end }} + {{ end }}
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index a6a5f49..0b6e2f3 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -3,9 +3,9 @@ \ No newline at end of file + diff --git a/layouts/post/single.html b/layouts/post/single.html index c6da9c8..269bcb1 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -1,21 +1,20 @@ -{{ define "main" }} -
- +{{ define "main" -}} +
- {{ if .Title }} -

{{ .Title }}

- {{ end }} + {{ with .Title -}} +

{{ . }}

+ {{- end }}

-
- {{ .Content }} -
+
+ {{- .Content -}} +
-
+ {{ if .Site.Params.include_conversation }} {{ end }} -{{ end }} \ No newline at end of file +{{- end }} diff --git a/layouts/section/replies.html b/layouts/section/replies.html index 453cdd5..939c23e 100644 --- a/layouts/section/replies.html +++ b/layouts/section/replies.html @@ -1,4 +1,4 @@ -{{ define "main" }} +{{ define "main" -}}
-{{ end }} \ No newline at end of file +{{- end }}