diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..8a3acc9b --- /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 68f97ef1..8ce4666b 100755 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,15 +1,12 @@ -{{ partial "head.html" . }} - - {{ partial "header.html" . }} -
- {{ block "main" . }}{{ end }} -
- {{ partial "footer.html" . }} - {{ partial "custom_footer.html" . }} - {{ range .Site.Params.plugins_js }} - - {{ end }} - + {{ partial "head.html" . }} + + {{ partial "header.html" . }} +
+ {{- block "main" . -}}{{- end -}} +
+ {{ partial "footer.html" . }} + {{ partial "custom_footer.html" . }} + diff --git a/layouts/_default/single.html b/layouts/_default/single.html index f4d839cf..bb991f63 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,19 +1,21 @@ -{{ define "main" }} +{{ define "main" -}}
-
-

{{ .Title }}

+
+ {{ with .Title -}} +

{{ . }}

+ {{- end }}
- {{ .Content }} + {{- .Content -}}
+
-
- - -
- {{ .Site.Author.name }} - @{{ .Site.Author.username }} -
- -
-{{ end }} \ No newline at end of file +{{- end }} diff --git a/layouts/index.html b/layouts/index.html index 4bdfbcb2..eefa189e 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,28 +1,28 @@ -{{ define "main" }} +{{ define "main" -}} + -{{ if .IsHome }} - {{ if .Site.Params.paginate_home }} - {{ partial "pagination" . }} - {{ end }} -{{ else if .Site.Params.paginate_categories }} - {{ partial "pagination" . }} -{{ end }} + {{- if .IsHome }} + {{ if .Site.Params.paginate_home }} + {{ partial "pagination" . }} + {{ end }} + {{- else if .Site.Params.paginate_categories -}} + {{ partial "pagination" . }} + {{ end -}} -{{ end }} +{{- end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index a62a672c..e9d568a4 100755 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,20 +1,18 @@ diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 8fd780d7..d093291e 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,51 +1,55 @@ - - - - + + + + - {{- block "title" . -}} - {{- .Site.Title -}} - {{- if and .Title (ne .Title .Site.Title) }} - - {{ .Title }} - {{- end -}} - {{- end -}} + {{- block "title" . -}} + {{- .Site.Title -}} + {{- if and .Title (ne .Title .Site.Title) }} + - {{ .Title }} + {{- end -}} + {{- end -}} - - - + + + - + - {{ if .RSSLink -}} - - - - - {{ end -}} + {{ if .RSSLink -}} + + + + + {{ 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 }} + + {{ 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/navigation.html b/layouts/partials/navigation.html index 5f1b0cde..df9a99f4 100755 --- a/layouts/partials/navigation.html +++ b/layouts/partials/navigation.html @@ -1,15 +1,15 @@ diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index 1dd7cab9..31d9f52d 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -2,12 +2,12 @@ diff --git a/layouts/partials/post-item.html b/layouts/partials/post-item.html index 4c4705ad..691a4b6e 100644 --- a/layouts/partials/post-item.html +++ b/layouts/partials/post-item.html @@ -1,22 +1,17 @@
  • -
    - {{ if .Title }} -
    -
    -

    {{ .Title }}

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

    {{ . }}

    + {{- end }} +
    +
    + {{- .Content -}} +
    + +
    • - diff --git a/layouts/partials/post-list.html b/layouts/partials/post-list.html index 828a6512..08f2b4d4 100755 --- a/layouts/partials/post-list.html +++ b/layouts/partials/post-list.html @@ -1,4 +1,4 @@ -