From 65f84d6f197c5212b26289a4b99b8198a582c0d4 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 8 Feb 2021 20:21:26 +0530 Subject: [PATCH 001/438] use Parent's Permalink for breadcrumb nav --- layouts/_default/single.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 658d79cc45..ca054336aa 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -4,7 +4,7 @@
{{- if (.Param "ShowBreadCrumbs")}}
- {{- $url := replace .Permalink ( printf "%s" .Site.BaseURL) "" }} + {{- $url := replace .Parent.Permalink ( printf "%s" .Site.BaseURL) "" }} {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} {{ i18n "home" | default "Home"}} From 43ddff0fde3948b6e53d5d5c15fdb7cda4e548db Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 8 Feb 2021 20:28:55 +0530 Subject: [PATCH 002/438] breadcrumb nav as partial --- layouts/_default/single.html | 19 +------------------ layouts/partials/breadcrumbs.html | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 layouts/partials/breadcrumbs.html diff --git a/layouts/_default/single.html b/layouts/_default/single.html index ca054336aa..3673ea634e 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,24 +2,7 @@
- {{- if (.Param "ShowBreadCrumbs")}} -
- {{- $url := replace .Parent.Permalink ( printf "%s" .Site.BaseURL) "" }} - {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} - - {{ i18n "home" | default "Home"}} - {{- range $index, $element := split $lang_url "/" }} - - {{- $.Scratch.Add "path" (printf "%s/" $element )}} - {{- $bc_pg := $.Site.GetPage ($.Scratch.Get "path") -}} - - {{- if (and ($bc_pg) (gt (len . ) 0))}} - {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} - {{- end }} - - {{- end }} -
- {{- end }} + {{- partial "breadcrumbs.html" . }}

{{ .Title }} {{- if .Draft }}
  [draft]
{{- end }} diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html new file mode 100644 index 0000000000..55320892e4 --- /dev/null +++ b/layouts/partials/breadcrumbs.html @@ -0,0 +1,18 @@ +{{- if (.Param "ShowBreadCrumbs")}} +
+ {{- $url := replace .Parent.Permalink ( printf "%s" .Site.BaseURL) "" }} + {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} + + {{ i18n "home" | default "Home"}} + {{- range $index, $element := split $lang_url "/" }} + + {{- $.Scratch.Add "path" (printf "%s/" $element )}} + {{- $bc_pg := $.Site.GetPage ($.Scratch.Get "path") -}} + + {{- if (and ($bc_pg) (gt (len . ) 0))}} + {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} + {{- end }} + + {{- end }} +
+{{- end }} From 37afb5f13e5e11925c9641f1acc4020947a3bad3 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 8 Feb 2021 20:30:34 +0530 Subject: [PATCH 003/438] show breadcrumb nav also on list pages - specifically section pages - should not display on home(index) --- layouts/_default/list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 9518ebf5a0..30b1527b8e 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -6,6 +6,7 @@ {{- if not .IsHome | and .Title }}
+ {{- partial "breadcrumbs.html" . }}

{{ .Title }}

{{- if .Description }}
From 143eb18b756e051641664aca1a9538b52e2f4516 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 10 Feb 2021 20:58:08 +0530 Subject: [PATCH 004/438] handle case where home-info was hidden when num of posts = 0 - fix: #227 - refactor conditions for nested if - also fix for 082d960 --- layouts/_default/list.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 30b1527b8e..bf87ef908a 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -16,6 +16,10 @@

{{ .Title }}

{{- end }} +{{- if and .IsHome .Site.Params.homeInfoParams (eq .Paginator.PageNumber 1) }} +{{- partial "home_info.html" . }} +{{- end }} + {{- $pages := union .RegularPages .Sections }} {{- if .IsHome }} @@ -27,15 +31,14 @@

{{ .Title }}

{{- range $index, $page := $paginator.Pages }} {{- $class := "post-entry" }} -{{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0)) }} -{{- if .Site.Params.homeInfoParams | or .Site.Params.disableSpecial1stPost}} -{{- partial "home_info.html" . }} -{{- else}} + +{{- $user_preferred := or .Site.Params.disableSpecial1stPost .Site.Params.homeInfoParams }} +{{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0) (not $user_preferred)) }} {{- $class = "first-entry" }} -{{- end }} {{- else if $term }} {{- $class = "post-entry tag-entry" }} {{- end }} +
{{- $isHidden := (.Site.Params.cover.hidden | default .Site.Params.cover.hiddenInList)}} {{- partial "cover.html" (dict "cxt" . "IsHome" true "isHidden" $isHidden) }} @@ -72,4 +75,4 @@

