From 196b82645e33d171aeb36cb9da100f3382aac914 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 30 Mar 2021 18:07:36 +0530 Subject: [PATCH] Fix Spacing in overall repo --- layouts/404.html | 4 +- layouts/_default/archives.html | 4 +- layouts/_default/baseof.html | 7 +- layouts/_default/list.html | 20 +++--- layouts/_default/search.html | 4 +- layouts/_default/single.html | 22 +++--- layouts/_default/terms.html | 4 +- layouts/partials/anchored_headings.html | 2 +- layouts/partials/author.html | 4 +- layouts/partials/breadcrumbs.html | 12 ++-- layouts/partials/comments.html | 8 +-- layouts/partials/cover.html | 2 +- layouts/partials/edit_post.html | 5 +- layouts/partials/extend_footer.html | 8 +-- layouts/partials/extend_head.html | 9 ++- layouts/partials/footer.html | 8 ++- layouts/partials/head.html | 76 +++++++++++---------- layouts/partials/header.html | 27 ++++---- layouts/partials/home_info.html | 8 +-- layouts/partials/index_profile.html | 14 ++-- layouts/partials/post_meta.html | 20 +++--- layouts/partials/share_icons.html | 8 +-- layouts/partials/social_icons.html | 9 +-- layouts/partials/svg.html | 2 +- layouts/partials/templates/schema_json.html | 4 +- layouts/partials/toc.html | 28 ++++---- layouts/partials/translation_list.html | 6 +- 27 files changed, 167 insertions(+), 158 deletions(-) diff --git a/layouts/404.html b/layouts/404.html index 6f6f3a10..a405573e 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,3 +1,3 @@ -{{ define "main" }} +{{- define "main" }}
404
-{{ end }}{{/* end main */}} \ No newline at end of file +{{- end }}{{/* end main */ -}} diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index 5daf2aae..f69b2727 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -20,7 +20,7 @@

{{- .Key }}  {{ len .Pages }}

- {{- range .Pages }} + {{- range .Pages }} {{- if eq .Kind "page" }}

@@ -40,4 +40,4 @@ {{- end }} {{- end }} -{{- end }}{{/* end main */}} +{{- end }}{{/* end main */}} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 8f17b936..20c6fbf4 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -13,12 +13,11 @@ {{- print " dark" }} {{- end -}} " id="top"> - {{- partialCached "header.html" . .Page}} + {{- partialCached "header.html" . .Page -}}
- {{- block "main" . }} - {{- end }} + {{- block "main" . }}{{ end }}
- {{- partialCached "footer.html" . .Type .Layout .Params }} + {{ partialCached "footer.html" . .Type .Layout .Params -}} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index a1905b5c..0131412e 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -20,15 +20,15 @@ {{- if .IsHome }} {{- $pages = where site.RegularPages "Type" "in" site.Params.mainSections }} -{{- end}} +{{- end }} -{{ $paginator := .Paginate $pages }} +{{- $paginator := .Paginate $pages }} {{- if and .IsHome .Site.Params.homeInfoParams (eq $paginator.PageNumber 1) }} {{- partial "home_info.html" . }} {{- end }} -{{ $term := .Data.Term}} +{{- $term := .Data.Term }} {{- range $index, $page := $paginator.Pages }} {{- $class := "post-entry" }} @@ -41,17 +41,17 @@ {{- end }}
- {{- $isHidden := (.Site.Params.cover.hidden | default .Site.Params.cover.hiddenInList)}} + {{- $isHidden := (.Site.Params.cover.hidden | default .Site.Params.cover.hiddenInList) }} {{- partial "cover.html" (dict "cxt" . "IsHome" true "isHidden" $isHidden) }}

- {{ .Title }} - {{- if .Draft }}
  [draft]
{{- end }} + {{- .Title }} + {{- if .Draft }}
  [draft]
{{ end -}}

- {{- if (ne (.Param "hideSummary") true)}} + {{- if (ne (.Param "hideSummary") true) }}
-

{{ .Summary | plainify | htmlUnescape }}{{- if .Truncated }}...{{- end -}}

+

{{ .Summary | plainify | htmlUnescape }}{{ if .Truncated }}...{{ end }}

