From bc0baf01702dd63eb9e5e9971b5e3d76aef18333 Mon Sep 17 00:00:00 2001 From: Grant Hutchins Date: Sun, 25 Oct 2020 13:08:30 -0500 Subject: [PATCH 01/20] Fix list style in post list Setting a list style of "none" for all list items within the #post-list is overly broad. We should only affect the direct child list items so that any
  • tags within a post retain their proper list style. --- static/assets/css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/assets/css/style.css b/static/assets/css/style.css index 6ddec088..10ffc97d 100644 --- a/static/assets/css/style.css +++ b/static/assets/css/style.css @@ -318,11 +318,11 @@ Post List =========================================== */ -#post-list li { +#post-list > li { list-style-type: none; } -#post-list li:last-child { +#post-list > li:last-child { margin-bottom: 0; } From 921d51733fd6cea1610b412e8c3200b318276e1d Mon Sep 17 00:00:00 2001 From: John D Pell Date: Tue, 10 May 2022 18:54:36 -0700 Subject: [PATCH 02/20] This seems to be the whitespace convention --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig 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 From 6f7c67f73e25f5c6333f8072bfcac39b1f326260 Mon Sep 17 00:00:00 2001 From: John D Pell <52194+gaelicWizard@users.noreply.github.com> Date: Tue, 10 May 2022 18:35:32 -0700 Subject: [PATCH 03/20] Fix up microformats in single layouts --- layouts/_default/single.html | 28 ++++++++++--------- layouts/post/single.html | 52 +++++++++++++++++------------------- layouts/reply/single.html | 42 ++++++++++++++--------------- 3 files changed, 60 insertions(+), 62 deletions(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index f4d839cf..fb11d59b 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,19 +1,21 @@ -{{ define "main" }} +{{ define "main" -}} -
    - - -
    - {{ .Site.Author.name }} - @{{ .Site.Author.username }} -
    - -
    -{{ end }} \ No newline at end of file +{{- end }} diff --git a/layouts/post/single.html b/layouts/post/single.html index b687ba6e..ba339e66 100755 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -1,43 +1,39 @@ -{{ define "main" }} +{{ define "main" -}}
    - {{ with .Title }} + {{ with .Title -}}

    {{ . }}

    - {{ end }} + {{- end }}

    -

    - {{ .Content }} + {{- .Content -}}
    - {{ if .Site.Params.include_conversation }} + {{ if .Site.Params.include_conversation -}} - {{ end }} + {{- end }} -
    - - {{ if .Params.author }} - - - {{ else }} - -
    - {{ .Site.Author.name }} - @{{ .Site.Author.username }} -
    - {{ end }} +
    +
    -{{ end }} - - - - +{{- end }} diff --git a/layouts/reply/single.html b/layouts/reply/single.html index fc6c77ec..84622aa2 100644 --- a/layouts/reply/single.html +++ b/layouts/reply/single.html @@ -1,34 +1,34 @@ -{{ define "main" }} +{{ define "main" -}}
    - {{ with .Title }} + {{ with .Title -}}

    {{ . }}

    - {{ end }} + {{- end }}

    -

    - Replying to: {{ .Params.reply_to_username }} - {{ if eq .Params.reply_to_hostname "micro.blog" }} - @{{ .Params.reply_to_username }} - {{ else }} - {{ .Params.reply_to_hostname }} - {{ end }} + Replying to: {{ .Params.reply_to_username }} + {{ if eq .Params.reply_to_hostname "micro.blog" }} + @{{ .Params.reply_to_username }} + {{ else }} + {{ .Params.reply_to_hostname }} + {{ end }}
    - {{ .Content }} + {{- .Content -}}
    +
    -
    - - -
    - {{ .Site.Author.name }} - @{{ .Site.Author.username }} -
    - -
    -{{ end }} +{{- end }} From bca631f50384267d955b127f131b0f30db10386c Mon Sep 17 00:00:00 2001 From: John D Pell Date: Tue, 10 May 2022 19:04:35 -0700 Subject: [PATCH 04/20] whitespace --- layouts/index.html | 44 ++++++++++---------- layouts/section/replies.html | 78 ++++++++++++++++++------------------ 2 files changed, 60 insertions(+), 62 deletions(-) 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 or .IsHome .Site.Params.paginate_categories }} - {{ $paginator := .Paginate (where .Site.Pages.ByDate.Reverse "Type" "post") }} - {{ $list := $paginator.Pages }} - {{ range $list }} - {{ partial "post-item.html" . }} - {{ end }} -{{ else }} - {{ $list := where .Site.Pages.ByDate.Reverse "Type" "post" }} - {{ range $list }} - {{ partial "post-item.html" . }} - {{ end }} -{{ end }} + {{- if or .IsHome .Site.Params.paginate_categories }} + {{ $paginator := .Paginate (where .Site.Pages.ByDate.Reverse "Type" "post") }} + {{ $list := $paginator.Pages }} + {{ range $list }} + {{ partial "post-item.html" . }} + {{ end }} + {{- else -}} + {{ $list := where .Site.Pages.ByDate.Reverse "Type" "post" }} + {{ range $list }} + {{ partial "post-item.html" . }} + {{ end }} + {{ end -}} -
    + -{{ 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/section/replies.html b/layouts/section/replies.html index b7dd2035..b4506faf 100644 --- a/layouts/section/replies.html +++ b/layouts/section/replies.html @@ -1,40 +1,38 @@ -{{ define "main" }} - -
    -
    - - {{ if .Site.Params.paginate_replies }} -
    -

    Replies

    -
    - {{ else }} -
    -

    Recent Replies

    -
    - {{ end }} - -
    -
    - -
      - - {{ if .Site.Params.paginate_replies }} - {{ $paginator := .Paginate (where .Data.Pages.ByDate.Reverse "Type" "reply") }} - {{ $list := $paginator.Pages }} - {{ range $list }} - {{ partial "post-item.html" . }} - {{ end }} - {{ else }} - {{ $list := first 25 (where .Data.Pages.ByDate.Reverse "Type" "reply") }} - {{ range $list }} - {{ partial "post-item.html" . }} - {{ end }} - {{ end }} - -
    - - {{ if .Site.Params.paginate_replies }} - {{ partial "pagination" . }} - {{ end }} - -{{ end }} \ No newline at end of file +{{ define "main" -}} + + + +
      + + {{- if .Site.Params.paginate_replies }} + {{ $paginator := .Paginate (where .Data.Pages.ByDate.Reverse "Type" "reply") }} + {{ $list := $paginator.Pages }} + {{ range $list }} + {{ partial "post-item.html" . }} + {{ end }} + {{- else -}} + {{ $list := first 25 (where .Data.Pages.ByDate.Reverse "Type" "reply") }} + {{ range $list }} + {{ partial "post-item.html" . }} + {{ end }} + {{ end -}} + +
    + + {{- if .Site.Params.paginate_replies }} + {{ partial "pagination" . }} + {{ end -}} + +{{- end }} From 61565fc10aaa26dbc2ecf09a12963f98a82fd2eb Mon Sep 17 00:00:00 2001 From: John D Pell Date: Tue, 10 May 2022 20:40:21 -0700 Subject: [PATCH 05/20] whitespace --- static/assets/css/style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/static/assets/css/style.css b/static/assets/css/style.css index d92f77ca..b73bd31e 100644 --- a/static/assets/css/style.css +++ b/static/assets/css/style.css @@ -179,7 +179,7 @@ li { list-style-type:circle; list-style-position:inside;} article ol li { list-style-type: decimal; padding-left: 20px; -} +} article ul li { list-style-type: disc; @@ -195,7 +195,7 @@ article ul li { } article img { - padding: 20px 0px 20px 0px; + padding: 20px 0px 20px 0px; } b, strong { @@ -206,7 +206,7 @@ em, i { font-style: italic; } -sup { +sup { vertical-align: super; font-size: smaller; } @@ -555,7 +555,7 @@ video { display: block; } -/* +/* article #post-list li { list-style-type: disc; } From 015fd1ee681a947222a23262241e5a95caf3ce43 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Tue, 10 May 2022 20:40:31 -0700 Subject: [PATCH 06/20] Remove unneccessary `id=wrapper` from `profile.html` There cannot be more than one `id=wrapper` on the resulting HTML page --- layouts/partials/profile.html | 20 +++++++++----------- static/assets/css/style.css | 4 ++-- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/layouts/partials/profile.html b/layouts/partials/profile.html index 1bbe310b..04ca8c75 100755 --- a/layouts/partials/profile.html +++ b/layouts/partials/profile.html @@ -1,11 +1,9 @@ -
    -
    -
    - - - -

    {{ .Site.Author.name }}

    -

    {{ .Site.Params.description | safeHTML }}

    -
    -
    -
    + diff --git a/static/assets/css/style.css b/static/assets/css/style.css index b73bd31e..e5fb5cf5 100644 --- a/static/assets/css/style.css +++ b/static/assets/css/style.css @@ -30,7 +30,7 @@ body { /* Profile */ -.profile #wrapper { +.profile { margin: 0 auto; text-align: center; padding: 80px 0; @@ -468,7 +468,7 @@ h2.headline { padding: 35px 0 60px 0; } - .profile #wrapper { + .profile { margin: 0 auto; text-align: center; padding: 70px 0 40px 0; From 10e7052c43182b792f820bca331f469acf4024e4 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Tue, 10 May 2022 20:04:32 -0700 Subject: [PATCH 07/20] whitepsace --- layouts/partials/navigation.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 @@ From 6e6df69a508a51843453245496f95889fedaea70 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Tue, 10 May 2022 20:04:43 -0700 Subject: [PATCH 08/20] whitespace --- layouts/partials/head.html | 80 +++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 8fd780d7..e6fa3198 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,51 +1,51 @@ - - - - + + + + - {{- 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 }} - + + {{ 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 $ }} + {{ range $filename := .Site.Params.plugins_html -}} + {{ partial $filename $ }} {{ end }} From 48d6a71a86cc31a5ddd4ff8ed50655a04bfe0901 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Tue, 10 May 2022 20:04:49 -0700 Subject: [PATCH 09/20] Email --- layouts/partials/footer.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index a62a672c..cb7aa110 100755 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -5,10 +5,12 @@
  • RSS
  • JSON Feed
  • Micro.blog
    • - + {{ with .Site.Author.email -}} +
  • Email
    • + {{- end }}