{{- end }} {{end}}{{/* end profileMode */}} -{{- end }}{{- /* end main */ -}} +{{- end }}{{- /* end main */ -}} From 1a8e14a8485a615eea260bf6ff24b8ce0ee821dd Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 10 Feb 2021 21:17:40 +0530 Subject: [PATCH 005/438] Use custom paginator's PageNumber for home-info fixes non-mainSections pages from being displayed in the list amend to 143eb18 --- layouts/_default/list.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index bf87ef908a..ab98c95861 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -16,10 +16,6 @@

{{ .Title }}

{{- end }} -{{- if and .IsHome .Site.Params.homeInfoParams (eq .Paginator.PageNumber 1) }} -{{- partial "home_info.html" . }} -{{- end }} - {{- $pages := union .RegularPages .Sections }} {{- if .IsHome }} @@ -27,6 +23,11 @@

{{ .Title }}

{{- end}} {{ $paginator := .Paginate $pages }} + +{{- if and .IsHome .Site.Params.homeInfoParams (eq $paginator.PageNumber 1) }} +{{- partial "home_info.html" . }} +{{- end }} + {{ $term := .Data.Term}} {{- range $index, $page := $paginator.Pages }} From 034da041800de60cfdfa6dbefc00f479f7c009cb Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 10 Feb 2021 21:43:45 +0530 Subject: [PATCH 006/438] use local scratch var in breadcrumbs - fix undisplayed breadcrumbs in section pages having pagination --- layouts/partials/breadcrumbs.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html index 55320892e4..71ce58a2c5 100644 --- a/layouts/partials/breadcrumbs.html +++ b/layouts/partials/breadcrumbs.html @@ -4,10 +4,11 @@ {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} {{ i18n "home" | default "Home"}} + {{- $scratch := newScratch }} {{- range $index, $element := split $lang_url "/" }} - {{- $.Scratch.Add "path" (printf "%s/" $element )}} - {{- $bc_pg := $.Site.GetPage ($.Scratch.Get "path") -}} + {{- $scratch.Add "path" (printf "%s/" $element )}} + {{- $bc_pg := $.Site.GetPage ($scratch.Get "path") -}} {{- if (and ($bc_pg) (gt (len . ) 0))}} {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} From 6f8edf1ffa88129a26eddf508e5d1833b86e486e Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 12 Feb 2021 10:48:04 +0530 Subject: [PATCH 007/438] change theme-switch from 'a' to 'button' and refactor --- assets/css/header.css | 8 +++----- assets/css/reset.css | 1 + layouts/partials/header.html | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/assets/css/header.css b/assets/css/header.css index 910e98ce22..beaf5bd6bf 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -40,11 +40,9 @@ height: 18px; } -a#theme-toggle { - font-size: 24px; - user-select: none; - margin: auto 4px; - cursor: pointer +button#theme-toggle { + font-size: 26px; + margin: auto 4px } body.dark #moon { diff --git a/assets/css/reset.css b/assets/css/reset.css index 4b8e09f804..ee8e77bdbe 100644 --- a/assets/css/reset.css +++ b/assets/css/reset.css @@ -10,6 +10,7 @@ html { } a, +button, body, h1, h2, diff --git a/layouts/partials/header.html b/layouts/partials/header.html index d91cc6fe6c..301367c4e9 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -61,7 +61,7 @@ {{- end }} {{- if (not .Site.Params.disableThemeToggle) }} - + {{- end}} {{ $lang := .Lang}} {{ $separator := or .Title (not .Site.Params.disableThemeToggle)}} From a57641a24b843e9f352299d94d9f353da2071c77 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 12 Feb 2021 10:49:03 +0530 Subject: [PATCH 008/438] fix theme-toggle shown when js is disabled --- layouts/partials/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 301367c4e9..00953ec068 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -40,7 +40,7 @@ {{- end }}
From b523192b513450ef5748fc9df6e86abb3735f744 Mon Sep 17 00:00:00 2001 From: gsh3ll <64195264+gsh3ll@users.noreply.github.com> Date: Fri, 19 Mar 2021 21:21:20 +0800 Subject: [PATCH 031/438] Fix code block wraps on Safari (#298) --- assets/css/post-single.css | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 16a6c12e3b..b4307e2fdd 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -213,7 +213,8 @@ color: rgba(255, 255, 255, .8); background: 0 0; border-radius: 0; - overflow-x: auto + overflow-x: auto; + word-break: break-all; } .post-content blockquote { @@ -243,20 +244,20 @@ } .post-content figure.align-center { - text-align: center; + text-align: center; } -.post-content figure > figcaption { +.post-content figure>figcaption { color: var(--primary); font-size: 16px; font-weight: bold; margin: 8px 0 16px; } -.post-content figure > figcaption > p { - color: var(--secondary); - font-size: 14px; - font-weight: normal; +.post-content figure>figcaption>p { + color: var(--secondary); + font-size: 14px; + font-weight: normal; } .toc { @@ -428,4 +429,4 @@ h6:hover .anchor { [dir="rtl"] .paginav .next { text-align: left; -} +} \ No newline at end of file From 4b24a94a6a316b17945083cb95acd96f1afae48b Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 19 Mar 2021 19:35:36 +0530 Subject: [PATCH 032/438] fix reduced motion in search Results amend to e03348c --- assets/css/zmedia.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index b70aa60e27..14133f0cb2 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -66,7 +66,7 @@ } /* search */ - #searchResults .active { + #searchResults .focus { transform: none; } } From 306aa9fbfc9af725a1c1531cb0106917b725c8f5 Mon Sep 17 00:00:00 2001 From: Kian Kasad Date: Mon, 22 Mar 2021 04:04:02 -0700 Subject: [PATCH 033/438] Fix scrollbar track background in dark mode caused by #308 (#313) --- layouts/partials/header.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 0cdd189ae9..f0e4bd03a2 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -60,6 +60,12 @@ .list { background: var(--theme); } + .list:not(.dark)::-webkit-scrollbar-track { + background: 0 0; + } + .list:not(.dark)::-webkit-scrollbar-thumb { + border-color: var(--theme); + } } {{- end }} From 80ad6ec2a33082e8c0780e9a955bba7803eca2f4 Mon Sep 17 00:00:00 2001 From: Mohammad Noor Abu Khleif Date: Mon, 22 Mar 2021 13:17:40 +0200 Subject: [PATCH 034/438] Add support for `rtl` and `ltr` shortcodes (#293) refer https://github.com/adityatelange/hugo-PaperMod/pull/293#issue-585979395 for usage guide and examples --- layouts/shortcodes/ltr.html | 15 +++++++++++++++ layouts/shortcodes/rtl.html | 15 +++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 layouts/shortcodes/ltr.html create mode 100644 layouts/shortcodes/rtl.html diff --git a/layouts/shortcodes/ltr.html b/layouts/shortcodes/ltr.html new file mode 100644 index 0000000000..4ad7682b09 --- /dev/null +++ b/layouts/shortcodes/ltr.html @@ -0,0 +1,15 @@ +{{ $.Scratch.Set "md" false }} + +{{ if .IsNamedParams }} +{{ $.Scratch.Set "md" (.Get "md") }} +{{ else }} +{{ $.Scratch.Set "md" (.Get 0) }} +{{ end }} + +
+ {{ if eq ($.Scratch.Get "md") false }} + {{ .Inner }} + {{ else }} + {{ .Inner | markdownify }} + {{ end }} +
diff --git a/layouts/shortcodes/rtl.html b/layouts/shortcodes/rtl.html new file mode 100644 index 0000000000..a69b8ce8cd --- /dev/null +++ b/layouts/shortcodes/rtl.html @@ -0,0 +1,15 @@ +{{ $.Scratch.Set "md" false }} + +{{ if .IsNamedParams }} +{{ $.Scratch.Set "md" (.Get "md") }} +{{ else }} +{{ $.Scratch.Set "md" (.Get 0) }} +{{ end }} + +
+ {{ if eq ($.Scratch.Get "md") false }} + {{ .Inner }} + {{ else }} + {{ .Inner | markdownify }} + {{ end }} +
From cb778d8db48676019ff8fc179a1dbe97501c24b4 Mon Sep 17 00:00:00 2001 From: Bassel Cheaib Date: Mon, 22 Mar 2021 13:19:29 +0200 Subject: [PATCH 035/438] Minor adjustments in Arabic translations (#309) --- i18n/ar.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/ar.yaml b/i18n/ar.yaml index 120f998189..11f50a2c8c 100644 --- a/i18n/ar.yaml +++ b/i18n/ar.yaml @@ -6,17 +6,17 @@ - id: read_time translation: - one: "دقيقة واحده" + one: "دقيقة واحدة" two: "دقيقتان" few: "بضع ثوان" zero: "الآن" other: "دقائق {{ .Count }}" - id: toc - translation: "فهرس المحتوي" + translation: "فهرس المحتوى" - id: translations - translation: "ترجمات اخري" + translation: "ترجمات أخرى" - id: home translation: "الصفحة الرئيسية" From d3813138d7ceb03492bca66de450b79049758c88 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 22 Mar 2021 18:16:26 +0530 Subject: [PATCH 036/438] fix more reduced motion in search Results amend to 4b24a94 & e03348c --- assets/css/zmedia.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index 14133f0cb2..d69ee62d2d 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -69,4 +69,8 @@ #searchResults .focus { transform: none; } + + #searchResults li:active { + transform: none; + } } From f3cac6c09e02d9ac2836906368608a4955c1ef42 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 22 Mar 2021 18:21:07 +0530 Subject: [PATCH 037/438] Refactor media queries reduce code --- assets/css/zmedia.css | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index d69ee62d2d..6f63a6dffd 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -40,36 +40,13 @@ } @media (prefers-reduced-motion) { - /* terms */ - .terms-tags a:active { - transform: none; - } - - /* profile-mode */ - .button:active { - transform: none; - } - - /* post-single */ - .share-buttons svg:active { - transform: none; - } - - /* post-entry */ - .post-entry:active { - transform: none; - } - - /* footer */ - .top-link { - transition: none; - } - - /* search */ - #searchResults .focus { - transform: none; - } - + /* terms; profile-mode; post-single; post-entry; post-entry; search; search */ + .terms-tags a:active, + .button:active, + .share-buttons svg:active, + .post-entry:active, + .top-link, + #searchResults .focus, #searchResults li:active { transform: none; } From abfdb54c92a26dcfaf876d2e06c1059ec9254694 Mon Sep 17 00:00:00 2001 From: Syphdias Date: Tue, 23 Mar 2021 10:28:26 +0100 Subject: [PATCH 038/438] Add option to show link in meta data for editing posts (#278) Usage - in site config => Params: editPost: URL: "https://github.com//content" Text: "Suggest Changes" # edit text appendFilePath: true # to append file path to Edit link - in front-matter vars => --- editPost: URL: "https://github.com//content" Text: "Suggest Changes" # edit text appendFilePath: true # to append file path to Edit link --- - Front-matter vars overrides global ones --- i18n/de.yaml | 3 +++ layouts/_default/single.html | 1 + layouts/partials/edit_post.html | 6 ++++++ 3 files changed, 10 insertions(+) create mode 100644 layouts/partials/edit_post.html diff --git a/i18n/de.yaml b/i18n/de.yaml index 66412775c1..fcb53301b1 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -14,3 +14,6 @@ - id: translations translation: "Übersetzungen" + +- id: edit_post + translation: "Bearbeiten" diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 28689422ae..117ce7b0eb 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -16,6 +16,7 @@

{{- partial "post_meta.html" . -}} {{- partial "translation_list.html" . -}} + {{- partial "edit_post.html" . -}}
{{- end}}

diff --git a/layouts/partials/edit_post.html b/layouts/partials/edit_post.html new file mode 100644 index 0000000000..21a33eb5fb --- /dev/null +++ b/layouts/partials/edit_post.html @@ -0,0 +1,6 @@ +{{- if or .Params.editPost.URL .Site.Params.editPost.URL -}} +{{- 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") ) -}} + +{{- end }} From 0ca760a9b323c42f39285d2c410e75419b3e18a0 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 23 Mar 2021 15:10:40 +0530 Subject: [PATCH 039/438] add Description and Summary in JSON schema as in other templates --- layouts/partials/templates/schema_json.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/templates/schema_json.html b/layouts/partials/templates/schema_json.html index df5170b649..6e0a289c97 100644 --- a/layouts/partials/templates/schema_json.html +++ b/layouts/partials/templates/schema_json.html @@ -62,7 +62,7 @@ "@type": "BlogPosting", "headline": {{ .Title | plainify}}, "name": "{{ .Title | plainify }}", - "description": {{ .Summary | plainify | truncate 180 | safeHTML }}, + "description": {{ with .Description | plainify }}{{ . }}{{ else }}{{ .Summary | plainify }}{{ end -}}, "keywords": [ {{- if .Params.keywords }} {{ range $i, $e := .Params.keywords }}{{ if $i }}, {{ end }}{{ $e }}{{ end }} From 772f5711614ae93d57358e55875f4b29ec5f74b6 Mon Sep 17 00:00:00 2001 From: Daniel Atwood Date: Tue, 23 Mar 2021 15:44:46 +0530 Subject: [PATCH 040/438] Update internal tempplate from hugo cp from ffd9dac4218b8f1709de04f7131ca661715fc481 & fe77f7434bc0d7a9b54af69014eb28dbea2b236b tpl: Update date logic of opengraph and schema internal templates * Fix: updated date logic in opengraph template * Updated date logic in schema template * Reformatted opengraph and schema * Wrapped PublishDate and Lastmod in with tpl: Make the build green again Co-authored-by: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Signed-off-by: Aditya Telange <21258296+adityatelange@users.noreply.github.com> --- layouts/partials/templates/opengraph.html | 53 ++++++++++------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/layouts/partials/templates/opengraph.html b/layouts/partials/templates/opengraph.html index c0a647df6c..9c2b8a596c 100644 --- a/layouts/partials/templates/opengraph.html +++ b/layouts/partials/templates/opengraph.html @@ -9,57 +9,52 @@ {{- end}} {{- else }} -{{ with $.Params.images }}{{ range first 6 . -}} - -{{ end }}{{ else -}} + +{{- with $.Params.images -}} +{{- range first 6 . }}{{ end -}} +{{- else -}} {{- $images := $.Resources.ByType "image" -}} {{- $featured := $images.GetMatch "*feature*" -}} {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} {{- with $featured -}} -{{ else -}} -{{- with $.Site.Params.images -}} - -{{ end }}{{ end }}{{ end }} +{{- else -}} +{{- with $.Site.Params.images }}{{ end -}} +{{- end -}} +{{- end -}} {{- end }} -{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} {{- if .IsPage }} -{{- if not .PublishDate.IsZero }} -{{ else if not .Date.IsZero }} -{{ end }} -{{- if not .Lastmod.IsZero }}{{ end }} -{{- else }} -{{- if not .Date.IsZero }} -{{- end }} -{{- end }}{{/* .IsPage */}} +{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} + +{{ with .PublishDate }}{{ end }} +{{ with .Lastmod }}{{ end }} + +{{- range .Site.Authors }} +{{ with .Social.facebook }}{{ end }} +{{ with .Site.Social.facebook }}{{ end }} +{{- with .Params.tags }}{{ range first 6 . }} + +{{- end }}{{ end -}} +{{- end -}} +{{- end -}} {{- with .Params.audio }}{{ end }} {{- with .Params.locale }}{{ end }} {{- with .Site.Params.title }}{{ end }} -{{- with .Params.videos }} -{{- range . }} +{{- with .Params.videos }}{{- range . }} {{ end }}{{ end }} {{- /* If it is part of a series, link to related articles */}} {{- $permalink := .Permalink }} -{{- $siteSeries := .Site.Taxonomies.series }}{{ with .Params.series }} -{{- range $name := . }} +{{- $siteSeries := .Site.Taxonomies.series }} +{{ with .Params.series }}{{- range $name := . }} {{- $series := index $siteSeries ($name | urlize) }} {{- range $page := first 6 $series.Pages }} {{- if ne $page.Permalink $permalink }}{{ end }} {{- end }} {{ end }}{{ end }} -{{- if .IsPage }} -{{- range .Site.Authors }}{{ with .Social.facebook }} -{{ end }}{{ with .Site.Social.facebook }} -{{ end }} - -{{- with .Params.tags }}{{ range first 6 . }} -{{ end }}{{ end }} -{{- end }}{{ end }} - {{- /* Facebook Page Admin ID for Domain Insights */}} {{- with .Site.Social.facebook_admin }}{{ end }} From a2b3be016947538ae60883db01a913865db38e0a Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 25 Mar 2021 10:55:11 +0530 Subject: [PATCH 041/438] Refactor noscript styles to not break with code formatter --- layouts/partials/header.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index f0e4bd03a2..23f25885ea 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -44,7 +44,10 @@ .top-link { display: none; } - {{- if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark")) }} + + + {{- if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark")) }} + + {{- end }} +
- \ No newline at end of file + diff --git a/layouts/partials/translation_list.html b/layouts/partials/translation_list.html index a2c2d86cef..5e807a97bc 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 -}} From 4878383dd4370c682f974570718b08e6104fc9c3 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 31 Mar 2021 10:00:31 +0530 Subject: [PATCH 057/438] Add global keywords for home page original idea #311 --- layouts/partials/head.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index e37953311e..3713b96d9f 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -11,9 +11,13 @@ {{ if .IsHome }}{{ else }}{{ if .Title }}{{ .Title }} | {{ end }}{{ end }}{{ .Site.Title }} {{- /* Meta */}} +{{- if .IsHome }} +{{ with .Site.Params.keywords -}}{{ end }} +{{- else }} +{{- end }} From 55fe10e9d39850c955dcfdd1e1a708c378dc7705 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:42:38 +0530 Subject: [PATCH 058/438] Use non-async internal template for Google Analytics v4 --- layouts/partials/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 3713b96d9f..45c11fd720 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -95,7 +95,7 @@ {{- /* Misc */}} {{- if hugo.IsProduction | or (eq .Site.Params.env "production") }} -{{- template "_internal/google_analytics_async.html" . }} +{{- template "_internal/google_analytics.html" . }} {{- template "_internal/google_news.html" . }} {{- template "partials/templates/opengraph.html" . }} {{- template "partials/templates/twitter_cards.html" . }} From 23610de4a0f21c8302ef4066589dd0f6620bcd08 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:45:33 +0530 Subject: [PATCH 059/438] Update min hugo version to 0.82.0 - for Google Analytics v4 support template --- .github/ISSUE_TEMPLATE/bug_report.md | 10 +++++----- theme.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a57c22d193..6c31a49efd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -11,7 +11,7 @@ assignees: '' ## READ BEFORE OPENING ISSUES -Please fill the template below +Please fill the template below - **DO NOT** ask for instructions. - Use Discussions section if you need help - See project wiki https://github.com/adityatelange/hugo-PaperMod/wiki @@ -25,12 +25,12 @@ Please fill the template below - Device/Os: [e.g. Android 10] - Type: [e.g. Desktop/Mobile] - - Browser and version [e.g. Chrome 86.0]: - - Hugo Version [ >=0.74 expected]: - - Theme Version [e.g. v4.0, master, or commit-id ]: + - Browser and version [e.g. Chrome 86.0]: + - Hugo Version [ >=0.82.0 expected]: + - Theme Version [e.g. v4.0, master, or commit-id ]: **Steps to reproduce the behavior:** - + + +**What does this PR change? What problem does it solve?** + + + + +**Was the change discussed in an issue or in the Discussions before?** + + + + +## PR Checklist + +- [ ] This change adds/updates translations and I have used the [template present here](https://github.com/adityatelange/hugo-PaperMod/wiki/Translations#want-to-add-your-language-). +- [ ] I have enabled [maintainer edits for this PR](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork). +- [ ] This change adds a Social Icon which has a permissive license to use it. +- [ ] This change **does not** any CDN resources/links. +- [ ] This change **does not** include any unrelated scripts such as bash and python scripts. +- [ ] This change updates the overridden internal templates from HUGO's repository. From 10745dd53775a62fa80ad24f2b61c6c36bf9f1d6 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 24 Apr 2021 09:36:27 +0530 Subject: [PATCH 085/438] Add margin below figure - adds space below when using figure shortcode Fixes: #377 --- assets/css/common/post-single.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/css/common/post-single.css b/assets/css/common/post-single.css index b4307e2fdd..1d31b621c5 100644 --- a/assets/css/common/post-single.css +++ b/assets/css/common/post-single.css @@ -88,6 +88,7 @@ .post-content dl, .post-content ol, .post-content p, +.post-content figure, .post-content ul { margin-bottom: var(--content-gap) } @@ -429,4 +430,4 @@ h6:hover .anchor { [dir="rtl"] .paginav .next { text-align: left; -} \ No newline at end of file +} From 3a8df7888ee79f556c2fbd85a7c85eacd5e0f229 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 25 Apr 2021 05:30:00 +0530 Subject: [PATCH 086/438] Don't enable CodeCopyButtons by default Change in var name disableCodeCopy -> ShowCodeCopyButtons --- layouts/partials/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 2c6511b8aa..aa4c056152 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -85,7 +85,7 @@ {{- end }} -{{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (not .Site.Params.disableCodeCopy)) }} +{{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (.Site.Params.ShowCodeCopyButtons)) }} {{- end }} -{{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (.Site.Params.ShowCodeCopyButtons)) }} +{{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (.Param "ShowCodeCopyButtons")) }} {{- end }} -