{{- end }} {{- if not (.Param "hideMeta") }} @@ -75,5 +75,7 @@ {{- end }} -{{end}}{{/* end profileMode */}} + +{{- end }}{{/* end profileMode */}} + {{- end }}{{- /* end main */ -}} diff --git a/layouts/_default/search.html b/layouts/_default/search.html index ae9ba068..e3dc7d47 100644 --- a/layouts/_default/search.html +++ b/layouts/_default/search.html @@ -17,11 +17,11 @@
{{- partial "translation_list.html" . -}}
- {{- end}} + {{- end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b3f8d464..db2374a4 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,7 +2,7 @@
- {{- partial "breadcrumbs.html" . }} + {{ partial "breadcrumbs.html" . }}

{{ .Title }} {{- if .Draft }}
  [draft]
{{- end }} @@ -14,13 +14,13 @@ {{- end }} {{- if not (.Param "hideMeta") }}
- {{- partial "post_meta.html" . -}} + {{- partial "post_meta.html" . -}} {{- partial "translation_list.html" . -}} {{- partial "edit_post.html" . -}}
- {{- end}} + {{- end }}

- {{- $isHidden := .Params.cover.hidden | default .Site.Params.cover.hiddenInSingle | default .Site.Params.cover.hidden}} + {{- $isHidden := .Params.cover.hidden | default .Site.Params.cover.hiddenInSingle | default .Site.Params.cover.hidden }} {{- partial "cover.html" (dict "cxt" . "IsHome" false "isHidden" $isHidden) }} {{- if (.Param "ShowToc") }} {{- partial "toc.html" . }} @@ -41,24 +41,24 @@ {{- if and (gt (len $pages) 1) (in $pages . ) }} {{- end }} {{- end }} - {{- if (and .Site.Params.ShowShareButtons (ne .Params.disableShare true) ) }} - {{- partial "share_icons.html" . }} + {{- if (and .Site.Params.ShowShareButtons (ne .Params.disableShare true)) }} + {{- partial "share_icons.html" . -}} {{- end }} @@ -67,4 +67,4 @@ {{- end }}
-{{- end }}{{/* end main */}} +{{- end }}{{/* end main */}} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index b0919875..d5a9e66e 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,4 +1,4 @@ -{{ define "main" }} +{{- define "main" }} {{- if .Title }}
@@ -24,4 +24,4 @@ {{- end }} -{{ end }}{{/* end main */}} +{{- end }}{{/* end main */ -}} diff --git a/layouts/partials/anchored_headings.html b/layouts/partials/anchored_headings.html index 27184fea..377af89d 100644 --- a/layouts/partials/anchored_headings.html +++ b/layouts/partials/anchored_headings.html @@ -1,2 +1,2 @@ - +{{- /* formats .Content headings by adding an anchor */ -}} {{ . | replaceRE "()" "${1}${3}" | safeHTML }} diff --git a/layouts/partials/author.html b/layouts/partials/author.html index a1ef62c9..4582b126 100644 --- a/layouts/partials/author.html +++ b/layouts/partials/author.html @@ -1,7 +1,7 @@ {{- if or .Params.author .Site.Params.author }} -{{- $author := (.Params.author | default .Site.Params.author)}} +{{- $author := (.Params.author | default .Site.Params.author) }} {{- $author_type := (printf "%T" $author) }} -{{- if (or (eq $author_type "[]string") (eq $author_type "[]interface {}") ) }} +{{- if (or (eq $author_type "[]string") (eq $author_type "[]interface {}")) }} {{- (delimit $author ", " ) }} {{- else }} {{- $author }} diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html index 0ffbc095..742254a3 100644 --- a/layouts/partials/breadcrumbs.html +++ b/layouts/partials/breadcrumbs.html @@ -1,9 +1,9 @@ -{{- if (.Param "ShowBreadCrumbs")}} +{{- if (.Param "ShowBreadCrumbs") -}}
- {{- $url := replace .Parent.Permalink ( printf "%s" .Site.BaseURL) "" }} - {{- $lang_url := strings.TrimPrefix ( printf "%s/" .Lang) $url }} + {{- $url := replace .Parent.Permalink (printf "%s" .Site.BaseURL) "" }} + {{- $lang_url := strings.TrimPrefix (printf "%s/" .Lang) $url -}} - {{ i18n "home" | default "Home"}} + {{ i18n "home" | default "Home" }} {{- $scratch := newScratch }} {{- range $index, $element := split $lang_url "/" }} @@ -14,6 +14,6 @@ {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} {{- end }} - {{- end }} + {{- end -}}
-{{- end }} +{{- end -}} diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html index d6ff0103..918451a1 100644 --- a/layouts/partials/comments.html +++ b/layouts/partials/comments.html @@ -1,5 +1,3 @@ - - - \ No newline at end of file +{{- /* Comments area start */ -}} +{{- /* to add comments read => https://gohugo.io/content-management/comments/ */ -}} +{{- /* Comments area end */ -}} diff --git a/layouts/partials/cover.html b/layouts/partials/cover.html index 6f932f9e..3b61a055 100644 --- a/layouts/partials/cover.html +++ b/layouts/partials/cover.html @@ -32,4 +32,4 @@ {{- end }} {{- end }}{{/* End image */}} -{{- end -}}{{/* End context */}} +{{- end -}}{{/* End context */ -}} diff --git a/layouts/partials/edit_post.html b/layouts/partials/edit_post.html index d905b32a..1d90ebda 100644 --- a/layouts/partials/edit_post.html +++ b/layouts/partials/edit_post.html @@ -1,7 +1,8 @@ {{- if or .Params.editPost.URL .Site.Params.editPost.URL -}} {{- $fileUrlPath := path.Join .File.Path }} -{{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) .IsTranslated }}| {{- end -}} + +{{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) .IsTranslated }} | {{- end -}} - {{- .Params.editPost.Text | default (.Site.Params.editPost.Text | default (i18n "edit_post" | default "Edit") ) -}} + {{- .Params.editPost.Text | default (.Site.Params.editPost.Text | default (i18n "edit_post" | default "Edit")) -}} {{- end }} diff --git a/layouts/partials/extend_footer.html b/layouts/partials/extend_footer.html index 52714e8c..0519748c 100644 --- a/layouts/partials/extend_footer.html +++ b/layouts/partials/extend_footer.html @@ -1,5 +1,3 @@ - - - +{{- /* Footer custom content area start */ -}} +{{- /* Insert any custom code web-analytics, resources, etc. here */ -}} +{{- /* Footer custom content area end */ -}} diff --git a/layouts/partials/extend_head.html b/layouts/partials/extend_head.html index d372acc9..150cbefd 100644 --- a/layouts/partials/extend_head.html +++ b/layouts/partials/extend_head.html @@ -1,5 +1,4 @@ - - - \ No newline at end of file +{{- /* Head custom content area start */ -}} +{{- /* Insert any custom code (web-analytics, resources, etc.) - it will appear in the section of every page. */ -}} +{{- /* Can be overwritten by partial with the same name in the global layouts. */ -}} +{{- /* Head custom content area end */ -}} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index f818e85e..eb87737e 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -9,6 +9,7 @@ · Theme PaperMod + {{- if (not .Site.Params.disableScrollToTop) }} {{- end }} + {{- partial "extend_footer.html" . -}} + {{- $isHLJSdisabled := (.Site.Params.assets.disableHLJS | default .Params.disableHLJS ) }} {{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (not $isHLJSdisabled)) }} {{- if not .Site.Params.assets.disableFingerprinting }} {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify | fingerprint }} -{{- else}} +{{- else }} {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify }} -{{- end}} {{- end }} +{{- end }} + -{{- else}} -{{ $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} +{{- else }} +{{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} -{{- end}} +{{- end }} {{- end -}} - - - - - - +{{- /* Favicons */}} + + + + + - -{{- hugo.Generator }} - -{{- range .AlternativeOutputFormats -}} + +{{- /* Generator */}} +{{ hugo.Generator }} + +{{- /* RSS */}} +{{ range .AlternativeOutputFormats -}} {{ end -}} {{- range .AllTranslations -}} - + {{ end }} {{- partial "extend_head.html" . -}} - + +{{- /* Misc */}} {{- if hugo.IsProduction | or (eq .Site.Params.env "production") }} {{- template "_internal/google_analytics_async.html" . }} {{- template "_internal/google_news.html" . }} {{- template "partials/templates/opengraph.html" . }} {{- template "partials/templates/twitter_cards.html" . }} {{- template "partials/templates/schema_json.html" . }} -{{- end }} +{{- end -}} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 8fa2dbe9..52d470f2 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,6 +1,6 @@ -{{- /* theme-toggle is enabled */}} +{{- /* theme-toggle is enabled */}} {{- if (not .Site.Params.disableThemeToggle) }} -{{- /* theme is light */}} +{{- /* theme is light */}} {{- if (eq .Site.Params.defaultTheme "light") }} -{{- /* theme is dark */}} +{{- /* theme is dark */}} {{- else if (eq .Site.Params.defaultTheme "dark") }} {{- else }} -{{- /* theme is auto */}} +{{- /* theme is auto */}} {{- end }} -{{- /* theme-toggle is disabled and theme is auto */}} +{{- /* theme-toggle is disabled and theme is auto */}} {{- else if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark"))}} -{{ end }}{{/* .IsPage end */}} +{{- end }}{{/* .IsPage end */}} -{{ end }} +{{- end -}} diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html index 4d47b2f4..89b2b7c6 100644 --- a/layouts/partials/toc.html +++ b/layouts/partials/toc.html @@ -7,7 +7,7 @@ {{- $headers := findRE "(.|\n])+?" .Content -}} {{- $has_headers := ge (len $headers) 1 -}} {{- if $has_headers -}} - + {{- $largest := 6 -}} {{- range $headers -}} {{- $headerLevel := index (findRE "[1-6]" . 1) 0 -}} @@ -16,9 +16,9 @@ {{- $largest = $headerLevel -}} {{- end -}} {{- end -}} - + {{- $firstHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers 0) 1) 0)) -}} - + {{- $.Scratch.Set "bareul" slice -}}
    {{- range seq (sub $firstHeaderLevel $largest) -}} @@ -28,14 +28,14 @@ {{- range $i, $header := $headers -}} {{- $headerLevel := index (findRE "[1-6]" . 1) 0 -}} {{- $headerLevel := len (seq $headerLevel) -}} - + {{/* get id="xyz" */}} {{- $id := index (findRE "(id=\"(.*?)\")" $header 9) 0 }} - + {{- /* strip id="" to leave xyz, no way to get regex capturing groups in hugo */ -}} {{- $cleanedID := replace (replace $id "id=\"" "") "\"" "" }} {{- $header := replaceRE "((.|\n])+?)" "$1" $header -}} - + {{- if ne $i 0 -}} {{- $prevHeaderLevel := index (findRE "[1-6]" (index $headers (sub $i 1)) 1) 0 -}} {{- $prevHeaderLevel := len (seq $prevHeaderLevel) -}} @@ -66,28 +66,28 @@ {{- end -}} {{- end -}} {{- end -}} - {{- end -}} + {{- end }}
  • {{- $header | safeHTML -}} - {{- else -}} + {{- else }}
  • {{- $header | safeHTML -}} {{- end -}} {{- end -}} {{- $firstHeaderLevel := $largest }} - {{- $lastHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers (sub (len $headers) 1)) 1) 0)) -}} + {{- $lastHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers (sub (len $headers) 1)) 1) 0)) }}
    • {{- range seq (sub $lastHeaderLevel $firstHeaderLevel) -}} - {{- if in ($.Scratch.Get "bareul") (add . $firstHeaderLevel) -}} + {{- if in ($.Scratch.Get "bareul") (add . $firstHeaderLevel) }}
- {{- else -}} + {{- else }} {{- end -}} - {{- end -}} + {{- end }} - {{- end -}} + {{- end }}

-
\ No newline at end of file +
diff --git a/layouts/partials/translation_list.html b/layouts/partials/translation_list.html index a2c2d86c..5e807a97 100644 --- a/layouts/partials/translation_list.html +++ b/layouts/partials/translation_list.html @@ -1,9 +1,9 @@ {{- if .IsTranslated -}} -{{- if (ne .Layout "search")}} +{{- if (ne .Layout "search") }} {{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) }} | {{- end -}} {{- end }} -{{- end }} +{{- end -}}