From e03bc919bce8fbaa359409b1c183558d950a8350 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 6 Oct 2020 09:20:21 +0530 Subject: [PATCH 001/669] Add Stale bot --- .github/stale.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 00000000..7b5f5711 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,17 @@ +# Number of days of inactivity before an issue becomes stale +daysUntilStale: 7 +# Number of days of inactivity before a stale issue is closed +daysUntilClose: 3 +# Issues with these labels will never be considered stale +exemptLabels: + - pinned + - keep +# Label to use when marking an issue as stale +staleLabel: stale +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: false From fae1c47611e3204d08becb5e9c6e9ec707901a7a Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 6 Oct 2020 15:41:44 +0530 Subject: [PATCH 002/669] update theme meta --- theme.toml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/theme.toml b/theme.toml index 592d009b..926792e9 100644 --- a/theme.toml +++ b/theme.toml @@ -4,11 +4,38 @@ name = "PaperMod" license = "MIT" licenselink = "https://github.com/adityatelange/hugo-PaperMod/blob/master/LICENSE" -description = "A simple, clean, flexible Hugo theme" +description = "A fast, clean, responsive Hugo theme" homepage = "https://github.com/adityatelange/hugo-PaperMod" -tags = ["Responsive", "Simple", "Clean", "Light", "White", "Dark", "Blog", "PaperMod"] -features = ["Responsive", "One Column", "Blog"] -min_version = "0.57.1" +tags = [ + "responsive", + "simple", + "clean", + "light", + "dark", + "blog", + "minimalist", + "highlight.js" +] +features = [ + "responsive", + "single-column", + "blog", + "cover-image", + "table-of-contents", + "opengraph", + "highlight.js", + "favicon", + "archive", + "share-icons", + "cover", + "multilingual", + "social-icons", + "minified-assets", + "theme-toggle", + "menu-location-indicator", + "scroll-to-top" +] +min_version = "0.74.0" [author] name = "Aditya Telange" From 82e9b29bf4092ad3d5e1fdf81380e9d465e0e333 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 8 Oct 2020 09:21:57 +0530 Subject: [PATCH 003/669] post-cover: fix strange `/./ ` in cover image url #13 --- 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 97821ccd..a4c847f5 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -31,7 +31,7 @@ {{- if (or (fileExists (path.Join "static" .Params.cover.image)) (hasPrefix .Params.cover.image "http://") (hasPrefix .Params.cover.image "https://")) }} {{ .Params.cover.alt | plainify }} {{- else}} - {{ .Params.cover.alt | plainify }} + {{ .Params.cover.alt | plainify }} {{- end}}

{{.Params.cover.caption | markdownify }}

From 724e73facbcc860f0c5e25f528bda4ac43ff82f7 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 8 Oct 2020 14:27:43 +0530 Subject: [PATCH 004/669] social-icons: add buymeacoffee icon * icon belongs to buymeacoffee.com * edited to fit dual-tone theme --- layouts/partials/svg.html | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/layouts/partials/svg.html b/layouts/partials/svg.html index 30722642..58fbe422 100644 --- a/layouts/partials/svg.html +++ b/layouts/partials/svg.html @@ -19,6 +19,44 @@ style="font-variation-settings:normal" d="M1.774 18.063V5.466h5.51c1.978 0 3.116 1.326 3.055 2.806-.043 1.049-.711 2.988-2.643 2.988h-5.93H7.73c1.224 0 3.532 1.13 3.532 3.532 0 2.4-1.873 3.27-3.318 3.27zm12.57-4.459h7.89s.012-4.18-4.167-4.18c-5.237 0-5.277 9.11-.3 9.11 3.06 0 3.935-1.806 3.935-1.806M15.526 5.823h4.987" /> +{{- else if (eq .name "buymeacoffee") -}} + + + + + + + + + + + + + + + + {{- else if (eq .name "codepen") -}} From 2c7cffb617dd925d1e69432a34f6987314c2b8c1 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 8 Oct 2020 15:50:20 +0530 Subject: [PATCH 005/669] home-info: let content show upto 5 lines * previously 3 --- assets/css/post-entry.css | 4 ++++ layouts/partials/home_info.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/css/post-entry.css b/assets/css/post-entry.css index 340ffac6..532855b5 100644 --- a/assets/css/post-entry.css +++ b/assets/css/post-entry.css @@ -36,6 +36,10 @@ font-size: 14px; } +.home-info .entry-content { + -webkit-line-clamp: 5; +} + .post-entry { position: relative; margin-bottom: var(--gap); diff --git a/layouts/partials/home_info.html b/layouts/partials/home_info.html index 7feb43a1..6be21134 100644 --- a/layouts/partials/home_info.html +++ b/layouts/partials/home_info.html @@ -1,5 +1,5 @@ {{- with $.Site.Params.homeInfoParams }} -
+

{{- .Title }}

From 46bf0538c94fae9d42433a75849757bbed73b40f Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 10 Oct 2020 19:24:48 +0530 Subject: [PATCH 006/669] post-tags(css): highlight tags with a slim border --- assets/css/post-single.css | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index dc645258..e472704c 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -276,6 +276,7 @@ line-height: 34px; background: var(--code-bg); border-radius: 4px; + border: 1px solid var(--tertiary); } .post-tags a:hover { From f933372c55a21e9f2ba16c7cdf91407b9d9542a9 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 10 Oct 2020 19:34:13 +0530 Subject: [PATCH 007/669] terms: fix unreachable code in taxonomy list --- layouts/_default/list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 4a998d3c..d788753e 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -17,7 +17,7 @@ {{- end}} {{ $paginator := .Paginate $pages }} - +{{ $term := .Data.Term}} {{- range $index, $page := $paginator.Pages }} {{- $class := "post-entry" }} @@ -27,7 +27,7 @@ {{- else}} {{- $class = "first-entry" }} {{- end }} -{{- else if .Data.Term }} +{{- else if $term }} {{- $class = "post-entry tag-entry" }} {{- end }}
From e04e248ae1059d451976e75a48c3b6e13e33a9a8 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 10 Oct 2020 19:40:37 +0530 Subject: [PATCH 008/669] terms: hide cover image in taxonomy list, show others * taxonomies are meant to be browsed faster --- assets/css/post-entry.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/css/post-entry.css b/assets/css/post-entry.css index 532855b5..074e4b64 100644 --- a/assets/css/post-entry.css +++ b/assets/css/post-entry.css @@ -53,8 +53,7 @@ transform: scale(0.96); } -.tag-entry .entry-content, -.tag-entry .entry-footer { +.tag-entry .entry-cover { display: none; } From 3ca79f59fecf0e5473d9e8658f458a31dac35b33 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 10 Oct 2020 19:41:44 +0530 Subject: [PATCH 009/669] post-cover: fix strange `/./ ` in cover image url 2 #13 --- layouts/_default/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index d788753e..474d7f76 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -36,7 +36,7 @@ {{- if (or (fileExists (path.Join "static" .Params.cover.image)) (hasPrefix .Params.cover.image "http://") (hasPrefix .Params.cover.image "https://")) }} {{ .Params.cover.alt | plainify }} {{- else}} - {{ .Params.cover.alt | plainify }} + {{ .Params.cover.alt | plainify }} {{- end}} {{- end }} From a8abbd35452e6a98777e8a618114b0147368d98e Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 10 Oct 2020 19:52:08 +0530 Subject: [PATCH 010/669] post-cover: relative covers need to be explicitely set * change in d819914 and #13 * previous impl breks sites not using `/static` dir as their static location * hugo supports multiple static directories and previous impl checks only for one * ref : https://gohugo.io/content-management/static-files/ usage change in post-vars => cover: image: '' relative: true --- layouts/_default/list.html | 2 +- layouts/_default/single.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 474d7f76..0b2f0f3c 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -33,7 +33,7 @@
{{- if .Params.cover.image }}
- {{- if (or (fileExists (path.Join "static" .Params.cover.image)) (hasPrefix .Params.cover.image "http://") (hasPrefix .Params.cover.image "https://")) }} + {{- if (ne .Params.cover.relative true) }} {{ .Params.cover.alt | plainify }} {{- else}} {{ .Params.cover.alt | plainify }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index a4c847f5..ef5d6f3e 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -28,7 +28,7 @@ {{- if .Params.cover.image }}
- {{- if (or (fileExists (path.Join "static" .Params.cover.image)) (hasPrefix .Params.cover.image "http://") (hasPrefix .Params.cover.image "https://")) }} + {{- if (ne .Params.cover.relative true) }} {{ .Params.cover.alt | plainify }} {{- else}} {{ .Params.cover.alt | plainify }} From 6c4e094c91ce143f3895550a28cf0b8057c23e57 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 11 Oct 2020 16:31:13 +0530 Subject: [PATCH 011/669] templates: Add Twitter Cards, OpenGraph, Schema This code is licensed under Apache License 2.0 and is part of https://github.com/gohugoio/hugo --- layouts/partials/templates/opengraph.html | 57 +++++++++++++++++++ layouts/partials/templates/schema.html | 23 ++++++++ layouts/partials/templates/twitter_cards.html | 29 ++++++++++ 3 files changed, 109 insertions(+) create mode 100644 layouts/partials/templates/opengraph.html create mode 100644 layouts/partials/templates/schema.html create mode 100644 layouts/partials/templates/twitter_cards.html diff --git a/layouts/partials/templates/opengraph.html b/layouts/partials/templates/opengraph.html new file mode 100644 index 00000000..07d9775d --- /dev/null +++ b/layouts/partials/templates/opengraph.html @@ -0,0 +1,57 @@ + + + + +{{ 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 }} + +{{- $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 */}} + +{{- with .Params.audio }}{{ end }} +{{- with .Params.locale }}{{ end }} +{{- with .Site.Params.title }}{{ end }} +{{- 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 := . }} + {{- $series := index $siteSeries $name }} + {{- 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 }} diff --git a/layouts/partials/templates/schema.html b/layouts/partials/templates/schema.html new file mode 100644 index 00000000..0cbae153 --- /dev/null +++ b/layouts/partials/templates/schema.html @@ -0,0 +1,23 @@ + + + +{{- if .IsPage }}{{ $ISO8601 := "2006-01-02T15:04:05-07:00" }}{{ if not .PublishDate.IsZero }} +{{ end }} +{{ if not .Lastmod.IsZero }}{{ end }} + +{{ 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 }} + + + +{{- end }} diff --git a/layouts/partials/templates/twitter_cards.html b/layouts/partials/templates/twitter_cards.html new file mode 100644 index 00000000..cbe2430b --- /dev/null +++ b/layouts/partials/templates/twitter_cards.html @@ -0,0 +1,29 @@ +{{- with $.Params.images -}} + + +{{ 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 -}} + + +{{ else -}} + +{{- end -}} +{{- end -}} +{{- end }} + + +{{ with .Site.Social.twitter -}} + +{{ end -}} +{{ range .Site.Authors }} +{{ with .twitter -}} + +{{ end -}} +{{ end -}} \ No newline at end of file From 4a4d0c009c988e657134253732757b8be4885c7a Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 11 Oct 2020 21:04:17 +0530 Subject: [PATCH 012/669] templates: add cover image to be linked into meta for opengraph, schema and twitter --- layouts/partials/templates/opengraph.html | 7 +++++++ layouts/partials/templates/schema.html | 7 +++++++ layouts/partials/templates/twitter_cards.html | 8 ++++++++ 3 files changed, 22 insertions(+) diff --git a/layouts/partials/templates/opengraph.html b/layouts/partials/templates/opengraph.html index 07d9775d..48ad5ebf 100644 --- a/layouts/partials/templates/opengraph.html +++ b/layouts/partials/templates/opengraph.html @@ -2,6 +2,13 @@ +{{- if .Params.cover.image -}} +{{- if (ne .Params.cover.relative true) }} + +{{- else}} + +{{- end}} +{{- end }} {{ with $.Params.images }}{{ range first 6 . -}} {{ end }}{{ else -}} diff --git a/layouts/partials/templates/schema.html b/layouts/partials/templates/schema.html index 0cbae153..e01dc483 100644 --- a/layouts/partials/templates/schema.html +++ b/layouts/partials/templates/schema.html @@ -5,6 +5,13 @@ {{ end }} {{ if not .Lastmod.IsZero }}{{ end }} +{{- if .Params.cover.image -}} +{{- if (ne .Params.cover.relative true) }} + +{{- else}} + +{{- end}} +{{- end }} {{ with $.Params.images }}{{ range first 6 . -}} {{ end }}{{ else -}} diff --git a/layouts/partials/templates/twitter_cards.html b/layouts/partials/templates/twitter_cards.html index cbe2430b..2b3b7c96 100644 --- a/layouts/partials/templates/twitter_cards.html +++ b/layouts/partials/templates/twitter_cards.html @@ -1,3 +1,11 @@ +{{- if .Params.cover.image -}} + +{{- if (ne $.Params.cover.relative true) }} + +{{- else }} + +{{- end}} +{{ end }} {{- with $.Params.images -}} From 306889f68bcbaae0789bc9dc4c5578c2ddc348af Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 11 Oct 2020 21:08:44 +0530 Subject: [PATCH 013/669] head: link custom templates for social meta --- layouts/partials/head.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 9d1a43f1..55fa1328 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -49,7 +49,7 @@ {{- if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }} {{- template "_internal/google_analytics_async.html" . }} -{{- template "_internal/opengraph.html" . }} -{{- template "_internal/twitter_cards.html" . }} -{{- template "_internal/schema.html" . }} +{{- template "partials/templates/opengraph.html" . }} +{{- template "partials/templates/twitter_cards.html" . }} +{{- template "partials/templates/schema.html" . }} {{- end }} \ No newline at end of file From 23636ab3260ea41354d7ee560f8848e1c684ec6d Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 12 Oct 2020 17:26:45 +0530 Subject: [PATCH 014/669] templates: social-meta: prefer cover image over other images --- layouts/partials/templates/opengraph.html | 3 ++- layouts/partials/templates/schema.html | 3 ++- layouts/partials/templates/twitter_cards.html | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/layouts/partials/templates/opengraph.html b/layouts/partials/templates/opengraph.html index 48ad5ebf..834e3a12 100644 --- a/layouts/partials/templates/opengraph.html +++ b/layouts/partials/templates/opengraph.html @@ -8,7 +8,7 @@ {{- else}} {{- end}} -{{- end }} +{{- else }} {{ with $.Params.images }}{{ range first 6 . -}} {{ end }}{{ else -}} @@ -21,6 +21,7 @@ {{- with $.Site.Params.images -}} {{ end }}{{ end }}{{ end }} +{{- end }} {{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} {{- if .IsPage }} diff --git a/layouts/partials/templates/schema.html b/layouts/partials/templates/schema.html index e01dc483..6c032b66 100644 --- a/layouts/partials/templates/schema.html +++ b/layouts/partials/templates/schema.html @@ -11,7 +11,7 @@ {{- else}} {{- end}} -{{- end }} +{{- else }} {{ with $.Params.images }}{{ range first 6 . -}} {{ end }}{{ else -}} @@ -24,6 +24,7 @@ {{- with $.Site.Params.images -}} {{ end }}{{ end }}{{ end }} +{{- end }} diff --git a/layouts/partials/templates/twitter_cards.html b/layouts/partials/templates/twitter_cards.html index 2b3b7c96..de86c781 100644 --- a/layouts/partials/templates/twitter_cards.html +++ b/layouts/partials/templates/twitter_cards.html @@ -5,7 +5,7 @@ {{- else }} {{- end}} -{{ end }} +{{- else }} {{- with $.Params.images -}} @@ -25,6 +25,7 @@ {{- end -}} {{- end -}} {{- end }} +{{- end }} {{ with .Site.Social.twitter -}} From 95e6bf1e135b4acaf4b14b6ae9592d968bbfc231 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 13 Oct 2020 18:17:39 +0530 Subject: [PATCH 015/669] list: show nested sections * shows links to section if _index.md is present * by this sub-sections can be distinguished properly * more about this and way to implement: https://gohugo.io/content-management/organization/#index-pages-_indexmd --- layouts/_default/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 0b2f0f3c..ebe7b0d4 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -10,7 +10,7 @@ {{- end }} -{{- $pages := .RegularPages }} +{{- $pages := union .RegularPages .Sections }} {{- if .IsHome }} {{- $pages = where site.RegularPages "Type" "in" site.Params.mainSections }} From fb945ba3c1c1317bb70eba9d998cc6d690d077d5 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 15 Oct 2020 10:21:33 +0530 Subject: [PATCH 016/669] json-schema: add support for Rich Results: Json schema for structured data (#36) * json-schema: init * sameAs can be set through .Site.Params.schema.sameAs * if it is not specified but social-icons exsists, we use social-icons for sameAs vars * .Site.Params.schema.sameAs overrides social-icons * publisherType can be changed via .Site.Params.schema.publisherType --- layouts/partials/head.html | 4 +- layouts/partials/templates/schema.html | 31 ---------- layouts/partials/templates/schema_json.html | 65 +++++++++++++++++++++ 3 files changed, 67 insertions(+), 33 deletions(-) delete mode 100644 layouts/partials/templates/schema.html create mode 100644 layouts/partials/templates/schema_json.html diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 55fa1328..1f786287 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -51,5 +51,5 @@ {{- template "_internal/google_analytics_async.html" . }} {{- template "partials/templates/opengraph.html" . }} {{- template "partials/templates/twitter_cards.html" . }} -{{- template "partials/templates/schema.html" . }} -{{- end }} \ No newline at end of file +{{- template "partials/templates/schema_json.html" . }} +{{- end }} diff --git a/layouts/partials/templates/schema.html b/layouts/partials/templates/schema.html deleted file mode 100644 index 6c032b66..00000000 --- a/layouts/partials/templates/schema.html +++ /dev/null @@ -1,31 +0,0 @@ - - - -{{- if .IsPage }}{{ $ISO8601 := "2006-01-02T15:04:05-07:00" }}{{ if not .PublishDate.IsZero }} -{{ end }} -{{ if not .Lastmod.IsZero }}{{ end }} - -{{- if .Params.cover.image -}} -{{- if (ne .Params.cover.relative true) }} - -{{- else}} - -{{- 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 }} -{{- end }} - - - -{{- end }} diff --git a/layouts/partials/templates/schema_json.html b/layouts/partials/templates/schema_json.html new file mode 100644 index 00000000..a186603b --- /dev/null +++ b/layouts/partials/templates/schema_json.html @@ -0,0 +1,65 @@ +{{ if .IsHome }} + +{{- else if .IsPage }} + +{{ end }} From a980d10bfc7d0d1e058afb5528c637ad39a5ef04 Mon Sep 17 00:00:00 2001 From: Northerner-coder <50540933+Northerner-coder@users.noreply.github.com> Date: Fri, 16 Oct 2020 08:56:54 -0400 Subject: [PATCH 017/669] i18n: ru: Add full Russian localization (#40) --- i18n/ru.yaml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/i18n/ru.yaml b/i18n/ru.yaml index 84abf107..cf081eab 100644 --- a/i18n/ru.yaml +++ b/i18n/ru.yaml @@ -1,5 +1,14 @@ - id: prev_page - translation: "Сюда" + translation: 'Предыдущая' - id: next_page - translation: "Туда" + translation: 'Следующая' + +- id: read_time + translation: '{{ .Count }} мин' + +- id: toc + translation: 'Оглавление' + +- id: translations + translation: 'Переводы' From db52aa994294f3f2a412efee7802c752073018e2 Mon Sep 17 00:00:00 2001 From: Northerner-coder <50540933+Northerner-coder@users.noreply.github.com> Date: Fri, 16 Oct 2020 12:42:32 -0400 Subject: [PATCH 018/669] layouts: Add DateFormat parameter (#39) * User can change Date Format to be displayed in Front Matter * Formats supported by Hugo can be found here: https://gohugo.io/functions/format/#hugo-date-and-time-templating-reference --- layouts/_default/archives.html | 2 +- layouts/_default/list.html | 2 +- layouts/_default/single.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index ce0c153b..e2e6993a 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -22,7 +22,7 @@ {{- .Title | markdownify }}
- + {{- if $.Site.Params.ShowReadingTime }} ·  {{- $default_txt := print .ReadingTime " " "min" }} {{- i18n "read_time" .ReadingTime | default $default_txt }}{{ end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index ebe7b0d4..a92fe71d 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -52,7 +52,7 @@ {{- end }}
-{{- end}} \ No newline at end of file +{{- end}} diff --git a/layouts/partials/index_profile.html b/layouts/partials/index_profile.html index 279a3a4e..5de8057a 100644 --- a/layouts/partials/index_profile.html +++ b/layouts/partials/index_profile.html @@ -2,8 +2,8 @@ {{- with .Site.Params.profileMode }}
{{- if .imageUrl}}{{ .imageTitle | default {{- end}} -

{{- .title | default $.Site.Title -}}

- {{- .subtitle -}} +

{{- .title | default $.Site.Title | markdownify -}}

+ {{- .subtitle | markdownify -}} {{- partial "social_icons.html" $.Site.Params.socialIcons -}} {{- with .buttons }} @@ -17,4 +17,4 @@ {{- end }}
{{- end}} - \ No newline at end of file + From 7db1be3d7349eaba2dd87bfeb240b8bc120f4663 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 17 Oct 2020 16:00:46 +0530 Subject: [PATCH 022/669] head: update description and keywords logic --- layouts/partials/head.html | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 1f786287..41a6b6db 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -4,13 +4,12 @@ {{ if .IsHome }}{{else}}{{ if .Title }}{{ .Title }} - {{ end }}{{end}}{{ .Site.Title }} -{{- if in site.Params.mainSections .Type }} - - -{{- else }} - -{{- end }} + + {{- if .Site.Params.analytics.google.SiteVerificationTag }} From b720e4a523c9c918408b89de6999a1b6a1a4477c Mon Sep 17 00:00:00 2001 From: Northerner-coder <50540933+Northerner-coder@users.noreply.github.com> Date: Sun, 18 Oct 2020 10:51:42 -0400 Subject: [PATCH 023/669] extended_head: init (#44) * add placeholder template for extending head --- layouts/partials/extend_head.html | 5 +++++ layouts/partials/head.html | 1 + 2 files changed, 6 insertions(+) create mode 100644 layouts/partials/extend_head.html diff --git a/layouts/partials/extend_head.html b/layouts/partials/extend_head.html new file mode 100644 index 00000000..d372acc9 --- /dev/null +++ b/layouts/partials/extend_head.html @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 41a6b6db..48b5d355 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -45,6 +45,7 @@ {{- range .AlternativeOutputFormats -}} {{ end -}} +{{- partial "extend_head.html" . -}} {{- if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }} {{- template "_internal/google_analytics_async.html" . }} From a41f09bb99a9529fbf9506dc05981fbd37de4484 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 18 Oct 2020 21:52:22 +0530 Subject: [PATCH 024/669] extended_footer: init * add placeholder template for extending footer closes #37 --- layouts/partials/extend_footer.html | 5 +++++ layouts/partials/footer.html | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 layouts/partials/extend_footer.html diff --git a/layouts/partials/extend_footer.html b/layouts/partials/extend_footer.html new file mode 100644 index 00000000..52714e8c --- /dev/null +++ b/layouts/partials/extend_footer.html @@ -0,0 +1,5 @@ + + + diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 1c28f3ab..f6d407e2 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -15,6 +15,7 @@ +{{- partial "extend_footer.html" . -}} {{ if in site.Params.mainSections .Type }} {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify | fingerprint -}} @@ -66,4 +67,4 @@ -{{- end }} \ No newline at end of file +{{- end }} From a153a7cc6fe6498029105f8af73587291d7276b0 Mon Sep 17 00:00:00 2001 From: Mehdy Khoshnoody Date: Mon, 19 Oct 2020 12:47:23 +0330 Subject: [PATCH 025/669] Add RTL support for multilingual mode (#47) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Usage: in site config: languages: ar: languagedirection: rtl title: مدونتي weight: 2 * ref: https://gohugo.io/content-management/multilingual/#configure-languages --- assets/css/footer.css | 4 ++-- assets/css/header.css | 8 ++++---- assets/css/main.css | 18 +++++++++++++++--- assets/css/post-single.css | 24 ++++++++++++------------ layouts/_default/baseof.html | 2 +- 5 files changed, 34 insertions(+), 22 deletions(-) diff --git a/assets/css/footer.css b/assets/css/footer.css index 4fd3acea..cf7197f9 100644 --- a/assets/css/footer.css +++ b/assets/css/footer.css @@ -11,8 +11,8 @@ } .footer span { - margin-left: 1px; - margin-right: 1px; + margin-inline-start: 1px; + margin-inline-end: 1px; } .footer a { diff --git a/assets/css/header.css b/assets/css/header.css index e5061d43..ef68ef48 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -5,8 +5,8 @@ flex-wrap: wrap; justify-content: space-between; max-width: calc(var(--nav-width) + var(--gap) * 2); - margin-left: auto; - margin-right: auto; + margin-inline-start: auto; + margin-inline-end: auto; } .nav a { @@ -31,7 +31,7 @@ pointer-events: none; transform: translate(0, -10%); border-radius: 6px; - margin-right: 8px; + margin-inline-end: 8px; } .theme-toggle svg{ @@ -56,7 +56,7 @@ body:not(.dark) #sun { } .menu li+li { - margin-left: var(--gap); + margin-inline-start: var(--gap); } .menu a { diff --git a/assets/css/main.css b/assets/css/main.css index 8b6c492d..68f8a2f1 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -36,7 +36,7 @@ } .pagination .next { - margin-left: auto; + margin-inline-start: auto; } .social-icons { @@ -44,10 +44,22 @@ } .social-icons a:not(:last-of-type) { - margin-right: 12px; + margin-inline-end: 12px; } .social-icons a svg { height: 26px; width: 26px; -} \ No newline at end of file +} + +.direction-rtl { + direction: rtl; +} + +.direction-ltr { + direction: ltr; +} + +code { + direction: ltr; +} diff --git a/assets/css/post-single.css b/assets/css/post-single.css index e472704c..57269ddf 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -85,7 +85,7 @@ .post-content ul, .post-content ol { - padding-left: 20px; + padding-inline-start: 20px; } .post-content li { @@ -109,8 +109,8 @@ .post-content dd { width: 75%; - margin-left: 0; - padding-left: 10px; + margin-inline-start: 0; + padding-inline-start: 10px; } .post-content dt~dt, @@ -147,11 +147,11 @@ } .post-content li>.highlight { - margin-right: 0 + margin-inline-end: 0 } .post-content ul pre { - margin-left: calc(var(--gap) * -2); + margin-inline-start: calc(var(--gap) * -2); } .post-content .highlight pre { @@ -168,7 +168,7 @@ } .post-content .highlighttable td .linenodiv { - padding-right: 0 !important; + padding-inline-end: 0 !important; } .post-content .highlighttable td .linenodiv pre, @@ -236,7 +236,7 @@ .toc details summary { cursor: zoom-in; - margin-left: 20px; + margin-inline-start: 20px; } .toc details[open] summary { @@ -254,7 +254,7 @@ } .toc li ul { - margin-left: var(--gap); + margin-inline-start: var(--gap); } .post-footer { @@ -263,14 +263,14 @@ .post-tags li { display: inline-block; - margin-right: 3px; + margin-inline-end: 3px; margin-bottom: 5px; } .post-tags a { display: block; - padding-left: 14px; - padding-right: 14px; + padding-inline-start: 14px; + padding-inline-end: 14px; color: var(--secondary); font-size: 14px; line-height: 34px; @@ -297,7 +297,7 @@ } .share-buttons a:not(:last-of-type) { - margin-right: 12px; + margin-inline-end: 12px; } .share-buttons a svg { diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 6deb9a91..cd999824 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,5 +1,5 @@ - + {{- partial "head.html" . }} From ddbd65b93760d647be430110bc575068d2135035 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 19 Oct 2020 15:58:50 +0530 Subject: [PATCH 026/669] Update README --- README.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6746fdd6..8b19ce2e 100755 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ Read this post For More Details => [hugo-PaperMod - Installation](https://aditya - Multilingual support. - Cover image for each post - Light/Dark theme ( automatic theme switch a/c to browser theme) +- SEO Friendly - No webpack, nodejs and other depedencies required to edit the theme :) Read this post For More Details => [hugo-PaperMod - Features](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/) @@ -65,12 +66,22 @@ Read this post For More Details => [Social-Icons](https://adityatelange.github.i --- +### Sponsoring + +If you like my work and if you think this project is worth to support it, you can + + +Buy Me A Coffee + + +--- + ## Found a bug? If you spot any bugs, please use [Issue Tracker](https://github.com/adityatelange/hugo-PaperMod/issues) and/or create a new [Pull Request](https://github.com/adityatelange/hugo-PaperMod/pulls) to fix the issue. -![GitHub issues](https://img.shields.io/github/issues-raw/adityatelange/hugo-papermod) -![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/adityatelange/hugo-PaperMod) -![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/adityatelange/hugo-papermod) -![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/adityatelange/hugo-papermod) \ No newline at end of file +[![GitHub issues](https://img.shields.io/github/issues-raw/adityatelange/hugo-papermod)](https://github.com/adityatelange/hugo-PaperMod/issues?q=is%3Aopen) +[![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/adityatelange/hugo-PaperMod)](https://github.com/adityatelange/hugo-PaperMod/issues?q=is%3Aissue+is%3Aclosed) +[![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/adityatelange/hugo-papermod)](https://github.com/adityatelange/hugo-PaperMod/pulls?q=is%3Aopen+is%3Apr) +[![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/adityatelange/hugo-papermod)](https://github.com/adityatelange/hugo-PaperMod/pulls?q=is%3Apr+is%3Aclosed) From c0ba1ce20dfe9823fff3a4b86e0b04fe8ebb0287 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 19 Oct 2020 19:00:01 +0530 Subject: [PATCH 027/669] social-icons: add svg for medium * icon belong to medium[.]com * converted to svg with online-convert[.]com --- layouts/partials/svg.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/layouts/partials/svg.html b/layouts/partials/svg.html index 58fbe422..0ab8f789 100644 --- a/layouts/partials/svg.html +++ b/layouts/partials/svg.html @@ -177,6 +177,14 @@ +{{- else if (eq .name "medium") -}} + + + + + {{- else if (eq .name "mixcloud") -}} -{{- end -}} \ No newline at end of file +{{- end -}} From ea9aa385734acce8aedabd70d83ff30c47fa945d Mon Sep 17 00:00:00 2001 From: Zhangyuan Nie Date: Tue, 20 Oct 2020 01:08:43 -0400 Subject: [PATCH 028/669] header: disable user-select for theme-toggle (#52) * fix: clicking twice on theme switch selects other text on the nav-bar. --- assets/css/header.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/css/header.css b/assets/css/header.css index ef68ef48..72b5f6aa 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -34,9 +34,10 @@ margin-inline-end: 8px; } -.theme-toggle svg{ +.theme-toggle svg { height: 18px; margin: 0 10px; + user-select: none; } body.dark #moon{ From 3e92b5aa2938adc41cc5a376d3ad7cd1dc2fd99e Mon Sep 17 00:00:00 2001 From: Zhangyuan Nie Date: Wed, 21 Oct 2020 01:06:44 -0400 Subject: [PATCH 029/669] chore: add go.mod (#51) * more about this: https://gohugo.io/hugo-modules/use-modules/ --- go.mod | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 go.mod diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..af958556 --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module github.com/adityatelange/hugo-PaperMod + +go 1.12 From 21241c212ea9b6a7f8727564bd245bf3857e1a0d Mon Sep 17 00:00:00 2001 From: Niek Blankers Date: Thu, 22 Oct 2020 13:12:26 +0200 Subject: [PATCH 030/669] relative-cover: init Responsive cover images (#43) Co-authored-by: Aditya Telange <21258296+adityatelange@users.noreply.github.com> - generates images of different sizes - browser can choose between set of images w.r.t viewport width - is enabled by default - supported image formats : https://gohugo.io/content-management/image-processing/#target-format - Customizing site config params: params: cover: responsiveImages: false # if want to disable it linkFullImages: true # if link original image on clicking cover --- layouts/_default/list.html | 12 ++---------- layouts/_default/single.html | 13 ++----------- layouts/partials/cover.html | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 21 deletions(-) create mode 100644 layouts/partials/cover.html diff --git a/layouts/_default/list.html b/layouts/_default/list.html index a92fe71d..3596a931 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -31,15 +31,7 @@ {{- $class = "post-entry tag-entry" }} {{- end }}
- {{- if .Params.cover.image }} -
- {{- if (ne .Params.cover.relative true) }} - {{ .Params.cover.alt | plainify }} - {{- else}} - {{ .Params.cover.alt | plainify }} - {{- end}} -
- {{- end }} + {{- partial "cover.html" (dict "cxt" . "IsHome" true) }}

{{ .Title }} @@ -75,4 +67,4 @@ {{- end }} {{end}}{{/* end profileMode */}} -{{- end }}{{- /* end main */ -}} \ No newline at end of file +{{- end }}{{- /* end main */ -}} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index ec8038e9..20c3bc93 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -26,16 +26,7 @@ {{- end}}

- {{- if .Params.cover.image }} -
- {{- if (ne .Params.cover.relative true) }} - {{ .Params.cover.alt | plainify }} - {{- else}} - {{ .Params.cover.alt | plainify }} - {{- end}} -

{{.Params.cover.caption | markdownify }}

-
- {{- end }} + {{- partial "cover.html" (dict "cxt" . "IsHome" false) }} {{- if .Params.ShowToc }}
@@ -68,4 +59,4 @@ {{- end }}
-{{- end }}{{/* end main */}} \ No newline at end of file +{{- end }}{{/* end main */}} diff --git a/layouts/partials/cover.html b/layouts/partials/cover.html new file mode 100644 index 00000000..7be43ea6 --- /dev/null +++ b/layouts/partials/cover.html @@ -0,0 +1,32 @@ +{{- with .cxt}} {{/* Apply proper context from dict */}} +{{- if .Params.cover.image }} +{{- $alt := (.Params.cover.alt | default .Params.cover.caption | plainify) }} +
+ {{- $addLink := (and .Site.Params.cover.linkFullImages (not $.IsHome)) }} + {{- $cover := (.Page.Resources.ByType "image").GetMatch (printf "*%s*" (.Params.cover.image)) }} + {{- if $cover -}}{{/* i.e it is present in page bundle */}} + {{- if $addLink }}{{ end -}} + {{- $sizes := (slice "360" "480" "720" "1080" "1500") }} + {{- $processableFormats := (slice "jpg" "jpeg" "png" "tif" "bmp" "gif") }} + {{- if (and (in $processableFormats $cover.MediaType.SubType) (ne .Site.Params.cover.responsiveImages false)) }} + {{ $alt }} + {{- else }}{{/* Unprocessable image or responsive images disabled */}} + {{ $alt }} + {{- end }} + {{- else }}{{/* For absolute urls and external links, no img processing here */}} + {{- if $addLink }}{{ end -}} + {{ $alt }} + {{- end }} + {{- if $addLink }}{{ end -}} + {{/* Display Caption */}} + {{- if not $.IsHome }} + {{ with .Params.cover.caption }}

{{ . | markdownify }}

{{- end }} + {{- end }} +
+{{- end }}{{/* End image */}} +{{- end -}}{{/* End context */}} From 3d6037049459a0dec8a5797021f1ee39267fd725 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 20 Oct 2020 14:56:42 +0530 Subject: [PATCH 031/669] reset(css): themify text selection --- assets/css/reset.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/assets/css/reset.css b/assets/css/reset.css index 78760c47..6c487ef6 100644 --- a/assets/css/reset.css +++ b/assets/css/reset.css @@ -140,3 +140,13 @@ img { *:focus { outline:none; } + +*::-moz-selection { + background-color: var(--tertiary); + color: var(--primary); +} + +*::selection { + background-color: var(--tertiary); + color: var(--primary); +} From 684cb2160fc84a75e17c5d423c000dc94487839e Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 20 Oct 2020 18:38:29 +0530 Subject: [PATCH 032/669] layouts: post_meta as partial --- layouts/_default/archives.html | 8 ++------ layouts/_default/list.html | 6 +----- layouts/_default/single.html | 6 +----- layouts/partials/post_meta.html | 5 +++++ 4 files changed, 9 insertions(+), 16 deletions(-) create mode 100644 layouts/partials/post_meta.html diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index e2e6993a..b63460ba 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -22,11 +22,7 @@ {{- .Title | markdownify }}
- - {{- if $.Site.Params.ShowReadingTime }} ·  - {{- $default_txt := print .ReadingTime " " "min" }} - {{- i18n "read_time" .ReadingTime | default $default_txt }}{{ end }} - {{- if or .Params.author .Site.Params.author }} · {{- .Params.author | default .Site.Params.author }}{{ end }} + {{- partial "post_meta.html" . -}}
@@ -39,4 +35,4 @@ {{- end }} {{- end }} -{{- end }}{{/* end main */}} \ No newline at end of file +{{- end }}{{/* end main */}} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 3596a931..dad1d3ce 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -44,11 +44,7 @@ {{- end }}
- - {{- if $.Site.Params.ShowReadingTime }} ·  - {{- $default_txt := print .ReadingTime " " "min" }} - {{- i18n "read_time" .ReadingTime | default $default_txt }}{{ end }} - {{- if or .Params.author .Site.Params.author }} · {{- .Params.author | default .Site.Params.author }}{{ end }} + {{- partial "post_meta.html" . -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 20c3bc93..b13fb74a 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -8,11 +8,7 @@ {{- if .Params.hideMeta }}{{ else }}
- - {{- if $.Site.Params.ShowReadingTime -}} ·  - {{- $default_txt := print .ReadingTime " " "min" }} - {{- i18n "read_time" .ReadingTime | default $default_txt }}{{ end }} - {{- if or .Params.author .Site.Params.author }} · {{- .Params.author | default .Site.Params.author }}{{ end }} + {{- partial "post_meta.html" . -}} {{- if .IsTranslated -}} | 
From 834feb9adc209c3151a229fe5b7d521400153f51 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 23 Oct 2020 11:35:30 +0530 Subject: [PATCH 035/669] cover: responsive cover: generate responsive images only in "production" env - will reduce render time in development env --- layouts/partials/cover.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layouts/partials/cover.html b/layouts/partials/cover.html index 7be43ea6..b4487329 100644 --- a/layouts/partials/cover.html +++ b/layouts/partials/cover.html @@ -8,7 +8,8 @@ {{- if $addLink }}{{ end -}} {{- $sizes := (slice "360" "480" "720" "1080" "1500") }} {{- $processableFormats := (slice "jpg" "jpeg" "png" "tif" "bmp" "gif") }} - {{- if (and (in $processableFormats $cover.MediaType.SubType) (ne .Site.Params.cover.responsiveImages false)) }} + {{- $prod := (eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production")) }} + {{- if (and (in $processableFormats $cover.MediaType.SubType) (ne .Site.Params.cover.responsiveImages false) (eq $prod true)) }} Date: Fri, 23 Oct 2020 13:11:20 +0330 Subject: [PATCH 036/669] i18n: Add translations for fa: Farsi (#56) --- i18n/fa.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 i18n/fa.yaml diff --git a/i18n/fa.yaml b/i18n/fa.yaml new file mode 100644 index 00000000..3cdd047c --- /dev/null +++ b/i18n/fa.yaml @@ -0,0 +1,16 @@ +- id: prev_page + translation: "صفحهٔ قبل" + +- id: next_page + translation: "صفحهٔ بعد" + +- id: read_time + translation: + one : "1 دقیقه" + other: "{{ .Count }} دقیقه" + +- id: toc + translation: "فهرست مطالب" + +- id: translations + translation: "ترجمه‌ها" From 413034e43b589e2e811be9a4b8f0ab3f079f9294 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 23 Oct 2020 15:56:41 +0530 Subject: [PATCH 037/669] social-icons: fix duplicate rel tags --- layouts/partials/social_icons.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/social_icons.html b/layouts/partials/social_icons.html index 5cc5f8bc..7bb9c143 100644 --- a/layouts/partials/social_icons.html +++ b/layouts/partials/social_icons.html @@ -1,6 +1,6 @@
{{- range . -}} - {{ partial "svg.html" . }} {{- end -}}
From 4e9d470fec995c51f6f27c3b6659fa1e4bd5a274 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 23 Oct 2020 16:02:15 +0530 Subject: [PATCH 038/669] Revert "reset(css): themify text selection" * looks ugly :p This reverts commit 3d6037049459a0dec8a5797021f1ee39267fd725. --- assets/css/reset.css | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/assets/css/reset.css b/assets/css/reset.css index 6c487ef6..78760c47 100644 --- a/assets/css/reset.css +++ b/assets/css/reset.css @@ -140,13 +140,3 @@ img { *:focus { outline:none; } - -*::-moz-selection { - background-color: var(--tertiary); - color: var(--primary); -} - -*::selection { - background-color: var(--tertiary); - color: var(--primary); -} From 3e3a7d380ee17e005da5ac820b9b96491d86fa60 Mon Sep 17 00:00:00 2001 From: Mehdy Khoshnoody Date: Sat, 24 Oct 2020 17:12:24 +0330 Subject: [PATCH 039/669] post-single(css): improve RTL support (#57) * Replace left with start for tables and block-quote --- assets/css/post-single.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 57269ddf..3a61be5e 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -132,7 +132,7 @@ .post-content table th { font-size: 14px; - text-align: left; + text-align: start; } .post-content table:not(.highlighttable) td code:only-child { @@ -208,7 +208,7 @@ .post-content blockquote { margin: 0 calc(var(--gap) * -1); padding: 0 32px; - border-left: 2px solid var(--primary); + border-inline-start: 2px solid var(--primary); } .post-content hr { From db0e744af3953160257ebe01ebfcfdaf22bc1bf2 Mon Sep 17 00:00:00 2001 From: Dragomir Yordanov Date: Sun, 25 Oct 2020 05:22:26 +0100 Subject: [PATCH 040/669] i18n: improve for 'es' and add 'bg' (#58) * Translate read_time, toc and translations to spanish * Add translations in bulgarian --- i18n/bg.yaml | 16 ++++++++++++++++ i18n/es.yaml | 11 +++++++++++ 2 files changed, 27 insertions(+) create mode 100644 i18n/bg.yaml diff --git a/i18n/bg.yaml b/i18n/bg.yaml new file mode 100644 index 00000000..1e314af8 --- /dev/null +++ b/i18n/bg.yaml @@ -0,0 +1,16 @@ +- id: prev_page + translation: "Предишна страница" + +- id: next_page + translation: "Следваща страница" + +- id: read_time + translation: + one : "1 мин" + other: "{{ .Count }} мин" + +- id: toc + translation: "Съдържание" + +- id: translations + translation: "Преводи" diff --git a/i18n/es.yaml b/i18n/es.yaml index 5d407d59..38d2239d 100644 --- a/i18n/es.yaml +++ b/i18n/es.yaml @@ -3,3 +3,14 @@ - id: next_page translation: "Página siguiente" + +- id: read_time + translation: + one : "1 min" + other: "{{ .Count }} min" + +- id: toc + translation: "Tabla de Contenidos" + +- id: translations + translation: "Traducciones" From 3e84ff0435684f578969929385a727712630a89a Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 25 Oct 2020 11:17:54 +0530 Subject: [PATCH 041/669] =?UTF-8?q?post-meta:=20fix=20redundant=20'=C2=B7'?= =?UTF-8?q?(separator)=20in=20end=20when=20author=20is=20not=20present?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/partials/post_meta.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/layouts/partials/post_meta.html b/layouts/partials/post_meta.html index 479ab897..1b329470 100644 --- a/layouts/partials/post_meta.html +++ b/layouts/partials/post_meta.html @@ -1,11 +1,17 @@ +{{- $scratch := newScratch}} + {{- if not .Date.IsZero -}} - ·  +{{- $scratch.Add "meta" (slice (.Date.Format (default "January 2, 2006" .Site.Params.DateFormat))) }} {{- end -}} {{- if $.Site.Params.ShowReadingTime -}} -{{- i18n "read_time" .ReadingTime | default (printf "%s min" .ReadingTime) }} ·  +{{- $scratch.Add "meta" (slice (i18n "read_time" .ReadingTime | default (printf "%s min" .ReadingTime))) }} {{- end -}} {{- if or .Params.author .Site.Params.author }} -{{- printf "%s" (.Params.author | default .Site.Params.author) }} +{{- $scratch.Add "meta" (slice (.Params.author | default .Site.Params.author)) }} {{- end -}} + +{{- with ($scratch.Get "meta")}} +{{- delimit . " · "}} +{{- end }} From bc2b82c370be7a5554cd886033b3e3e0d21bdea2 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 25 Oct 2020 12:15:51 +0530 Subject: [PATCH 042/669] author(partial): init, with support for multiple authors * usage: author: ["me", "you"] --- layouts/partials/author.html | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 layouts/partials/author.html diff --git a/layouts/partials/author.html b/layouts/partials/author.html new file mode 100644 index 00000000..f91a1168 --- /dev/null +++ b/layouts/partials/author.html @@ -0,0 +1,9 @@ +{{- if or .Params.author .Site.Params.author }} +{{- $author := (.Params.author | default .Site.Params.author)}} +{{- $author_type := (printf "%T" $author) }} +{{- if (eq $author_type "[]string") }} +{{- (delimit $author ", " ) }} +{{- else }} +{{- $author }} +{{- end }} +{{- end -}} From 5b9eaac1306044922f0a9ec3806a786a0cdd036f Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 25 Oct 2020 12:47:09 +0530 Subject: [PATCH 043/669] layouts: use author partial in head and post_meta --- layouts/partials/head.html | 2 +- layouts/partials/post_meta.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 48b5d355..af7ac9d6 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -10,7 +10,7 @@ - + {{- if .Site.Params.analytics.google.SiteVerificationTag }} diff --git a/layouts/partials/post_meta.html b/layouts/partials/post_meta.html index 1b329470..e0dbef40 100644 --- a/layouts/partials/post_meta.html +++ b/layouts/partials/post_meta.html @@ -8,9 +8,9 @@ {{- $scratch.Add "meta" (slice (i18n "read_time" .ReadingTime | default (printf "%s min" .ReadingTime))) }} {{- end -}} -{{- if or .Params.author .Site.Params.author }} -{{- $scratch.Add "meta" (slice (.Params.author | default .Site.Params.author)) }} -{{- end -}} +{{ with (partial "author.html" . ) }} +{{ $scratch.Add "meta" (slice .)}} +{{end}} {{- with ($scratch.Get "meta")}} {{- delimit . " · "}} From 44bc299ca3b21600d2ed1bd01e83ca2ab83bc7ca Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 25 Oct 2020 12:49:58 +0530 Subject: [PATCH 044/669] json-schema: add support for multiple authors --- layouts/partials/templates/schema_json.html | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/layouts/partials/templates/schema_json.html b/layouts/partials/templates/schema_json.html index a186603b..ff84c97f 100644 --- a/layouts/partials/templates/schema_json.html +++ b/layouts/partials/templates/schema_json.html @@ -41,13 +41,26 @@ {{- else -}} {{ (path.Join .RelPermalink .Params.cover.image ) | absURL }}, {{- end}} - {{- end}} + {{- end -}} "datePublished": {{ .PublishDate }}, "dateModified": {{ .Lastmod }}, - "author": { + {{- with (.Params.author | default .Site.Params.author) }} + "author": + {{- if (eq (printf "%T" .) "[]string") -}} + [{{- range $i, $v := . -}} + {{- if $i }}, {{end -}} + { "@type": "Person", - "name": {{ .Params.author | default .Site.Params.author }} + "name": {{ $v }} + } + {{- end }}], + {{- else -}} + { + "@type": "Person", + "name": {{ . }} }, + {{- end -}} + {{- end }} "mainEntityOfPage": { "@type": "WebPage", "@id": {{ .Permalink | safeHTML }} From 9ac0f391f602530ce5ae93bcb8f19a915a218fc7 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 25 Oct 2020 13:01:49 +0530 Subject: [PATCH 045/669] author(partial): fix multiple authors in config displayed incorrectly * is of type `[]interface {}` and not `[]string` --- layouts/partials/author.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/author.html b/layouts/partials/author.html index f91a1168..a1ef62c9 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_type := (printf "%T" $author) }} -{{- if (eq $author_type "[]string") }} +{{- if (or (eq $author_type "[]string") (eq $author_type "[]interface {}") ) }} {{- (delimit $author ", " ) }} {{- else }} {{- $author }} From 0bd68d242c1e19ea0ee3cd16c547957709160b88 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 25 Oct 2020 13:03:50 +0530 Subject: [PATCH 046/669] update README --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8b19ce2e..7a6f1cd6 100755 --- a/README.md +++ b/README.md @@ -39,13 +39,14 @@ Read this post For More Details => [hugo-PaperMod - Installation](https://aditya - [Home-Info Mode.](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/#home-info-mode) - [Profile Mode.](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/#profile-mode) - Table of Content Generation (newer implementation). -- Archive of posts +- Archive of posts. - Social-Media Share buttons on post. - Menu location indicator. - Multilingual support. -- Cover image for each post -- Light/Dark theme ( automatic theme switch a/c to browser theme) -- SEO Friendly +- Cover image for each post (with Responsive image support). +- Light/Dark theme ( automatic theme switch a/c to browser theme). +- SEO Friendly. +- Muliple Author support. - No webpack, nodejs and other depedencies required to edit the theme :) Read this post For More Details => [hugo-PaperMod - Features](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/) From 1256f353e5b9c4716578f55c443786429dea0e4d Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 25 Oct 2020 13:08:03 +0530 Subject: [PATCH 047/669] json-schema:fix multiple authors in config displayed incorrectly * is of type `[]interface {}` and not `[]string` --- 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 ff84c97f..f04a0bfa 100644 --- a/layouts/partials/templates/schema_json.html +++ b/layouts/partials/templates/schema_json.html @@ -46,7 +46,7 @@ "dateModified": {{ .Lastmod }}, {{- with (.Params.author | default .Site.Params.author) }} "author": - {{- if (eq (printf "%T" .) "[]string") -}} + {{- if (or (eq (printf "%T" .) "[]string") (eq (printf "%T" .) "[]interface {}")) -}} [{{- range $i, $v := . -}} {{- if $i }}, {{end -}} { From 70a2b06ac15ee2f40320c9d4150f089ecbe833b1 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 25 Oct 2020 13:57:03 +0530 Subject: [PATCH 048/669] share-icons: add #hashtag generation from tags for twitter share --- layouts/partials/share_icons.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/layouts/partials/share_icons.html b/layouts/partials/share_icons.html index b0c2f0a8..e1d40a77 100644 --- a/layouts/partials/share_icons.html +++ b/layouts/partials/share_icons.html @@ -1,8 +1,17 @@ {{- $pageurl := .Permalink }} {{- $title := .Title }} + +{{ $.Scratch.Set "tags" ""}} + +{{- with .Params.Tags }} +{{ $hashtags := newScratch}} +{{ range . }}{{ $hashtags.Add "tags" (slice (replaceRE "(\\s)" "" . ))}}{{end}} +{{ $.Scratch.Set "tags" (delimit ($hashtags.Get "tags") ",") }} +{{- end }} + \ No newline at end of file + From a97de0f9a4208fd112ee676ac3b200cea6ba25c4 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 25 Oct 2020 16:08:52 +0530 Subject: [PATCH 049/669] reset(css): rm bold styling (#55) --- assets/css/reset.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/assets/css/reset.css b/assets/css/reset.css index 78760c47..68aa1e90 100644 --- a/assets/css/reset.css +++ b/assets/css/reset.css @@ -51,11 +51,6 @@ p { margin-bottom: 0; } -strong, -b { - font-weight: 500; -} - ul { margin: 0; padding: 0; From c33dabf3a233fdeb46bdc63bb6256d75b709faad Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 26 Oct 2020 22:19:05 +0530 Subject: [PATCH 050/669] header: add Language switch (#54) * language-switch: init * header: move logo-switches together --- assets/css/header.css | 24 ++++++++++- layouts/partials/header.html | 79 ++++++++++++++++++++++++------------ 2 files changed, 75 insertions(+), 28 deletions(-) diff --git a/assets/css/header.css b/assets/css/header.css index 72b5f6aa..fe255762 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -7,17 +7,18 @@ max-width: calc(var(--nav-width) + var(--gap) * 2); margin-inline-start: auto; margin-inline-end: auto; + line-height: var(--header-height); } .nav a { display: block; - line-height: var(--header-height); } .logo, .menu { display: flex; margin: auto var(--gap); + flex-wrap: inherit; } .logo a { @@ -40,7 +41,7 @@ user-select: none; } -body.dark #moon{ +body.dark #moon { vertical-align: middle; display: none; } @@ -68,3 +69,22 @@ body:not(.dark) #sun { font-weight: 500; border-bottom: 2px solid currentColor; } + +.lang-switch ul { + display: inline-flex; +} + +.lang-switch a { + font-size: 16px; + font-weight: 500; + margin: 0 8px; +} + +.lang-switch li { + display: inline-flex; +} + +.logo-switches { + display: inline-flex; + flex-wrap: inherit; +} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 0f2e72b1..48a9f4eb 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -10,6 +10,7 @@ document.body.classList.add('dark'); } } + {{- end }} {{- if (and (.Site.Params.disableThemeToggle) (eq .Site.Params.defaultTheme "auto")) }} @@ -17,6 +18,7 @@ if (window.matchMedia('(prefers-color-scheme: dark)').matches) { document.body.classList.add('dark'); } + {{- end }}
From b40f30754d39375a9d2f06f100f836bc155faf03 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 26 Oct 2020 22:49:27 +0530 Subject: [PATCH 051/669] header: add cursor type pointer to theme-toggle --- assets/css/header.css | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/header.css b/assets/css/header.css index fe255762..9697ac7e 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -39,6 +39,7 @@ height: 18px; margin: 0 10px; user-select: none; + cursor: pointer; } body.dark #moon { From 6c7b8cf2f9026c1111e5134b8bfc6d8cd2cdb1c2 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 28 Oct 2020 09:35:21 +0530 Subject: [PATCH 052/669] share-icons: fix extra uneven padding --- assets/css/post-single.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 3a61be5e..3e25d08d 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -286,7 +286,7 @@ .share-buttons { margin-top: var(--gap); border: 1px solid var(--tertiary); - padding: var(--radius); + padding-inline-start: var(--radius); border-radius: var(--radius); display: flex; overflow-x: auto; @@ -316,4 +316,4 @@ margin: 0 calc(var(--gap) * -1); padding: 0 21px; } -} \ No newline at end of file +} From 7392edb1d3db813444d4fe166c9399153aa051a9 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 28 Oct 2020 11:11:13 +0530 Subject: [PATCH 053/669] README: update - rm old Lighthouse report - beautify - update demo image --- README.md | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 7a6f1cd6..4cc2a267 100755 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ ExampleSite can be found here: [exampleSite](https://github.com/adityatelange/hu ---

- HomeInfo + HomeInfo HomeInfo

@@ -33,21 +33,21 @@ Read this post For More Details => [hugo-PaperMod - Installation](https://aditya ## Features/Mods -- Uses Hugo's asset generator with pipelining, fingerprinting, bundling and minification by default. -- 3 Modes: - - Regular Mode. - - [Home-Info Mode.](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/#home-info-mode) - - [Profile Mode.](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/#profile-mode) -- Table of Content Generation (newer implementation). -- Archive of posts. -- Social-Media Share buttons on post. -- Menu location indicator. -- Multilingual support. -- Cover image for each post (with Responsive image support). -- Light/Dark theme ( automatic theme switch a/c to browser theme). -- SEO Friendly. -- Muliple Author support. -- No webpack, nodejs and other depedencies required to edit the theme :) +- Uses Hugo's asset generator with pipelining, fingerprinting, bundling and minification by default. +- 3 Modes: + - Regular Mode. + - [Home-Info Mode.](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/#home-info-mode) + - [Profile Mode.](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/#profile-mode) +- Table of Content Generation (newer implementation). +- Archive of posts. +- Social-Media Share buttons on post. +- Menu location indicator. +- Multilingual support. +- Cover image for each post (with Responsive image support). +- Light/Dark theme ( automatic theme switch a/c to browser theme). +- SEO Friendly. +- Muliple Author support. +- No webpack, nodejs and other depedencies required to edit the theme :) Read this post For More Details => [hugo-PaperMod - Features](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/) @@ -61,9 +61,7 @@ Read this post For More Details => [Social-Icons](https://adityatelange.github.i --- -## LightHouse Report - -LightHouse +## [LightHouse Report](https://lighthouse-dot-webdotdevsite.appspot.com//lh/html?url=https%3A%2F%2Fadityatelange.github.io%2Fhugo-PaperMod%2F) --- From 0887805caf54b19e7204718d8262e09ca08467ba Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 28 Oct 2020 22:41:42 +0530 Subject: [PATCH 054/669] README: update link faq post --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4cc2a267..e2037308 100755 --- a/README.md +++ b/README.md @@ -61,6 +61,12 @@ Read this post For More Details => [Social-Icons](https://adityatelange.github.i --- +## FAQs / How To's + +Read this post For More Details => [How To's Guide](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-how-to/) + +--- + ## [LightHouse Report](https://lighthouse-dot-webdotdevsite.appspot.com//lh/html?url=https%3A%2F%2Fadityatelange.github.io%2Fhugo-PaperMod%2F) --- From 9acbc2c134c2052c54833d9ad63fa048694b9895 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 30 Oct 2020 01:01:48 +0530 Subject: [PATCH 055/669] baseof: use `dir` attribute instead of class and set default dir to `auto` main(css): rm unused class --- assets/css/main.css | 8 -------- layouts/_default/baseof.html | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 68f8a2f1..6fac98b9 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -52,14 +52,6 @@ width: 26px; } -.direction-rtl { - direction: rtl; -} - -.direction-ltr { - direction: ltr; -} - code { direction: ltr; } diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index cd999824..f28e12ba 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,5 +1,5 @@ - + {{- partial "head.html" . }} @@ -15,4 +15,4 @@ {{- partialCached "footer.html" . .Type }} - \ No newline at end of file + From b239f42f6b419c1835ffdaa8286c7fd638a55303 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 30 Oct 2020 01:15:29 +0530 Subject: [PATCH 056/669] Add accesskeys (attribute specifies a shortcut key to activate/focus an element.) c - ToC Open/Close g- Go To Top h - Home (according to current lang) t - Theme toggle more: https://www.w3schools.com/tags/att_global_accesskey.asp --- layouts/_default/single.html | 2 +- layouts/partials/footer.html | 2 +- layouts/partials/header.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b13fb74a..72fe4a5f 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -27,7 +27,7 @@
-
{{- i18n "toc" | default "Table of Contents" }}
+
{{- i18n "toc" | default "Table of Contents" }}
{{- partial "toc.html" . }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index f6d407e2..a3ee83da 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -9,7 +9,7 @@ · Theme️ PaperMod - + - + {{- partial "extend_footer.html" . -}} {{ if in site.Params.mainSections .Type }} {{- if not .Site.Params.assets.disableFingerprinting }} From 91bc0acfa9212a55299ecd7abf71a99df10d01c4 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:31:18 +0530 Subject: [PATCH 115/669] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0bb53b5f..c61e396d 100755 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ Read this post For More Details => [hugo-PaperMod - Installation](https://aditya - Light/Dark theme (automatic theme switch a/c to browser theme and theme-switch button). - SEO Friendly. - Muliple Author support. +- Search Page - No webpack, nodejs and other depedencies required to edit the theme :) Read this post For More Details => [hugo-PaperMod - Features](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/) From 08e58f5f773f935a97ecd0ce32acc62c2bc40ad4 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 7 Dec 2020 22:59:51 +0530 Subject: [PATCH 116/669] head: commonize stylesheet resource --- layouts/partials/head.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 055701f8..baaf732f 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -21,12 +21,12 @@ {{- end}} +{{- $stylesheet := (resources.Match "css/*.css") | resources.Concat "assets/css/stylesheet.css" | minify -}} {{- if not .Site.Params.assets.disableFingerprinting }} -{{- $stylesheet := (resources.Match "css/*.css") | resources.Concat "assets/css/stylesheet.css" | minify | fingerprint -}} +{{- $stylesheet := $stylesheet | fingerprint -}} {{- else}} -{{- $stylesheet := (resources.Match "css/*.css") | resources.Concat "assets/css/stylesheet.css" | minify -}} {{- end}} From db38e156f56ce452f29d248cae3efca6eb865774 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 8 Dec 2020 00:16:11 +0530 Subject: [PATCH 117/669] footer: hljs: add check to not load hljs on archive and search --- 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 65045f46..e6e894af 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -14,7 +14,7 @@ {{- partial "extend_footer.html" . -}} -{{ if in site.Params.mainSections .Type }} +{{ if (and (in site.Params.mainSections .Type) (ne .Layout `archives`) (ne .Layout `search`)) }} {{- if not .Site.Params.assets.disableFingerprinting }} {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify | fingerprint }} + {{- else}} {{ $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} - + {{- end}} {{- end -}} From e252e761f54f1f871630cdcc5416e90de1ec89d6 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 29 Dec 2020 16:03:49 +0530 Subject: [PATCH 148/669] footer: allow disabling HLJS #143 usage => in site config => params: assets: disableHLJS: true per-page in front-matter => disableHLJS: true --- layouts/_default/baseof.html | 2 +- layouts/partials/footer.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 11fb6788..8f17b936 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -18,7 +18,7 @@ {{- block "main" . }} {{- end }} - {{- partialCached "footer.html" . .Type .Layout }} + {{- partialCached "footer.html" . .Type .Layout .Params }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index c384c4ed..b34d278a 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -18,7 +18,8 @@ {{- partial "extend_footer.html" . -}} -{{ if (and (in site.Params.mainSections .Type) (ne .Layout `archives`) (ne .Layout `search`)) }} +{{- $isHLJSdisabled := (.Site.Params.assets.disableHLJS | default .Params.disableHLJS ) }} +{{- if (and (in site.Params.mainSections .Type) (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}} {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify }} - + {{- end}} {{- end }} + {{- else}} {{ $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} - + {{- end}} {{- end -}} From 09de369d2fa8d379104edaa08901e20f1209333c Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 6 Jan 2021 01:03:49 +0530 Subject: [PATCH 160/669] update fuse.js to v6.4.6 credits: https://github.com/krisk/Fuse/releases/tag/v6.4.6 --- assets/js/fuse.js | 173 +++++++++++++++++++++++----------------------- 1 file changed, 88 insertions(+), 85 deletions(-) diff --git a/assets/js/fuse.js b/assets/js/fuse.js index a037a879..6be05928 100644 --- a/assets/js/fuse.js +++ b/assets/js/fuse.js @@ -1,7 +1,7 @@ /** - * Fuse.js v6.4.3 - Lightweight fuzzy-search (http://fusejs.io) + * Fuse.js v6.4.6 - Lightweight fuzzy-search (http://fusejs.io) * - * Copyright (c) 2020 Kiro Risk (http://kiro.me) + * Copyright (c) 2021 Kiro Risk (http://kiro.me) * All Rights Reserved. Apache Software License 2.0 * * http://www.apache.org/licenses/LICENSE-2.0 @@ -466,6 +466,7 @@ function norm() { var mantissa = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 3; var cache = new Map(); + var m = Math.pow(10, mantissa); return { get: function get(value) { var numTokens = value.match(SPACE).length; @@ -474,7 +475,9 @@ return cache.get(numTokens); } - var n = parseFloat((1 / Math.sqrt(numTokens)).toFixed(mantissa)); + var norm = 1 / Math.sqrt(numTokens); // In place of `toFixed(mantissa)`, for faster computation + + var n = parseFloat(Math.round(norm * m) / m); cache.set(numTokens, n); return n; }, @@ -696,42 +699,6 @@ return myIndex; } - function transformMatches(result, data) { - var matches = result.matches; - data.matches = []; - - if (!isDefined(matches)) { - return; - } - - matches.forEach(function (match) { - if (!isDefined(match.indices) || !match.indices.length) { - return; - } - - var indices = match.indices, - value = match.value; - var obj = { - indices: indices, - value: value - }; - - if (match.key) { - obj.key = match.key.src; - } - - if (match.idx > -1) { - obj.refIndex = match.idx; - } - - data.matches.push(obj); - }); - } - - function transformScore(result, data) { - data.score = result.score; - } - function computeScore(pattern) { var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, _ref$errors = _ref.errors, @@ -1503,7 +1470,7 @@ var isMatch = !!indices.length; return { isMatch: isMatch, - score: isMatch ? 1 : 0, + score: isMatch ? 0 : 1, indices: indices }; } @@ -1838,6 +1805,85 @@ return next(query); } + function computeScore$1(results, _ref) { + var _ref$ignoreFieldNorm = _ref.ignoreFieldNorm, + ignoreFieldNorm = _ref$ignoreFieldNorm === void 0 ? Config.ignoreFieldNorm : _ref$ignoreFieldNorm; + results.forEach(function (result) { + var totalScore = 1; + result.matches.forEach(function (_ref2) { + var key = _ref2.key, + norm = _ref2.norm, + score = _ref2.score; + var weight = key ? key.weight : null; + totalScore *= Math.pow(score === 0 && weight ? Number.EPSILON : score, (weight || 1) * (ignoreFieldNorm ? 1 : norm)); + }); + result.score = totalScore; + }); + } + + function transformMatches(result, data) { + var matches = result.matches; + data.matches = []; + + if (!isDefined(matches)) { + return; + } + + matches.forEach(function (match) { + if (!isDefined(match.indices) || !match.indices.length) { + return; + } + + var indices = match.indices, + value = match.value; + var obj = { + indices: indices, + value: value + }; + + if (match.key) { + obj.key = match.key.src; + } + + if (match.idx > -1) { + obj.refIndex = match.idx; + } + + data.matches.push(obj); + }); + } + + function transformScore(result, data) { + data.score = result.score; + } + + function format(results, docs) { + var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, + _ref$includeMatches = _ref.includeMatches, + includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, + _ref$includeScore = _ref.includeScore, + includeScore = _ref$includeScore === void 0 ? Config.includeScore : _ref$includeScore; + + var transformers = []; + if (includeMatches) transformers.push(transformMatches); + if (includeScore) transformers.push(transformScore); + return results.map(function (result) { + var idx = result.idx; + var data = { + item: docs[idx], + refIndex: idx + }; + + if (transformers.length) { + transformers.forEach(function (transformer) { + transformer(result, data); + }); + } + + return data; + }); + } + var Fuse = /*#__PURE__*/function () { function Fuse(docs) { var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; @@ -2189,52 +2235,9 @@ }]); return Fuse; - }(); // Practical scoring function + }(); - function computeScore$1(results, _ref8) { - var _ref8$ignoreFieldNorm = _ref8.ignoreFieldNorm, - ignoreFieldNorm = _ref8$ignoreFieldNorm === void 0 ? Config.ignoreFieldNorm : _ref8$ignoreFieldNorm; - results.forEach(function (result) { - var totalScore = 1; - result.matches.forEach(function (_ref9) { - var key = _ref9.key, - norm = _ref9.norm, - score = _ref9.score; - var weight = key ? key.weight : null; - totalScore *= Math.pow(score === 0 && weight ? Number.EPSILON : score, (weight || 1) * (ignoreFieldNorm ? 1 : norm)); - }); - result.score = totalScore; - }); - } - - function format(results, docs) { - var _ref10 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, - _ref10$includeMatches = _ref10.includeMatches, - includeMatches = _ref10$includeMatches === void 0 ? Config.includeMatches : _ref10$includeMatches, - _ref10$includeScore = _ref10.includeScore, - includeScore = _ref10$includeScore === void 0 ? Config.includeScore : _ref10$includeScore; - - var transformers = []; - if (includeMatches) transformers.push(transformMatches); - if (includeScore) transformers.push(transformScore); - return results.map(function (result) { - var idx = result.idx; - var data = { - item: docs[idx], - refIndex: idx - }; - - if (transformers.length) { - transformers.forEach(function (transformer) { - transformer(result, data); - }); - } - - return data; - }); - } - - Fuse.version = '6.4.3'; + Fuse.version = '6.4.6'; Fuse.createIndex = createIndex; Fuse.parseIndex = parseIndex; Fuse.config = Config; From 905640ceefd6f547f173feb4afa7d236b45f95b9 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 8 Jan 2021 20:38:00 +0530 Subject: [PATCH 161/669] increase blockquote thickness inside post --- assets/css/post-single.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 0282d501..b11468ba 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -210,7 +210,7 @@ .post-content blockquote { margin: 0 0; padding: 0 14px; - border-inline-start: 2px solid var(--primary) + border-inline-start: 3px solid var(--primary) } .post-content hr { From 3b0997fc42e4b0acb4cadd11d54e7d1a60c74670 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 8 Jan 2021 22:52:03 +0530 Subject: [PATCH 162/669] fix margin when hljs was disabled --- assets/css/post-single.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index b11468ba..8a0852b3 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -162,6 +162,10 @@ margin: 0 } +.post-content .highlight { + margin: auto 0 20px +} + .post-content .highlighttable { table-layout: fixed } From bd4a118afa6187d51c42560ea8f1f13b65e46c59 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 8 Jan 2021 22:53:04 +0530 Subject: [PATCH 163/669] rm unnecessay color to box-shadow for anchors --- assets/css/post-single.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 8a0852b3..a9d1a155 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -66,7 +66,7 @@ .post-content a, .toc a:hover { - box-shadow: 0 1px 0 var(--primary) + box-shadow: 0 1px 0 } .post-content a code { From 9d478913ec59912e7c0664d1e7c882243debe3d4 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 8 Jan 2021 23:35:00 +0530 Subject: [PATCH 164/669] Update README.md replace unseen emoji --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d208291f..afd499c9 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Read this post For More Details => [hugo-PaperMod - Installation](https://aditya --- -## Features/Mods 🪄 +## Features/Mods 💥 - Uses Hugo's asset generator with pipelining, fingerprinting, bundling and minification by default. - 3 Modes: From 4fd4bc5e204cced21e574116140ca423c302f7d3 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 8 Jan 2021 23:08:18 +0530 Subject: [PATCH 165/669] Add info to blank.css --- assets/css/extended/blank.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assets/css/extended/blank.css b/assets/css/extended/blank.css index e69de29b..a5772953 100644 --- a/assets/css/extended/blank.css +++ b/assets/css/extended/blank.css @@ -0,0 +1,5 @@ +/* +This is just a placeholder blank stylesheet so as to support adding custom styles budled with theme's default styles + +Read https://github.com/adityatelange/hugo-PaperMod/wiki/FAQs#bundling-custom-css-with-themes-assets for more info +*/ From 6a897a9e672c93bec263871a110e40b97ccdb39b Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 8 Jan 2021 23:36:01 +0530 Subject: [PATCH 166/669] update LICENSE for 2021 --- LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 0dc94d5e..85e428e1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License -Copyright (c) 2020 nanxiaobei, adityatelange +Copyright (c) 2020 nanxiaobei and adityatelange +Copyright (c) 2021 adityatelange Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 6f397ef591a0163257ccbe3ceb4fc6a0061e2109 Mon Sep 17 00:00:00 2001 From: Muhammad Hanif Date: Mon, 11 Jan 2021 20:43:36 +0700 Subject: [PATCH 167/669] i18n: Add id Bahasa Indonesia (#173) --- i18n/id.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 i18n/id.yaml diff --git a/i18n/id.yaml b/i18n/id.yaml new file mode 100644 index 00000000..0add1217 --- /dev/null +++ b/i18n/id.yaml @@ -0,0 +1,16 @@ +- id: prev_page + translation: "Halaman Sebelumnya" + +- id: next_page + translation: "Halaman Selanjutnya" + +- id: read_time + translation: + one : "1 menit" + other: "{{ .Count }} menit" + +- id: toc + translation: "Daftar Isi" + +- id: translations + translation: "Terjemahan" From e809aef590273d6aa6c16414801f19d8829548a2 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 11 Jan 2021 20:01:19 +0530 Subject: [PATCH 168/669] lighten dark's border #5b5d67 -> #333 --- assets/css/theme-vars.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/theme-vars.css b/assets/css/theme-vars.css index 47c061ce..347502f0 100644 --- a/assets/css/theme-vars.css +++ b/assets/css/theme-vars.css @@ -14,7 +14,7 @@ --content: rgba(0, 0, 0, 0.88); --hljs-bg: #1c1d21; --code-bg: #f5f5f5; - --border: #eee + --border: #eee; } @media screen and (max-width:600px) { @@ -32,7 +32,7 @@ --content: rgba(255, 255, 255, 0.64); --hljs-bg: #2e2e33; --code-bg: #37383e; - --border: #5b5d67 + --border: #333; } .list { From 89414d00dc5a08b37e336e38772aaa8dd76f074c Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 11 Jan 2021 20:15:04 +0530 Subject: [PATCH 169/669] add minimal border to post-entry - increases element speration without being noticed cc: #169 --- assets/css/post-entry.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/css/post-entry.css b/assets/css/post-entry.css index 17ad48a2..c06fd4aa 100644 --- a/assets/css/post-entry.css +++ b/assets/css/post-entry.css @@ -45,7 +45,8 @@ padding: var(--gap); background: var(--entry); border-radius: var(--radius); - transition: transform .1s + transition: transform .1s; + border: 1px solid var(--border); } .post-entry:active { From 7a0e1f369c9b6cf7e4158aca2b5e256841faddb3 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 11 Jan 2021 20:31:03 +0530 Subject: [PATCH 170/669] change animation condition from hover to active for share-buttons and terms-tags --- assets/css/post-single.css | 2 +- assets/css/terms.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index a9d1a155..0dce08ca 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -331,7 +331,7 @@ transition: transform .1s } -.share-buttons svg:hover { +.share-buttons svg:active { transform: scale(.96) } diff --git a/assets/css/terms.css b/assets/css/terms.css index 82db4453..7a68cc3d 100644 --- a/assets/css/terms.css +++ b/assets/css/terms.css @@ -12,7 +12,7 @@ transition: transform .1s } -.terms-tags a:hover { +.terms-tags a:active { background: var(--tertiary); transform: scale(.96) } From dd835600104d051ebaf591658939ab131c5ff494 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 11 Jan 2021 21:01:50 +0530 Subject: [PATCH 171/669] go-top-top button cleanup --- assets/css/footer.css | 3 --- layouts/partials/footer.html | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/css/footer.css b/assets/css/footer.css index 87dc7d43..15467ebb 100644 --- a/assets/css/footer.css +++ b/assets/css/footer.css @@ -28,7 +28,6 @@ .top-link { visibility: hidden; - opacity: 0; position: fixed; bottom: 60px; right: 30px; @@ -38,8 +37,6 @@ height: 42px; padding: 12px; border-radius: 64px; - fill: currentColor; - fill-opacity: 80%; transition: visibility .5s, opacity .8s linear } diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 3a12866b..4623b3ff 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -11,7 +11,7 @@ From b6a308d331d7ef2f59599203eb3b59890baef8ac Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 13 Jan 2021 23:19:35 +0530 Subject: [PATCH 172/669] Do not smooth scrollIntoView if user has it preferred https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-reduced-motion --- layouts/partials/footer.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 4623b3ff..f5ca45d6 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -38,9 +38,13 @@ anchor.addEventListener("click", function (e) { e.preventDefault(); var id = this.getAttribute("href").substr(1); - document.querySelector(`[id='${decodeURIComponent(id)}']`).scrollIntoView({ - behavior: "smooth" - }); + if (!window.matchMedia('(prefers-reduced-motion: reduce)').matches) { + document.querySelector(`[id='${decodeURIComponent(id)}']`).scrollIntoView({ + behavior: "smooth" + }); + } else { + document.querySelector(`[id='${decodeURIComponent(id)}']`).scrollIntoView(); + } if (id === "top") { history.replaceState(null, null, " "); } else { From 18ae4e559314288780c91ee838fd1b2f92e662f7 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 13 Jan 2021 23:35:54 +0530 Subject: [PATCH 173/669] respect prefers-reduced-motion while animating --- assets/css/post-entry.css | 6 ++++++ assets/css/post-single.css | 6 ++++++ assets/css/profile-mode.css | 6 ++++++ assets/css/search.css | 7 +++++++ assets/css/terms.css | 6 ++++++ 5 files changed, 31 insertions(+) diff --git a/assets/css/post-entry.css b/assets/css/post-entry.css index c06fd4aa..a9d08512 100644 --- a/assets/css/post-entry.css +++ b/assets/css/post-entry.css @@ -53,6 +53,12 @@ transform: scale(.96) } +@media (prefers-reduced-motion) { + .post-entry:active { + transform: none + } +} + .tag-entry .entry-cover { display: none } diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 0dce08ca..5dcb272f 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -335,6 +335,12 @@ transform: scale(.96) } +@media (prefers-reduced-motion) { + .share-buttons svg:active { + transform: none + } +} + h1:hover .anchor, h2:hover .anchor, h3:hover .anchor, diff --git a/assets/css/profile-mode.css b/assets/css/profile-mode.css index d59f7363..52502373 100644 --- a/assets/css/profile-mode.css +++ b/assets/css/profile-mode.css @@ -55,3 +55,9 @@ .button:active { transform: scale(.96) } + +@media (prefers-reduced-motion) { + .button:active { + transform: none + } +} diff --git a/assets/css/search.css b/assets/css/search.css index 275cbe10..df3275c9 100644 --- a/assets/css/search.css +++ b/assets/css/search.css @@ -41,4 +41,11 @@ #searchResults .active { transform: scale(.98); + border: 2px solid var(--tertiary) +} + +@media (prefers-reduced-motion) { + #searchResults .active { + transform: none + } } diff --git a/assets/css/terms.css b/assets/css/terms.css index 7a68cc3d..c20357fa 100644 --- a/assets/css/terms.css +++ b/assets/css/terms.css @@ -16,3 +16,9 @@ background: var(--tertiary); transform: scale(.96) } + +@media (prefers-reduced-motion) { + .terms-tags a:active { + transform: none + } +} From ad44cdda0f5e18c0c605e80eb6e9818fe112de77 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 15 Jan 2021 23:21:13 +0530 Subject: [PATCH 174/669] fix highlight.js loading on section pages --- 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 f5ca45d6..276a76af 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -18,7 +18,7 @@ {{- partial "extend_footer.html" . -}} {{- $isHLJSdisabled := (.Site.Params.assets.disableHLJS | default .Params.disableHLJS ) }} -{{- if (and (in site.Params.mainSections .Type) (ne .Layout `archives`) (ne .Layout `search`) (not $isHLJSdisabled)) }} +{{- 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}} {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify }} - + {{- end}} {{- end }} + {{- else}} {{ $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} - + {{- end}} {{- end -}} From e02df37142a6415f0906317b8e3f8052823568c2 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 20 Jan 2021 19:11:06 +0530 Subject: [PATCH 183/669] Revert "fix wrong load stylesheet and JS on multihost (multilingual) #126" Doesn't work with multilingual config with no specific baseurl This reverts commit ad79fdaf830e9df84a154510d67011c9e6d709a5. --- layouts/partials/footer.html | 4 ++-- layouts/partials/head.html | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 62118c3c..276a76af 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -21,11 +21,11 @@ {{- 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}} {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify }} - + {{- end}} {{- end }} + {{- else}} {{ $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} - + {{- end}} {{- end -}} From 757a3094b2ac56f750e8e4f832816937fdf17c37 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 20 Jan 2021 19:21:59 +0530 Subject: [PATCH 184/669] add drop-shadow to show go-to-top button on code-bg in light mode --- assets/css/footer.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assets/css/footer.css b/assets/css/footer.css index 2ccb160d..11cc29a6 100644 --- a/assets/css/footer.css +++ b/assets/css/footer.css @@ -40,6 +40,11 @@ transition: visibility .5s, opacity .8s linear } +.top-link, +.top-link svg { + filter: drop-shadow(0px 0px 0px var(--theme)); +} + .footer a:hover, .top-link:hover { color: var(--primary) From 2c9efe204a9bb0b6210367148c5f8579c57e20fd Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 20 Jan 2021 21:30:44 +0530 Subject: [PATCH 185/669] Update README.md link refs to wiki instead of demo --- README.md | 54 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index afd499c9..019ea58c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,3 @@ -![Build GH-Pages](https://github.com/adityatelange/hugo-PaperMod/workflows/Build%20GH-Pages/badge.svg) -![GitHub](https://img.shields.io/github/license/adityatelange/hugo-PaperMod) -[![hugo-papermod](https://img.shields.io/badge/Hugo--Themes-@PaperMod-blue)](https://themes.gohugo.io/hugo-papermod/) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=adityatelange_hugo-PaperMod&metric=alert_status)](https://sonarcloud.io/dashboard?id=adityatelange_hugo-PaperMod) -![code-size](https://img.shields.io/github/languages/code-size/adityatelange/hugo-PaperMod) - # PaperMod | [Demo](https://adityatelange.github.io/hugo-PaperMod/) ☄️ Fast | ☁️ Fluent | 🌙 Smooth | 📱 Responsive @@ -15,6 +9,12 @@ The [demo site](https://adityatelange.github.io/hugo-PaperMod/) includes a lot o ExampleSite can be found here: [exampleSite](https://github.com/adityatelange/hugo-PaperMod/tree/exampleSite). Demo is built up with exampleSite as source. +![Build GH-Pages](https://github.com/adityatelange/hugo-PaperMod/workflows/Build%20GH-Pages/badge.svg) +![GitHub](https://img.shields.io/github/license/adityatelange/hugo-PaperMod) +[![hugo-papermod](https://img.shields.io/badge/Hugo--Themes-@PaperMod-blue)](https://themes.gohugo.io/hugo-papermod/) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=adityatelange_hugo-PaperMod&metric=alert_status)](https://sonarcloud.io/dashboard?id=adityatelange_hugo-PaperMod) +![code-size](https://img.shields.io/github/languages/code-size/adityatelange/hugo-PaperMod) + ---

@@ -24,19 +24,13 @@ ExampleSite can be found here: [exampleSite](https://github.com/adityatelange/hu --- -## Install/Update 📥 - -Read this post For More Details => [hugo-PaperMod - Installation](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-installation/) - ---- - ## Features/Mods 💥 - Uses Hugo's asset generator with pipelining, fingerprinting, bundling and minification by default. - 3 Modes: - - Regular Mode. - - [Home-Info Mode.](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/#home-info-mode) - - [Profile Mode.](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/#profile-mode) + - [Regular Mode.](https://github.com/adityatelange/hugo-PaperMod/wiki/Features#regular-mode-default-mode) + - [Home-Info Mode.](https://github.com/adityatelange/hugo-PaperMod/wiki/Features#home-info-mode) + - [Profile Mode.](https://github.com/adityatelange/hugo-PaperMod/wiki/Features#profile-mode) - Table of Content Generation (newer implementation). - Archive of posts. - Social Icons (home-info and profile-mode) @@ -48,26 +42,34 @@ Read this post For More Details => [hugo-PaperMod - Installation](https://aditya - Light/Dark theme (automatic theme switch a/c to browser theme and theme-switch button). - SEO Friendly. - Muliple Author support. -- Search Page +- Search Page with Fuse.js - No webpack, nodejs and other depedencies required to edit the theme. -Read this post For More Details => [hugo-PaperMod - Features](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/) +Read this post For More Details => **[PaperMod - Features](https://github.com/adityatelange/hugo-PaperMod/wiki/Features)** -Release ChangeLog has info about stuff added: [Releases](https://github.com/adityatelange/hugo-PaperMod/releases) +--- -Huge thanks to contributors for making this theme better 🙌 +## Install/Update 📥 + +Read Wiki For More Details => **[PaperMod - Installation](https://github.com/adityatelange/hugo-PaperMod/wiki/Installation)** --- ## Social-Icons/Share-Icons 🖼️ -Read this post For More Details => [Social-Icons](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-icons/) +Read Wiki For More Details => **[PaperMod-Icons](https://github.com/adityatelange/hugo-PaperMod/wiki/Icons)** --- -## FAQs / How To's 🙋 +## FAQs / How To's Guide 🙋 -Read this post For More Details => [How To's Guide](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-how-to/) +Read Wiki For More Details => **[PaperMod-FAQs](https://github.com/adityatelange/hugo-PaperMod/wiki/FAQs)** + +--- + +## Release Changelog + +Release ChangeLog has info about stuff added: **[Releases](https://github.com/adityatelange/hugo-PaperMod/releases)** --- @@ -77,7 +79,7 @@ Read this post For More Details => [How To's Guide](https://adityatelange.github ## Special Thanks 🌟 -- [**Highlight.js**](https://github.com/highlightjs/highlight.js) -- [**Fuse.js**](https://github.com/krisk/fuse) -- [**Feather Icons**](https://github.com/feathericons/feather) -- **All Contributors and Supporters** +- [**Highlight.js**](https://github.com/highlightjs/highlight.js) +- [**Fuse.js**](https://github.com/krisk/fuse) +- [**Feather Icons**](https://github.com/feathericons/feather) +- **All Contributors and Supporters** From 0af2e50d893240d1a196063ce89301cf24f82ac7 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 20 Jan 2021 21:41:54 +0530 Subject: [PATCH 186/669] rm redundant styleing from profile-mode --- assets/css/profile-mode.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/assets/css/profile-mode.css b/assets/css/profile-mode.css index 64b7b929..3b269596 100644 --- a/assets/css/profile-mode.css +++ b/assets/css/profile-mode.css @@ -17,11 +17,6 @@ padding: 12px 0 } -.profile .profile_inner span { - padding: 10px 0; - font-size: 18px -} - .profile img { display: inline-table; border-radius: 50%; @@ -49,4 +44,3 @@ .button:active { transform: scale(.96) } - From 565c36fdb06b55b1a90fbaf1dee74bb582ffdd08 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 20 Jan 2021 22:00:17 +0530 Subject: [PATCH 187/669] Update README.md correct minor mistakes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 019ea58c..1b13fae1 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ ExampleSite can be found here: [exampleSite](https://github.com/adityatelange/hu ---

- HomeInfo + HomeInfo HomeInfo

@@ -45,7 +45,7 @@ ExampleSite can be found here: [exampleSite](https://github.com/adityatelange/hu - Search Page with Fuse.js - No webpack, nodejs and other depedencies required to edit the theme. -Read this post For More Details => **[PaperMod - Features](https://github.com/adityatelange/hugo-PaperMod/wiki/Features)** +Read Wiki For More Details => **[PaperMod - Features](https://github.com/adityatelange/hugo-PaperMod/wiki/Features)** --- From f5c554624948742923d3af2af9b6bfd9fe7983a8 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 21 Jan 2021 21:16:44 +0530 Subject: [PATCH 188/669] fix gist colors hide anchor underline for gist --- assets/css/post-single.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index ce7b1d19..1415431c 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -64,7 +64,7 @@ font-size: 12px } -.post-content a, +.post-content a:not(.gist a), .toc a:hover { box-shadow: 0 1px 0 } @@ -127,7 +127,7 @@ } .post-content table th, -.post-content:not(.gist) > table:not(.highlighttable) td { +.post-content table:not(.highlighttable, .highlight table, .gist .highlight) td { min-width: 80px; padding: 12px 8px; line-height: 1.5; @@ -143,7 +143,7 @@ margin: auto 0 } -.post-content:not(.gist) > .highlight, +.post-content .highlight:not(.gist .highlight), .post-content pre { margin: auto 0 20px; background: var(--hljs-bg) !important; From 3167acd32a2a2eb678e399b528b1ef3b9ffc41c5 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 21 Jan 2021 23:31:17 +0530 Subject: [PATCH 189/669] fix code highlight spacing when in a list rm redundant code --- assets/css/post-single.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 1415431c..2729dba6 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -145,7 +145,7 @@ .post-content .highlight:not(.gist .highlight), .post-content pre { - margin: auto 0 20px; + margin: 10px auto; background: var(--hljs-bg) !important; border-radius: var(--radius) } @@ -162,10 +162,6 @@ margin: 0 } -.post-content .highlight { - margin: 10px auto -} - .post-content .highlighttable { table-layout: fixed } From a8316f00738d2eef92adc5ddbed5ac01f8755334 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 21 Jan 2021 23:35:38 +0530 Subject: [PATCH 190/669] fix code highlight radius when markup.highlight.lineNos is enabled --- assets/css/post-single.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 2729dba6..9dc3caf0 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -143,6 +143,10 @@ margin: auto 0 } +.post-content .highlight table { + border-radius: var(--radius) +} + .post-content .highlight:not(.gist .highlight), .post-content pre { margin: 10px auto; From 042f4e9254450bf03792b3b1e2f359922a8339c4 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 22 Jan 2021 10:51:11 +0530 Subject: [PATCH 191/669] fix code-borders were rounded on desktop but not on mobile devices --- assets/css/post-single.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 9dc3caf0..5e8940e3 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -147,7 +147,7 @@ border-radius: var(--radius) } -.post-content .highlight:not(.gist .highlight), +.post-content .highlight:not(table), .post-content pre { margin: 10px auto; background: var(--hljs-bg) !important; From 2c67ae98774bb5e1d0fc6539688f9f29899b19cb Mon Sep 17 00:00:00 2001 From: Corban Mailloux Date: Fri, 22 Jan 2021 01:22:00 -0500 Subject: [PATCH 192/669] Allow page-specific cover settings to win. (#185) check for front-matter's cover.hidden before global config's --- 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 df77d47a..84a322be 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -31,7 +31,7 @@
{{- end}} - {{- $isHidden := ((.Site.Params.cover.hidden | default .Site.Params.cover.hiddenInSingle) | default .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") }}
From fc28fa7493024da3a1b83fdf3a82fab196ab237a Mon Sep 17 00:00:00 2001 From: Muhammad Hanif Date: Sat, 23 Jan 2021 17:19:51 +0700 Subject: [PATCH 193/669] Add meta tag for yandex site verification (#187) usage in site config => params: analytics: yandex: SiteVerificationTag: xxxxxxxxxxxxxxxx --- layouts/partials/head.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index a54e280e..86e13f55 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -20,6 +20,9 @@ {{- if .Site.Params.analytics.google.SiteVerificationTag }} {{- end}} +{{- if .Site.Params.analytics.yandex.SiteVerificationTag }} + +{{- end}} {{- $common := (resources.Match "css/*.css") | resources.Concat "assets/css/common.css" }} {{- $extended := (resources.Match "css/extended/*.css") | resources.Concat "assets/css/extended.css" }} From be1ea5391027469e2330b81390e707b2aae69c57 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 23 Jan 2021 17:03:33 +0530 Subject: [PATCH 194/669] rm selector hiding anchor links on some devices fix: #189 partial revert of f5c554624948742923d3af2af9b6bfd9fe7983a8 --- assets/css/post-single.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 5e8940e3..afa6b1d5 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -64,7 +64,7 @@ font-size: 12px } -.post-content a:not(.gist a), +.post-content a, .toc a:hover { box-shadow: 0 1px 0 } From 24afe952b2db311b7d30d309cef9002526fe197a Mon Sep 17 00:00:00 2001 From: Daksh Date: Sat, 23 Jan 2021 17:21:52 +0530 Subject: [PATCH 195/669] Add social icon for snapchat (#188) Credits for icon: https://simpleicons.org/?q=snapchat --- layouts/partials/svg.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/layouts/partials/svg.html b/layouts/partials/svg.html index 03de65a2..3ca871b7 100644 --- a/layouts/partials/svg.html +++ b/layouts/partials/svg.html @@ -295,6 +295,10 @@ +{{- else if (eq $icon_name "snapchat") -}} + + + {{- else if (eq $icon_name "sourcerer") -}} From b6842db0a5a499446947938ffd1bfbcb7c5debb8 Mon Sep 17 00:00:00 2001 From: Florian Kohrt Date: Sun, 24 Jan 2021 13:22:45 +0100 Subject: [PATCH 196/669] Only show vertical bar if necessary in post-meta (#193) fixes unnecessary "|" shown when post-meta is empty but translations are available --- layouts/_default/single.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 84a322be..3e5a43b3 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -12,7 +12,8 @@ {{- if not (.Param "hideMeta") }}
{{- partial "post_meta.html" . -}} - {{- if .IsTranslated -}} |  + {{- if .IsTranslated -}} + {{- if or .Params.author $.Site.Params.author $.Site.Params.ShowReadingTime (not .Date.IsZero) }} | {{- end -}}
    {{- i18n "translations" | default "Translations"}}: {{- range .Translations }} From 75375a43370f17daddaeda43a9cd9309dd790f16 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 23 Jan 2021 23:38:51 +0530 Subject: [PATCH 197/669] rm use of blockquote in Toc --- assets/css/post-single.css | 2 +- layouts/_default/single.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index afa6b1d5..9394ea35 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -265,7 +265,7 @@ font-weight: 500 } -.toc blockquote { +.toc .inner { margin: 0 20px; padding: 10px 20px } diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 3e5a43b3..d9761983 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -40,9 +40,9 @@
    {{- i18n "toc" | default "Table of Contents" }}
     -
    +
    {{- partial "toc.html" . }} -
    +
{{- end }} From bc4d4153dc4eb114c1c4fbca3615d21eac13e7b2 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 24 Jan 2021 18:05:00 +0530 Subject: [PATCH 198/669] add hideMeta param to list - same as in single - allows hiding meta in list pages --- layouts/_default/list.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index b6ddbfa5..9d805c50 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -44,9 +44,11 @@

{{ .Summary | plainify | htmlUnescape }}...

{{- end }} + {{- if not (.Param "hideMeta") }}
{{- partial "post_meta.html" . -}}
+ {{- end }} {{- end }} From f7dbf75d5b91cbe97bb82579aad8defa98c42402 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 24 Jan 2021 18:07:17 +0530 Subject: [PATCH 199/669] allow setting ShowReadingTime per-page as well as site-wide --- layouts/_default/single.html | 2 +- layouts/partials/post_meta.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index d9761983..84b70d5d 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -13,7 +13,7 @@
{{- partial "post_meta.html" . -}} {{- if .IsTranslated -}} - {{- if or .Params.author $.Site.Params.author $.Site.Params.ShowReadingTime (not .Date.IsZero) }} | {{- end -}} + {{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) }} | {{- end -}}
    {{- i18n "translations" | default "Translations"}}: {{- range .Translations }} diff --git a/layouts/partials/post_meta.html b/layouts/partials/post_meta.html index e0dbef40..d0cf1761 100644 --- a/layouts/partials/post_meta.html +++ b/layouts/partials/post_meta.html @@ -4,7 +4,7 @@ {{- $scratch.Add "meta" (slice (.Date.Format (default "January 2, 2006" .Site.Params.DateFormat))) }} {{- end -}} -{{- if $.Site.Params.ShowReadingTime -}} +{{- if (.Param "ShowReadingTime") -}} {{- $scratch.Add "meta" (slice (i18n "read_time" .ReadingTime | default (printf "%s min" .ReadingTime))) }} {{- end -}} From 55d9dc26cd1e362252cc8f6f365306c5c11cd6f2 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 24 Jan 2021 18:12:15 +0530 Subject: [PATCH 200/669] make similar border-radius to tags and share-buttons under single --- assets/css/post-single.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 9394ea35..06d0e1d0 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -290,7 +290,8 @@ .post-tags a, .share-buttons { - border: 1px solid var(--tertiary) + border: 1px solid var(--tertiary); + border-radius: var(--radius) } .post-tags a { @@ -300,8 +301,7 @@ color: var(--secondary); font-size: 14px; line-height: 34px; - background: var(--code-bg); - border-radius: 4px + background: var(--code-bg) } .post-tags a:hover { @@ -311,7 +311,6 @@ .share-buttons { margin-top: var(--gap); padding-inline-start: var(--radius); - border-radius: var(--radius); display: flex; overflow-x: auto } From 471e4caba2240d8ae29276f75044ab92ef04ad01 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 24 Jan 2021 18:22:29 +0530 Subject: [PATCH 201/669] add gitea social-icon svg closes: #191 --- layouts/partials/svg.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/layouts/partials/svg.html b/layouts/partials/svg.html index 3ca871b7..5ac94e98 100644 --- a/layouts/partials/svg.html +++ b/layouts/partials/svg.html @@ -135,6 +135,11 @@ +{{- else if (eq $icon_name "gitea") -}} + + + {{- else if (eq $icon_name "github") -}} @@ -297,7 +302,8 @@ {{- else if (eq $icon_name "snapchat") -}} - + {{- else if (eq $icon_name "sourcerer") -}} Date: Mon, 25 Jan 2021 12:48:10 +0530 Subject: [PATCH 202/669] fix blockquote margin with simplified tweet shorcode sticking together --- assets/css/post-single.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 06d0e1d0..05d386fd 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -212,7 +212,7 @@ } .post-content blockquote { - margin: 0 0; + margin: 20px 0; padding: 0 14px; border-inline-start: 3px solid var(--primary) } From 9c50449ce84ffeb28cd18ec3dda5ffe1d444d881 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 25 Jan 2021 21:04:29 +0530 Subject: [PATCH 203/669] improve scroll-bar styling and fix hidden gist scrollbar --- assets/css/post-single.css | 12 +++++++++++- assets/css/reset.css | 5 +++++ assets/css/zmedia.css | 4 ++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 05d386fd..5eb59668 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -347,9 +347,19 @@ h6:hover .anchor { } .post-content ::-webkit-scrollbar-thumb { + border: 2px solid var(--hljs-bg); background: rgba(255, 255, 255, 0.32) } .post-content ::-webkit-scrollbar-thumb:hover { - background: rgba(255, 255, 255, 0.64) + background: rgba(255, 255, 255, 0.56) +} + +.gist ::-webkit-scrollbar-thumb { + border: 2px solid rgb(255, 255, 255); + background: rgba(0, 0, 0, 0.32) +} + +.gist ::-webkit-scrollbar-thumb:hover { + background: rgba(0, 0, 0, 0.56) } diff --git a/assets/css/reset.css b/assets/css/reset.css index 5813e681..0f3d12fc 100644 --- a/assets/css/reset.css +++ b/assets/css/reset.css @@ -123,9 +123,14 @@ img { ::-webkit-scrollbar-thumb { background: var(--tertiary); + border: 5px solid var(--theme); border-radius: var(--radius) } +.list:not(.dark)::-webkit-scrollbar-thumb { + border: 5px solid var(--code-bg) +} + ::-webkit-scrollbar-thumb:hover { background: var(--secondary) } diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index f460b4d9..b70aa60e 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -27,8 +27,8 @@ @media screen and (min-width: 768px) { /* reset */ ::-webkit-scrollbar { - width: 10px; - height: 6px; + width: 19px; + height: 11px; } } From 789b1f824c61a4d9fd069aba92d2891a1c2375fc Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 25 Jan 2021 21:25:19 +0530 Subject: [PATCH 204/669] reduce toc size 0.5em -> 0.4em --- assets/css/post-single.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 5eb59668..9c382a55 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -248,7 +248,7 @@ margin-bottom: 40px; border: 1px solid var(--border); border-radius: var(--radius); - padding: .5em + padding: .4em } .toc details summary { From 9e99493e696961bf6dfd58c8540184c8ad4132f7 Mon Sep 17 00:00:00 2001 From: John <44279692+hlwjia@users.noreply.github.com> Date: Tue, 26 Jan 2021 00:08:10 +0800 Subject: [PATCH 205/669] Use md5 instead of default sha256 for generating SRI hashes (#195) reference: https://gohugo.io/hugo-pipes/fingerprint/ --- layouts/partials/footer.html | 2 +- layouts/partials/head.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 276a76af..454c091d 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -20,7 +20,7 @@ {{- $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 }} +{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify | resources.Fingerprint "md5" }} {{- else}} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 86e13f55..416aa784 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -31,7 +31,7 @@ {{- $stylesheet := (slice $common $extended) | resources.Concat "assets/css/stylesheet.css" | minify }} {{- if not .Site.Params.assets.disableFingerprinting }} -{{- $stylesheet := $stylesheet | fingerprint -}} +{{- $stylesheet := $stylesheet | resources.Fingerprint "md5" -}} {{- else}} @@ -43,7 +43,7 @@ {{- $fastsearch := resources.Get "js/fastsearch.js" | resources.ExecuteAsTemplate "js/fastsearch.js" .Site.Params.fuseOpts }} {{- $fusejs := resources.Get "js/fuse.js" }} {{- if not .Site.Params.assets.disableFingerprinting }} -{{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify | fingerprint }} +{{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify | resources.Fingerprint "md5" }} {{- else}} {{ $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} From 9691c419834c24f8053a010f3486ef1623a1935e Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 25 Jan 2021 21:48:15 +0530 Subject: [PATCH 206/669] retain history of header link clicks close: #196 --- 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 454c091d..217e73a5 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -48,7 +48,7 @@ if (id === "top") { history.replaceState(null, null, " "); } else { - history.replaceState(null, null, `#${id}`); + history.pushState(null, null, `#${id}`); } }); }); From cadca8a68ac02aab951fb6f27b89c9e6eebcd825 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 26 Jan 2021 10:52:30 +0530 Subject: [PATCH 207/669] fix scroll-bar colors for tables --- assets/css/post-single.css | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 9c382a55..d321e36a 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -346,20 +346,24 @@ h6:hover .anchor { font-weight: 500 } -.post-content ::-webkit-scrollbar-thumb { +.post-content :not(table) ::-webkit-scrollbar-thumb { border: 2px solid var(--hljs-bg); background: rgba(255, 255, 255, 0.32) } -.post-content ::-webkit-scrollbar-thumb:hover { +.post-content :not(table) ::-webkit-scrollbar-thumb:hover { background: rgba(255, 255, 255, 0.56) } -.gist ::-webkit-scrollbar-thumb { +.gist table::-webkit-scrollbar-thumb { border: 2px solid rgb(255, 255, 255); background: rgba(0, 0, 0, 0.32) } -.gist ::-webkit-scrollbar-thumb:hover { +.gist table::-webkit-scrollbar-thumb:hover { background: rgba(0, 0, 0, 0.56) } + +.post-content table::-webkit-scrollbar-thumb { + border-width: 2px; +} From e1ea90aa60acdf150f4b112211649364e3c55c65 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 26 Jan 2021 10:52:41 +0530 Subject: [PATCH 208/669] Revert "Use md5 instead of default sha256 for generating SRI hashes (#195)" This reverts commit 9e99493e696961bf6dfd58c8540184c8ad4132f7. --- layouts/partials/footer.html | 2 +- layouts/partials/head.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 217e73a5..49e6061e 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -20,7 +20,7 @@ {{- $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 | resources.Fingerprint "md5" }} +{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify | fingerprint }} {{- else}} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 416aa784..86e13f55 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -31,7 +31,7 @@ {{- $stylesheet := (slice $common $extended) | resources.Concat "assets/css/stylesheet.css" | minify }} {{- if not .Site.Params.assets.disableFingerprinting }} -{{- $stylesheet := $stylesheet | resources.Fingerprint "md5" -}} +{{- $stylesheet := $stylesheet | fingerprint -}} {{- else}} @@ -43,7 +43,7 @@ {{- $fastsearch := resources.Get "js/fastsearch.js" | resources.ExecuteAsTemplate "js/fastsearch.js" .Site.Params.fuseOpts }} {{- $fusejs := resources.Get "js/fuse.js" }} {{- if not .Site.Params.assets.disableFingerprinting }} -{{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify | resources.Fingerprint "md5" }} +{{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify | fingerprint }} {{- else}} {{ $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} From 698616d9fb4a76132fb094c32f0f7dcdbef75ee7 Mon Sep 17 00:00:00 2001 From: Muhammad Hanif Date: Tue, 26 Jan 2021 12:27:14 +0700 Subject: [PATCH 209/669] Add a meta tag for bing site verification (#197) --- layouts/partials/head.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 86e13f55..e733908b 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -23,6 +23,9 @@ {{- if .Site.Params.analytics.yandex.SiteVerificationTag }} {{- end}} +{{- if .Site.Params.analytics.bing.SiteVerificationTag }} + +{{- end}} {{- $common := (resources.Match "css/*.css") | resources.Concat "assets/css/common.css" }} {{- $extended := (resources.Match "css/extended/*.css") | resources.Concat "assets/css/extended.css" }} From f1329fe53d3ac48a7b971684dc40db64e79d54cb Mon Sep 17 00:00:00 2001 From: "Hattomo (TomohiroHattori)" <45988993+Hattomo@users.noreply.github.com> Date: Wed, 27 Jan 2021 17:00:45 +0900 Subject: [PATCH 210/669] Add more japanese traslations (#202) --- i18n/ja.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/i18n/ja.yaml b/i18n/ja.yaml index 30b412d8..c286ef9e 100644 --- a/i18n/ja.yaml +++ b/i18n/ja.yaml @@ -3,3 +3,14 @@ - id: next_page translation: "次のページ" + +- id: read_time + translation: + one : "1 分" + other: "{{ .Count }} 分" + +- id: toc + translation: "目次" + +- id: translations + translation: "言語" From a414d16b86088fd6a3213a2fede6656571e05787 Mon Sep 17 00:00:00 2001 From: Csaba Vass <77643292+csvass@users.noreply.github.com> Date: Wed, 27 Jan 2021 17:00:08 +0100 Subject: [PATCH 211/669] Add Hungarian(hu) translations (#203) --- i18n/hu.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 i18n/hu.yaml diff --git a/i18n/hu.yaml b/i18n/hu.yaml new file mode 100644 index 00000000..a039dda9 --- /dev/null +++ b/i18n/hu.yaml @@ -0,0 +1,16 @@ +- id: prev_page + translation: "Előző oldal" + +- id: next_page + translation: "Következő oldal" + +- id: read_time + translation: + one: "1 perc" + other: "{{ .Count }} perc" + +- id: toc + translation: "Tartalomjegyzék" + +- id: translations + translation: "Fordítások" From 92573215477d7936989152e8f277d0f29d805dd9 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 27 Jan 2021 21:19:21 +0530 Subject: [PATCH 212/669] Add description to other layouts - helps adding description to sub-sections, search, terms, archive pages --- layouts/_default/archives.html | 5 +++++ layouts/_default/list.html | 5 +++++ layouts/_default/search.html | 5 +++++ layouts/_default/terms.html | 7 ++++++- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index 22b5d9ae..5daf2aae 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -2,6 +2,11 @@

    {{ .Title }}

    + {{- if .Description }} +
    + {{ .Description }} +
    + {{- end }}
    {{- $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 9d805c50..9518ebf5 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -7,6 +7,11 @@ {{- if not .IsHome | and .Title }}

    {{ .Title }}

    + {{- if .Description }} +
    + {{ .Description }} +
    + {{- end }}
    {{- end }} diff --git a/layouts/_default/search.html b/layouts/_default/search.html index 09894327..4d0c415c 100644 --- a/layouts/_default/search.html +++ b/layouts/_default/search.html @@ -8,6 +8,11 @@ + {{- if .Description }} +
    + {{ .Description }} +
    + {{- end }} {{- if not (.Param "hideMeta") }}
    {{- if .IsTranslated -}} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index adbd2f53..b0919875 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -3,6 +3,11 @@ {{- if .Title }}

    {{ .Title }}

    + {{- if .Description }} +
    + {{ .Description }} +
    + {{- end }}
    {{- end }} @@ -19,4 +24,4 @@ {{- end }}
-{{ end }}{{/* end main */}} \ No newline at end of file +{{ end }}{{/* end main */}} From 91a9e1b9bb3fbcdc7b7876d7b1f67348f3ce9355 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 25 Jan 2021 21:10:11 +0530 Subject: [PATCH 213/669] add background to share buttons and tags under single --- assets/css/post-single.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index d321e36a..56d0c761 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -290,8 +290,9 @@ .post-tags a, .share-buttons { - border: 1px solid var(--tertiary); - border-radius: var(--radius) + border-radius: var(--radius); + background: var(--code-bg); + border: 1px solid var(--border) } .post-tags a { From b284ba5799b48a9cd9661ed10cc52c291359c755 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 23 Jan 2021 23:18:33 +0530 Subject: [PATCH 214/669] center align share-buttons --- assets/css/post-single.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 56d0c761..788bb5c5 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -310,9 +310,10 @@ } .share-buttons { - margin-top: var(--gap); + margin: 14px 0; padding-inline-start: var(--radius); display: flex; + justify-content: center; overflow-x: auto } From 2f06f5e4fa8ffcfdea3f3f99f1664babcad0fd5f Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 23 Jan 2021 23:13:47 +0530 Subject: [PATCH 215/669] fill background of table of contents --- assets/css/post-single.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 788bb5c5..f5fa4f42 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -245,12 +245,17 @@ } .toc { - margin-bottom: 40px; + margin: 0 2px 40px 2px; border: 1px solid var(--border); + background: var(--code-bg); border-radius: var(--radius); padding: .4em } +.dark .toc { + background: var(--entry); +} + .toc details summary { cursor: zoom-in; margin-inline-start: 20px From 3c3888f7ad3ade0cc061b0b2c534747295d8ced5 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 27 Jan 2021 23:58:34 +0530 Subject: [PATCH 216/669] add workflow to test PR builds fine --- .github/workflows/build.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..5a7bc88e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,32 @@ +name: Build + +on: + pull_request: + branches: + - master + - exampleSite + workflow_dispatch: + # manual run + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Git checkout + uses: actions/checkout@v2 + with: + ref: exampleSite + + - name: Get Theme + run: git submodule update --init --recursive + + - name: Update theme to Latest commit + run: git submodule update --remote --merge + + - name: Setup hugo + uses: peaceiris/actions-hugo@v2 + with: + hugo-version: 'latest' + + - name: Build + run: hugo --buildDrafts --gc --verbose --minify From 778ee39137dc69e8761c73af7a731ffc51854397 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 28 Jan 2021 00:05:30 +0530 Subject: [PATCH 217/669] init feat Prev Next post links on single post page (#180) usage => in site config add Params: ShowPostNavLinks: true --- assets/css/post-single.css | 44 ++++++++++++++++++++++++++++++++++-- layouts/_default/single.html | 21 +++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index f5fa4f42..c37d1255 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -294,7 +294,8 @@ } .post-tags a, -.share-buttons { +.share-buttons, +.paginav { border-radius: var(--radius); background: var(--code-bg); border: 1px solid var(--border) @@ -310,7 +311,8 @@ background: var(--code-bg) } -.post-tags a:hover { +.post-tags a:hover, +.paginav a:hover { background: var(--border) } @@ -374,3 +376,41 @@ h6:hover .anchor { .post-content table::-webkit-scrollbar-thumb { border-width: 2px; } + +.paginav { + margin: 10px 0; + display: flex; + line-height: 30px; + border-radius: var(--radius); +} + +.paginav a { + padding-inline-start: 14px; + padding-inline-end: 14px; + border-radius: var(--radius); +} + +.paginav .title { + letter-spacing: 1px; + text-transform: uppercase; + font-size: small; + color: var(--secondary); +} + +.paginav .prev, +.paginav .next { + width: 50%; +} + +.paginav span:hover:not(.title) { + box-shadow: 0 1px 0; +} + +.paginav .next { + margin-inline-start: auto; + text-align: right; +} + +[dir="rtl"] .paginav .next { + text-align: left; +} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 84b70d5d..b6298ac7 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -57,6 +57,27 @@ {{- end }} {{- end }} + {{- if .Site.Params.ShowPostNavLinks }} + {{- $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} + {{- if and (gt (len $pages) 1) (in $pages . ) }} + + {{- end }} + {{- end }} {{- if (and .Site.Params.ShowShareButtons (ne .Params.disableShare true) ) }} {{- partial "share_icons.html" . }} {{- end }} From 84e208f98d6ff664da5550283e900df2b3144be5 Mon Sep 17 00:00:00 2001 From: Coderslang Master Date: Fri, 29 Jan 2021 19:55:07 +0200 Subject: [PATCH 218/669] Fix missing reciprocal and self-reference hreflang (#211) ref: - https://help.ahrefs.com/en/articles/2631143-missing-reciprocal-hreflang-no-return-tag-error-in-site-audit - https://help.ahrefs.com/en/articles/2754344-what-does-the-self-referencing-hreflang-annotation-missing-issue-in-site-audit-mean --- 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 e733908b..5ba46fe9 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -71,7 +71,7 @@ {{- range .AlternativeOutputFormats -}} {{ end -}} -{{- range .Translations -}} +{{- range .AllTranslations -}} {{ end }} {{- partial "extend_head.html" . -}} From cc4fb703367f3b35c962c708115c708cc580763b Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 28 Jan 2021 20:33:01 +0530 Subject: [PATCH 219/669] rm translateX from post-title in single --- assets/css/post-single.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index c37d1255..017a3e97 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -4,8 +4,7 @@ .post-title { margin-bottom: 2px; - font-size: 40px; - transform: translateX(-2px) + font-size: 40px } .post-description { From a7e0b2f5a995e4575de567229dec59640596f158 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 28 Jan 2021 20:35:45 +0530 Subject: [PATCH 220/669] add check to display post-description in single --- layouts/_default/single.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b6298ac7..55eb38d2 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -6,9 +6,11 @@ {{ .Title }} {{- if .Draft }}
  [draft]
{{- end }} + {{- if .Description }}
{{ .Description }}
+ {{- end }} {{- if not (.Param "hideMeta") }}
{{- partial "post_meta.html" . -}} From 75855b2758210c985851119f4218012e5520be72 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 29 Jan 2021 23:37:07 +0530 Subject: [PATCH 221/669] init feat Breadcrumb Navigation (#207) * adds Breadcrumb nav above title of single page/post * add enabler var 'ShowBreadCrumbs' * introduce i18n var "home" usage: in site config: Params: ShowBreadCrumbs: true in page front-matter: ShowBreadCrumbs: false --- assets/css/post-single.css | 7 ++++++- i18n/en.yaml | 3 +++ layouts/_default/single.html | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 017a3e97..76214685 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -12,7 +12,8 @@ margin-bottom: 5px; } -.post-meta { +.post-meta, +.breadcrumbs { color: var(--secondary); font-size: 14px; display: flex; @@ -26,6 +27,10 @@ box-shadow: 0 1px 0 var(--secondary) } +.breadcrumbs a { + font-size: 16px; +} + .post-content { color: var(--content) } diff --git a/i18n/en.yaml b/i18n/en.yaml index 14b37b5e..b7323d01 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -14,3 +14,6 @@ - id: translations translation: "Translations" + +- id: home + translation: "Home" diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 55eb38d2..9716ad14 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,6 +2,24 @@
+ {{- if (.Param "ShowBreadCrumbs")}} +
+ {{- $url := replace .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 }}

{{ .Title }} {{- if .Draft }}
  [draft]
{{- end }} From 2b8e7c0b2205643fa9e87c90030d671472b76264 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:07:52 +0530 Subject: [PATCH 222/669] Update FUNDING.yml re-add buymeacoffee after technical issue is resolved --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 00c66657..6a78a557 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl liberapay: # Replace with a single Liberapay username issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username -custom: # +custom: ['https://www.buymeacoffee.com/adityatelange'] From 714859b682c470bff0508d9e0844f0c9c5954df5 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:31:41 +0530 Subject: [PATCH 223/669] Update README.md add new features in the list --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1b13fae1..8122d5a2 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,8 @@ ExampleSite can be found here: [exampleSite](https://github.com/adityatelange/hu - SEO Friendly. - Muliple Author support. - Search Page with Fuse.js +- Other Posts suggestion below a post +- BreadCrumb Navigation - No webpack, nodejs and other depedencies required to edit the theme. Read Wiki For More Details => **[PaperMod - Features](https://github.com/adityatelange/hugo-PaperMod/wiki/Features)** From 346ae95069b832984a95caf00cafcc9bb6705516 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:40:58 +0530 Subject: [PATCH 224/669] use Basic instead of Full - also use production ones which contains lesser redundant code - https://fusejs.io/getting-started/different-builds.html#explanation-of-different-builds --- assets/js/fuse.js | 2248 +-------------------------------------------- 1 file changed, 1 insertion(+), 2247 deletions(-) diff --git a/assets/js/fuse.js b/assets/js/fuse.js index 6be05928..3ca4e666 100644 --- a/assets/js/fuse.js +++ b/assets/js/fuse.js @@ -6,2250 +6,4 @@ * * http://www.apache.org/licenses/LICENSE-2.0 */ - -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : - typeof define === 'function' && define.amd ? define(factory) : - (global = global || self, global.Fuse = factory()); -}(this, (function () { 'use strict'; - - function _typeof(obj) { - "@babel/helpers - typeof"; - - if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { - _typeof = function (obj) { - return typeof obj; - }; - } else { - _typeof = function (obj) { - return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; - }; - } - - return _typeof(obj); - } - - function _classCallCheck(instance, Constructor) { - if (!(instance instanceof Constructor)) { - throw new TypeError("Cannot call a class as a function"); - } - } - - function _defineProperties(target, props) { - for (var i = 0; i < props.length; i++) { - var descriptor = props[i]; - descriptor.enumerable = descriptor.enumerable || false; - descriptor.configurable = true; - if ("value" in descriptor) descriptor.writable = true; - Object.defineProperty(target, descriptor.key, descriptor); - } - } - - function _createClass(Constructor, protoProps, staticProps) { - if (protoProps) _defineProperties(Constructor.prototype, protoProps); - if (staticProps) _defineProperties(Constructor, staticProps); - return Constructor; - } - - function _defineProperty(obj, key, value) { - if (key in obj) { - Object.defineProperty(obj, key, { - value: value, - enumerable: true, - configurable: true, - writable: true - }); - } else { - obj[key] = value; - } - - return obj; - } - - function ownKeys(object, enumerableOnly) { - var keys = Object.keys(object); - - if (Object.getOwnPropertySymbols) { - var symbols = Object.getOwnPropertySymbols(object); - if (enumerableOnly) symbols = symbols.filter(function (sym) { - return Object.getOwnPropertyDescriptor(object, sym).enumerable; - }); - keys.push.apply(keys, symbols); - } - - return keys; - } - - function _objectSpread2(target) { - for (var i = 1; i < arguments.length; i++) { - var source = arguments[i] != null ? arguments[i] : {}; - - if (i % 2) { - ownKeys(Object(source), true).forEach(function (key) { - _defineProperty(target, key, source[key]); - }); - } else if (Object.getOwnPropertyDescriptors) { - Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); - } else { - ownKeys(Object(source)).forEach(function (key) { - Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); - }); - } - } - - return target; - } - - function _inherits(subClass, superClass) { - if (typeof superClass !== "function" && superClass !== null) { - throw new TypeError("Super expression must either be null or a function"); - } - - subClass.prototype = Object.create(superClass && superClass.prototype, { - constructor: { - value: subClass, - writable: true, - configurable: true - } - }); - if (superClass) _setPrototypeOf(subClass, superClass); - } - - function _getPrototypeOf(o) { - _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { - return o.__proto__ || Object.getPrototypeOf(o); - }; - return _getPrototypeOf(o); - } - - function _setPrototypeOf(o, p) { - _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { - o.__proto__ = p; - return o; - }; - - return _setPrototypeOf(o, p); - } - - function _isNativeReflectConstruct() { - if (typeof Reflect === "undefined" || !Reflect.construct) return false; - if (Reflect.construct.sham) return false; - if (typeof Proxy === "function") return true; - - try { - Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); - return true; - } catch (e) { - return false; - } - } - - function _assertThisInitialized(self) { - if (self === void 0) { - throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); - } - - return self; - } - - function _possibleConstructorReturn(self, call) { - if (call && (typeof call === "object" || typeof call === "function")) { - return call; - } - - return _assertThisInitialized(self); - } - - function _createSuper(Derived) { - var hasNativeReflectConstruct = _isNativeReflectConstruct(); - - return function _createSuperInternal() { - var Super = _getPrototypeOf(Derived), - result; - - if (hasNativeReflectConstruct) { - var NewTarget = _getPrototypeOf(this).constructor; - - result = Reflect.construct(Super, arguments, NewTarget); - } else { - result = Super.apply(this, arguments); - } - - return _possibleConstructorReturn(this, result); - }; - } - - function _toConsumableArray(arr) { - return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); - } - - function _arrayWithoutHoles(arr) { - if (Array.isArray(arr)) return _arrayLikeToArray(arr); - } - - function _iterableToArray(iter) { - if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); - } - - function _unsupportedIterableToArray(o, minLen) { - if (!o) return; - if (typeof o === "string") return _arrayLikeToArray(o, minLen); - var n = Object.prototype.toString.call(o).slice(8, -1); - if (n === "Object" && o.constructor) n = o.constructor.name; - if (n === "Map" || n === "Set") return Array.from(o); - if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); - } - - function _arrayLikeToArray(arr, len) { - if (len == null || len > arr.length) len = arr.length; - - for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; - - return arr2; - } - - function _nonIterableSpread() { - throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); - } - - function isArray(value) { - return !Array.isArray ? getTag(value) === '[object Array]' : Array.isArray(value); - } // Adapted from: https://github.com/lodash/lodash/blob/master/.internal/baseToString.js - - var INFINITY = 1 / 0; - function baseToString(value) { - // Exit early for strings to avoid a performance hit in some environments. - if (typeof value == 'string') { - return value; - } - - var result = value + ''; - return result == '0' && 1 / value == -INFINITY ? '-0' : result; - } - function toString(value) { - return value == null ? '' : baseToString(value); - } - function isString(value) { - return typeof value === 'string'; - } - function isNumber(value) { - return typeof value === 'number'; - } // Adapted from: https://github.com/lodash/lodash/blob/master/isBoolean.js - - function isBoolean(value) { - return value === true || value === false || isObjectLike(value) && getTag(value) == '[object Boolean]'; - } - function isObject(value) { - return _typeof(value) === 'object'; - } // Checks if `value` is object-like. - - function isObjectLike(value) { - return isObject(value) && value !== null; - } - function isDefined(value) { - return value !== undefined && value !== null; - } - function isBlank(value) { - return !value.trim().length; - } // Gets the `toStringTag` of `value`. - // Adapted from: https://github.com/lodash/lodash/blob/master/.internal/getTag.js - - function getTag(value) { - return value == null ? value === undefined ? '[object Undefined]' : '[object Null]' : Object.prototype.toString.call(value); - } - - var EXTENDED_SEARCH_UNAVAILABLE = 'Extended search is not available'; - var INCORRECT_INDEX_TYPE = "Incorrect 'index' type"; - var LOGICAL_SEARCH_INVALID_QUERY_FOR_KEY = function LOGICAL_SEARCH_INVALID_QUERY_FOR_KEY(key) { - return "Invalid value for key ".concat(key); - }; - var PATTERN_LENGTH_TOO_LARGE = function PATTERN_LENGTH_TOO_LARGE(max) { - return "Pattern length exceeds max of ".concat(max, "."); - }; - var MISSING_KEY_PROPERTY = function MISSING_KEY_PROPERTY(name) { - return "Missing ".concat(name, " property in key"); - }; - var INVALID_KEY_WEIGHT_VALUE = function INVALID_KEY_WEIGHT_VALUE(key) { - return "Property 'weight' in key '".concat(key, "' must be a positive integer"); - }; - - var hasOwn = Object.prototype.hasOwnProperty; - - var KeyStore = /*#__PURE__*/function () { - function KeyStore(keys) { - var _this = this; - - _classCallCheck(this, KeyStore); - - this._keys = []; - this._keyMap = {}; - var totalWeight = 0; - keys.forEach(function (key) { - var obj = createKey(key); - totalWeight += obj.weight; - - _this._keys.push(obj); - - _this._keyMap[obj.id] = obj; - totalWeight += obj.weight; - }); // Normalize weights so that their sum is equal to 1 - - this._keys.forEach(function (key) { - key.weight /= totalWeight; - }); - } - - _createClass(KeyStore, [{ - key: "get", - value: function get(keyId) { - return this._keyMap[keyId]; - } - }, { - key: "keys", - value: function keys() { - return this._keys; - } - }, { - key: "toJSON", - value: function toJSON() { - return JSON.stringify(this._keys); - } - }]); - - return KeyStore; - }(); - function createKey(key) { - var path = null; - var id = null; - var src = null; - var weight = 1; - - if (isString(key) || isArray(key)) { - src = key; - path = createKeyPath(key); - id = createKeyId(key); - } else { - if (!hasOwn.call(key, 'name')) { - throw new Error(MISSING_KEY_PROPERTY('name')); - } - - var name = key.name; - src = name; - - if (hasOwn.call(key, 'weight')) { - weight = key.weight; - - if (weight <= 0) { - throw new Error(INVALID_KEY_WEIGHT_VALUE(name)); - } - } - - path = createKeyPath(name); - id = createKeyId(name); - } - - return { - path: path, - id: id, - weight: weight, - src: src - }; - } - function createKeyPath(key) { - return isArray(key) ? key : key.split('.'); - } - function createKeyId(key) { - return isArray(key) ? key.join('.') : key; - } - - function get(obj, path) { - var list = []; - var arr = false; - - var deepGet = function deepGet(obj, path, index) { - if (!isDefined(obj)) { - return; - } - - if (!path[index]) { - // If there's no path left, we've arrived at the object we care about. - list.push(obj); - } else { - var key = path[index]; - var value = obj[key]; - - if (!isDefined(value)) { - return; - } // If we're at the last value in the path, and if it's a string/number/bool, - // add it to the list - - - if (index === path.length - 1 && (isString(value) || isNumber(value) || isBoolean(value))) { - list.push(toString(value)); - } else if (isArray(value)) { - arr = true; // Search each item in the array. - - for (var i = 0, len = value.length; i < len; i += 1) { - deepGet(value[i], path, index + 1); - } - } else if (path.length) { - // An object. Recurse further. - deepGet(value, path, index + 1); - } - } - }; // Backwards compatibility (since path used to be a string) - - - deepGet(obj, isString(path) ? path.split('.') : path, 0); - return arr ? list : list[0]; - } - - var MatchOptions = { - // Whether the matches should be included in the result set. When `true`, each record in the result - // set will include the indices of the matched characters. - // These can consequently be used for highlighting purposes. - includeMatches: false, - // When `true`, the matching function will continue to the end of a search pattern even if - // a perfect match has already been located in the string. - findAllMatches: false, - // Minimum number of characters that must be matched before a result is considered a match - minMatchCharLength: 1 - }; - var BasicOptions = { - // When `true`, the algorithm continues searching to the end of the input even if a perfect - // match is found before the end of the same input. - isCaseSensitive: false, - // When true, the matching function will continue to the end of a search pattern even if - includeScore: false, - // List of properties that will be searched. This also supports nested properties. - keys: [], - // Whether to sort the result list, by score - shouldSort: true, - // Default sort function: sort by ascending score, ascending index - sortFn: function sortFn(a, b) { - return a.score === b.score ? a.idx < b.idx ? -1 : 1 : a.score < b.score ? -1 : 1; - } - }; - var FuzzyOptions = { - // Approximately where in the text is the pattern expected to be found? - location: 0, - // At what point does the match algorithm give up. A threshold of '0.0' requires a perfect match - // (of both letters and location), a threshold of '1.0' would match anything. - threshold: 0.6, - // Determines how close the match must be to the fuzzy location (specified above). - // An exact letter match which is 'distance' characters away from the fuzzy location - // would score as a complete mismatch. A distance of '0' requires the match be at - // the exact location specified, a threshold of '1000' would require a perfect match - // to be within 800 characters of the fuzzy location to be found using a 0.8 threshold. - distance: 100 - }; - var AdvancedOptions = { - // When `true`, it enables the use of unix-like search commands - useExtendedSearch: false, - // The get function to use when fetching an object's properties. - // The default will search nested paths *ie foo.bar.baz* - getFn: get, - // When `true`, search will ignore `location` and `distance`, so it won't matter - // where in the string the pattern appears. - // More info: https://fusejs.io/concepts/scoring-theory.html#fuzziness-score - ignoreLocation: false, - // When `true`, the calculation for the relevance score (used for sorting) will - // ignore the field-length norm. - // More info: https://fusejs.io/concepts/scoring-theory.html#field-length-norm - ignoreFieldNorm: false - }; - var Config = _objectSpread2({}, BasicOptions, {}, MatchOptions, {}, FuzzyOptions, {}, AdvancedOptions); - - var SPACE = /[^ ]+/g; // Field-length norm: the shorter the field, the higher the weight. - // Set to 3 decimals to reduce index size. - - function norm() { - var mantissa = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 3; - var cache = new Map(); - var m = Math.pow(10, mantissa); - return { - get: function get(value) { - var numTokens = value.match(SPACE).length; - - if (cache.has(numTokens)) { - return cache.get(numTokens); - } - - var norm = 1 / Math.sqrt(numTokens); // In place of `toFixed(mantissa)`, for faster computation - - var n = parseFloat(Math.round(norm * m) / m); - cache.set(numTokens, n); - return n; - }, - clear: function clear() { - cache.clear(); - } - }; - } - - var FuseIndex = /*#__PURE__*/function () { - function FuseIndex() { - var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}, - _ref$getFn = _ref.getFn, - getFn = _ref$getFn === void 0 ? Config.getFn : _ref$getFn; - - _classCallCheck(this, FuseIndex); - - this.norm = norm(3); - this.getFn = getFn; - this.isCreated = false; - this.setIndexRecords(); - } - - _createClass(FuseIndex, [{ - key: "setSources", - value: function setSources() { - var docs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - this.docs = docs; - } - }, { - key: "setIndexRecords", - value: function setIndexRecords() { - var records = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - this.records = records; - } - }, { - key: "setKeys", - value: function setKeys() { - var _this = this; - - var keys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - this.keys = keys; - this._keysMap = {}; - keys.forEach(function (key, idx) { - _this._keysMap[key.id] = idx; - }); - } - }, { - key: "create", - value: function create() { - var _this2 = this; - - if (this.isCreated || !this.docs.length) { - return; - } - - this.isCreated = true; // List is Array - - if (isString(this.docs[0])) { - this.docs.forEach(function (doc, docIndex) { - _this2._addString(doc, docIndex); - }); - } else { - // List is Array - this.docs.forEach(function (doc, docIndex) { - _this2._addObject(doc, docIndex); - }); - } - - this.norm.clear(); - } // Adds a doc to the end of the index - - }, { - key: "add", - value: function add(doc) { - var idx = this.size(); - - if (isString(doc)) { - this._addString(doc, idx); - } else { - this._addObject(doc, idx); - } - } // Removes the doc at the specified index of the index - - }, { - key: "removeAt", - value: function removeAt(idx) { - this.records.splice(idx, 1); // Change ref index of every subsquent doc - - for (var i = idx, len = this.size(); i < len; i += 1) { - this.records[i].i -= 1; - } - } - }, { - key: "getValueForItemAtKeyId", - value: function getValueForItemAtKeyId(item, keyId) { - return item[this._keysMap[keyId]]; - } - }, { - key: "size", - value: function size() { - return this.records.length; - } - }, { - key: "_addString", - value: function _addString(doc, docIndex) { - if (!isDefined(doc) || isBlank(doc)) { - return; - } - - var record = { - v: doc, - i: docIndex, - n: this.norm.get(doc) - }; - this.records.push(record); - } - }, { - key: "_addObject", - value: function _addObject(doc, docIndex) { - var _this3 = this; - - var record = { - i: docIndex, - $: {} - }; // Iterate over every key (i.e, path), and fetch the value at that key - - this.keys.forEach(function (key, keyIndex) { - // console.log(key) - var value = _this3.getFn(doc, key.path); - - if (!isDefined(value)) { - return; - } - - if (isArray(value)) { - (function () { - var subRecords = []; - var stack = [{ - nestedArrIndex: -1, - value: value - }]; - - while (stack.length) { - var _stack$pop = stack.pop(), - nestedArrIndex = _stack$pop.nestedArrIndex, - _value = _stack$pop.value; - - if (!isDefined(_value)) { - continue; - } - - if (isString(_value) && !isBlank(_value)) { - var subRecord = { - v: _value, - i: nestedArrIndex, - n: _this3.norm.get(_value) - }; - subRecords.push(subRecord); - } else if (isArray(_value)) { - _value.forEach(function (item, k) { - stack.push({ - nestedArrIndex: k, - value: item - }); - }); - } - } - - record.$[keyIndex] = subRecords; - })(); - } else if (!isBlank(value)) { - var subRecord = { - v: value, - n: _this3.norm.get(value) - }; - record.$[keyIndex] = subRecord; - } - }); - this.records.push(record); - } - }, { - key: "toJSON", - value: function toJSON() { - return { - keys: this.keys, - records: this.records - }; - } - }]); - - return FuseIndex; - }(); - function createIndex(keys, docs) { - var _ref2 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, - _ref2$getFn = _ref2.getFn, - getFn = _ref2$getFn === void 0 ? Config.getFn : _ref2$getFn; - - var myIndex = new FuseIndex({ - getFn: getFn - }); - myIndex.setKeys(keys.map(createKey)); - myIndex.setSources(docs); - myIndex.create(); - return myIndex; - } - function parseIndex(data) { - var _ref3 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref3$getFn = _ref3.getFn, - getFn = _ref3$getFn === void 0 ? Config.getFn : _ref3$getFn; - - var keys = data.keys, - records = data.records; - var myIndex = new FuseIndex({ - getFn: getFn - }); - myIndex.setKeys(keys); - myIndex.setIndexRecords(records); - return myIndex; - } - - function computeScore(pattern) { - var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref$errors = _ref.errors, - errors = _ref$errors === void 0 ? 0 : _ref$errors, - _ref$currentLocation = _ref.currentLocation, - currentLocation = _ref$currentLocation === void 0 ? 0 : _ref$currentLocation, - _ref$expectedLocation = _ref.expectedLocation, - expectedLocation = _ref$expectedLocation === void 0 ? 0 : _ref$expectedLocation, - _ref$distance = _ref.distance, - distance = _ref$distance === void 0 ? Config.distance : _ref$distance, - _ref$ignoreLocation = _ref.ignoreLocation, - ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; - - var accuracy = errors / pattern.length; - - if (ignoreLocation) { - return accuracy; - } - - var proximity = Math.abs(expectedLocation - currentLocation); - - if (!distance) { - // Dodge divide by zero error. - return proximity ? 1.0 : accuracy; - } - - return accuracy + proximity / distance; - } - - function convertMaskToIndices() { - var matchmask = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - var minMatchCharLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Config.minMatchCharLength; - var indices = []; - var start = -1; - var end = -1; - var i = 0; - - for (var len = matchmask.length; i < len; i += 1) { - var match = matchmask[i]; - - if (match && start === -1) { - start = i; - } else if (!match && start !== -1) { - end = i - 1; - - if (end - start + 1 >= minMatchCharLength) { - indices.push([start, end]); - } - - start = -1; - } - } // (i-1 - start) + 1 => i - start - - - if (matchmask[i - 1] && i - start >= minMatchCharLength) { - indices.push([start, i - 1]); - } - - return indices; - } - - // Machine word size - var MAX_BITS = 32; - - function search(text, pattern, patternAlphabet) { - var _ref = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {}, - _ref$location = _ref.location, - location = _ref$location === void 0 ? Config.location : _ref$location, - _ref$distance = _ref.distance, - distance = _ref$distance === void 0 ? Config.distance : _ref$distance, - _ref$threshold = _ref.threshold, - threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, - _ref$findAllMatches = _ref.findAllMatches, - findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, - _ref$minMatchCharLeng = _ref.minMatchCharLength, - minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, - _ref$includeMatches = _ref.includeMatches, - includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, - _ref$ignoreLocation = _ref.ignoreLocation, - ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; - - if (pattern.length > MAX_BITS) { - throw new Error(PATTERN_LENGTH_TOO_LARGE(MAX_BITS)); - } - - var patternLen = pattern.length; // Set starting location at beginning text and initialize the alphabet. - - var textLen = text.length; // Handle the case when location > text.length - - var expectedLocation = Math.max(0, Math.min(location, textLen)); // Highest score beyond which we give up. - - var currentThreshold = threshold; // Is there a nearby exact match? (speedup) - - var bestLocation = expectedLocation; // Performance: only computer matches when the minMatchCharLength > 1 - // OR if `includeMatches` is true. - - var computeMatches = minMatchCharLength > 1 || includeMatches; // A mask of the matches, used for building the indices - - var matchMask = computeMatches ? Array(textLen) : []; - var index; // Get all exact matches, here for speed up - - while ((index = text.indexOf(pattern, bestLocation)) > -1) { - var score = computeScore(pattern, { - currentLocation: index, - expectedLocation: expectedLocation, - distance: distance, - ignoreLocation: ignoreLocation - }); - currentThreshold = Math.min(score, currentThreshold); - bestLocation = index + patternLen; - - if (computeMatches) { - var i = 0; - - while (i < patternLen) { - matchMask[index + i] = 1; - i += 1; - } - } - } // Reset the best location - - - bestLocation = -1; - var lastBitArr = []; - var finalScore = 1; - var binMax = patternLen + textLen; - var mask = 1 << patternLen - 1; - - for (var _i = 0; _i < patternLen; _i += 1) { - // Scan for the best match; each iteration allows for one more error. - // Run a binary search to determine how far from the match location we can stray - // at this error level. - var binMin = 0; - var binMid = binMax; - - while (binMin < binMid) { - var _score2 = computeScore(pattern, { - errors: _i, - currentLocation: expectedLocation + binMid, - expectedLocation: expectedLocation, - distance: distance, - ignoreLocation: ignoreLocation - }); - - if (_score2 <= currentThreshold) { - binMin = binMid; - } else { - binMax = binMid; - } - - binMid = Math.floor((binMax - binMin) / 2 + binMin); - } // Use the result from this iteration as the maximum for the next. - - - binMax = binMid; - var start = Math.max(1, expectedLocation - binMid + 1); - var finish = findAllMatches ? textLen : Math.min(expectedLocation + binMid, textLen) + patternLen; // Initialize the bit array - - var bitArr = Array(finish + 2); - bitArr[finish + 1] = (1 << _i) - 1; - - for (var j = finish; j >= start; j -= 1) { - var currentLocation = j - 1; - var charMatch = patternAlphabet[text.charAt(currentLocation)]; - - if (computeMatches) { - // Speed up: quick bool to int conversion (i.e, `charMatch ? 1 : 0`) - matchMask[currentLocation] = +!!charMatch; - } // First pass: exact match - - - bitArr[j] = (bitArr[j + 1] << 1 | 1) & charMatch; // Subsequent passes: fuzzy match - - if (_i) { - bitArr[j] |= (lastBitArr[j + 1] | lastBitArr[j]) << 1 | 1 | lastBitArr[j + 1]; - } - - if (bitArr[j] & mask) { - finalScore = computeScore(pattern, { - errors: _i, - currentLocation: currentLocation, - expectedLocation: expectedLocation, - distance: distance, - ignoreLocation: ignoreLocation - }); // This match will almost certainly be better than any existing match. - // But check anyway. - - if (finalScore <= currentThreshold) { - // Indeed it is - currentThreshold = finalScore; - bestLocation = currentLocation; // Already passed `loc`, downhill from here on in. - - if (bestLocation <= expectedLocation) { - break; - } // When passing `bestLocation`, don't exceed our current distance from `expectedLocation`. - - - start = Math.max(1, 2 * expectedLocation - bestLocation); - } - } - } // No hope for a (better) match at greater error levels. - - - var _score = computeScore(pattern, { - errors: _i + 1, - currentLocation: expectedLocation, - expectedLocation: expectedLocation, - distance: distance, - ignoreLocation: ignoreLocation - }); - - if (_score > currentThreshold) { - break; - } - - lastBitArr = bitArr; - } - - var result = { - isMatch: bestLocation >= 0, - // Count exact matches (those with a score of 0) to be "almost" exact - score: Math.max(0.001, finalScore) - }; - - if (computeMatches) { - var indices = convertMaskToIndices(matchMask, minMatchCharLength); - - if (!indices.length) { - result.isMatch = false; - } else if (includeMatches) { - result.indices = indices; - } - } - - return result; - } - - function createPatternAlphabet(pattern) { - var mask = {}; - - for (var i = 0, len = pattern.length; i < len; i += 1) { - var char = pattern.charAt(i); - mask[char] = (mask[char] || 0) | 1 << len - i - 1; - } - - return mask; - } - - var BitapSearch = /*#__PURE__*/function () { - function BitapSearch(pattern) { - var _this = this; - - var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref$location = _ref.location, - location = _ref$location === void 0 ? Config.location : _ref$location, - _ref$threshold = _ref.threshold, - threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, - _ref$distance = _ref.distance, - distance = _ref$distance === void 0 ? Config.distance : _ref$distance, - _ref$includeMatches = _ref.includeMatches, - includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, - _ref$findAllMatches = _ref.findAllMatches, - findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, - _ref$minMatchCharLeng = _ref.minMatchCharLength, - minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, - _ref$isCaseSensitive = _ref.isCaseSensitive, - isCaseSensitive = _ref$isCaseSensitive === void 0 ? Config.isCaseSensitive : _ref$isCaseSensitive, - _ref$ignoreLocation = _ref.ignoreLocation, - ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; - - _classCallCheck(this, BitapSearch); - - this.options = { - location: location, - threshold: threshold, - distance: distance, - includeMatches: includeMatches, - findAllMatches: findAllMatches, - minMatchCharLength: minMatchCharLength, - isCaseSensitive: isCaseSensitive, - ignoreLocation: ignoreLocation - }; - this.pattern = isCaseSensitive ? pattern : pattern.toLowerCase(); - this.chunks = []; - - if (!this.pattern.length) { - return; - } - - var addChunk = function addChunk(pattern, startIndex) { - _this.chunks.push({ - pattern: pattern, - alphabet: createPatternAlphabet(pattern), - startIndex: startIndex - }); - }; - - var len = this.pattern.length; - - if (len > MAX_BITS) { - var i = 0; - var remainder = len % MAX_BITS; - var end = len - remainder; - - while (i < end) { - addChunk(this.pattern.substr(i, MAX_BITS), i); - i += MAX_BITS; - } - - if (remainder) { - var startIndex = len - MAX_BITS; - addChunk(this.pattern.substr(startIndex), startIndex); - } - } else { - addChunk(this.pattern, 0); - } - } - - _createClass(BitapSearch, [{ - key: "searchIn", - value: function searchIn(text) { - var _this$options = this.options, - isCaseSensitive = _this$options.isCaseSensitive, - includeMatches = _this$options.includeMatches; - - if (!isCaseSensitive) { - text = text.toLowerCase(); - } // Exact match - - - if (this.pattern === text) { - var _result = { - isMatch: true, - score: 0 - }; - - if (includeMatches) { - _result.indices = [[0, text.length - 1]]; - } - - return _result; - } // Otherwise, use Bitap algorithm - - - var _this$options2 = this.options, - location = _this$options2.location, - distance = _this$options2.distance, - threshold = _this$options2.threshold, - findAllMatches = _this$options2.findAllMatches, - minMatchCharLength = _this$options2.minMatchCharLength, - ignoreLocation = _this$options2.ignoreLocation; - var allIndices = []; - var totalScore = 0; - var hasMatches = false; - this.chunks.forEach(function (_ref2) { - var pattern = _ref2.pattern, - alphabet = _ref2.alphabet, - startIndex = _ref2.startIndex; - - var _search = search(text, pattern, alphabet, { - location: location + startIndex, - distance: distance, - threshold: threshold, - findAllMatches: findAllMatches, - minMatchCharLength: minMatchCharLength, - includeMatches: includeMatches, - ignoreLocation: ignoreLocation - }), - isMatch = _search.isMatch, - score = _search.score, - indices = _search.indices; - - if (isMatch) { - hasMatches = true; - } - - totalScore += score; - - if (isMatch && indices) { - allIndices = [].concat(_toConsumableArray(allIndices), _toConsumableArray(indices)); - } - }); - var result = { - isMatch: hasMatches, - score: hasMatches ? totalScore / this.chunks.length : 1 - }; - - if (hasMatches && includeMatches) { - result.indices = allIndices; - } - - return result; - } - }]); - - return BitapSearch; - }(); - - var BaseMatch = /*#__PURE__*/function () { - function BaseMatch(pattern) { - _classCallCheck(this, BaseMatch); - - this.pattern = pattern; - } - - _createClass(BaseMatch, [{ - key: "search", - value: function search() - /*text*/ - {} - }], [{ - key: "isMultiMatch", - value: function isMultiMatch(pattern) { - return getMatch(pattern, this.multiRegex); - } - }, { - key: "isSingleMatch", - value: function isSingleMatch(pattern) { - return getMatch(pattern, this.singleRegex); - } - }]); - - return BaseMatch; - }(); - - function getMatch(pattern, exp) { - var matches = pattern.match(exp); - return matches ? matches[1] : null; - } - - var ExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(ExactMatch, _BaseMatch); - - var _super = _createSuper(ExactMatch); - - function ExactMatch(pattern) { - _classCallCheck(this, ExactMatch); - - return _super.call(this, pattern); - } - - _createClass(ExactMatch, [{ - key: "search", - value: function search(text) { - var isMatch = text === this.pattern; - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [0, this.pattern.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^="(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^=(.*)$/; - } - }]); - - return ExactMatch; - }(BaseMatch); - - var InverseExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(InverseExactMatch, _BaseMatch); - - var _super = _createSuper(InverseExactMatch); - - function InverseExactMatch(pattern) { - _classCallCheck(this, InverseExactMatch); - - return _super.call(this, pattern); - } - - _createClass(InverseExactMatch, [{ - key: "search", - value: function search(text) { - var index = text.indexOf(this.pattern); - var isMatch = index === -1; - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [0, text.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'inverse-exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^!"(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^!(.*)$/; - } - }]); - - return InverseExactMatch; - }(BaseMatch); - - var PrefixExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(PrefixExactMatch, _BaseMatch); - - var _super = _createSuper(PrefixExactMatch); - - function PrefixExactMatch(pattern) { - _classCallCheck(this, PrefixExactMatch); - - return _super.call(this, pattern); - } - - _createClass(PrefixExactMatch, [{ - key: "search", - value: function search(text) { - var isMatch = text.startsWith(this.pattern); - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [0, this.pattern.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'prefix-exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^\^"(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^\^(.*)$/; - } - }]); - - return PrefixExactMatch; - }(BaseMatch); - - var InversePrefixExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(InversePrefixExactMatch, _BaseMatch); - - var _super = _createSuper(InversePrefixExactMatch); - - function InversePrefixExactMatch(pattern) { - _classCallCheck(this, InversePrefixExactMatch); - - return _super.call(this, pattern); - } - - _createClass(InversePrefixExactMatch, [{ - key: "search", - value: function search(text) { - var isMatch = !text.startsWith(this.pattern); - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [0, text.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'inverse-prefix-exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^!\^"(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^!\^(.*)$/; - } - }]); - - return InversePrefixExactMatch; - }(BaseMatch); - - var SuffixExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(SuffixExactMatch, _BaseMatch); - - var _super = _createSuper(SuffixExactMatch); - - function SuffixExactMatch(pattern) { - _classCallCheck(this, SuffixExactMatch); - - return _super.call(this, pattern); - } - - _createClass(SuffixExactMatch, [{ - key: "search", - value: function search(text) { - var isMatch = text.endsWith(this.pattern); - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [text.length - this.pattern.length, text.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'suffix-exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^"(.*)"\$$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^(.*)\$$/; - } - }]); - - return SuffixExactMatch; - }(BaseMatch); - - var InverseSuffixExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(InverseSuffixExactMatch, _BaseMatch); - - var _super = _createSuper(InverseSuffixExactMatch); - - function InverseSuffixExactMatch(pattern) { - _classCallCheck(this, InverseSuffixExactMatch); - - return _super.call(this, pattern); - } - - _createClass(InverseSuffixExactMatch, [{ - key: "search", - value: function search(text) { - var isMatch = !text.endsWith(this.pattern); - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [0, text.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'inverse-suffix-exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^!"(.*)"\$$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^!(.*)\$$/; - } - }]); - - return InverseSuffixExactMatch; - }(BaseMatch); - - var FuzzyMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(FuzzyMatch, _BaseMatch); - - var _super = _createSuper(FuzzyMatch); - - function FuzzyMatch(pattern) { - var _this; - - var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref$location = _ref.location, - location = _ref$location === void 0 ? Config.location : _ref$location, - _ref$threshold = _ref.threshold, - threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, - _ref$distance = _ref.distance, - distance = _ref$distance === void 0 ? Config.distance : _ref$distance, - _ref$includeMatches = _ref.includeMatches, - includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, - _ref$findAllMatches = _ref.findAllMatches, - findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, - _ref$minMatchCharLeng = _ref.minMatchCharLength, - minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, - _ref$isCaseSensitive = _ref.isCaseSensitive, - isCaseSensitive = _ref$isCaseSensitive === void 0 ? Config.isCaseSensitive : _ref$isCaseSensitive, - _ref$ignoreLocation = _ref.ignoreLocation, - ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; - - _classCallCheck(this, FuzzyMatch); - - _this = _super.call(this, pattern); - _this._bitapSearch = new BitapSearch(pattern, { - location: location, - threshold: threshold, - distance: distance, - includeMatches: includeMatches, - findAllMatches: findAllMatches, - minMatchCharLength: minMatchCharLength, - isCaseSensitive: isCaseSensitive, - ignoreLocation: ignoreLocation - }); - return _this; - } - - _createClass(FuzzyMatch, [{ - key: "search", - value: function search(text) { - return this._bitapSearch.searchIn(text); - } - }], [{ - key: "type", - get: function get() { - return 'fuzzy'; - } - }, { - key: "multiRegex", - get: function get() { - return /^"(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^(.*)$/; - } - }]); - - return FuzzyMatch; - }(BaseMatch); - - var IncludeMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(IncludeMatch, _BaseMatch); - - var _super = _createSuper(IncludeMatch); - - function IncludeMatch(pattern) { - _classCallCheck(this, IncludeMatch); - - return _super.call(this, pattern); - } - - _createClass(IncludeMatch, [{ - key: "search", - value: function search(text) { - var location = 0; - var index; - var indices = []; - var patternLen = this.pattern.length; // Get all exact matches - - while ((index = text.indexOf(this.pattern, location)) > -1) { - location = index + patternLen; - indices.push([index, location - 1]); - } - - var isMatch = !!indices.length; - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: indices - }; - } - }], [{ - key: "type", - get: function get() { - return 'include'; - } - }, { - key: "multiRegex", - get: function get() { - return /^'"(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^'(.*)$/; - } - }]); - - return IncludeMatch; - }(BaseMatch); - - var searchers = [ExactMatch, IncludeMatch, PrefixExactMatch, InversePrefixExactMatch, InverseSuffixExactMatch, SuffixExactMatch, InverseExactMatch, FuzzyMatch]; - var searchersLen = searchers.length; // Regex to split by spaces, but keep anything in quotes together - - var SPACE_RE = / +(?=([^\"]*\"[^\"]*\")*[^\"]*$)/; - var OR_TOKEN = '|'; // Return a 2D array representation of the query, for simpler parsing. - // Example: - // "^core go$ | rb$ | py$ xy$" => [["^core", "go$"], ["rb$"], ["py$", "xy$"]] - - function parseQuery(pattern) { - var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; - return pattern.split(OR_TOKEN).map(function (item) { - var query = item.trim().split(SPACE_RE).filter(function (item) { - return item && !!item.trim(); - }); - var results = []; - - for (var i = 0, len = query.length; i < len; i += 1) { - var queryItem = query[i]; // 1. Handle multiple query match (i.e, once that are quoted, like `"hello world"`) - - var found = false; - var idx = -1; - - while (!found && ++idx < searchersLen) { - var searcher = searchers[idx]; - var token = searcher.isMultiMatch(queryItem); - - if (token) { - results.push(new searcher(token, options)); - found = true; - } - } - - if (found) { - continue; - } // 2. Handle single query matches (i.e, once that are *not* quoted) - - - idx = -1; - - while (++idx < searchersLen) { - var _searcher = searchers[idx]; - - var _token = _searcher.isSingleMatch(queryItem); - - if (_token) { - results.push(new _searcher(_token, options)); - break; - } - } - } - - return results; - }); - } - - // to a singl match - - var MultiMatchSet = new Set([FuzzyMatch.type, IncludeMatch.type]); - /** - * Command-like searching - * ====================== - * - * Given multiple search terms delimited by spaces.e.g. `^jscript .python$ ruby !java`, - * search in a given text. - * - * Search syntax: - * - * | Token | Match type | Description | - * | ----------- | -------------------------- | -------------------------------------- | - * | `jscript` | fuzzy-match | Items that fuzzy match `jscript` | - * | `=scheme` | exact-match | Items that are `scheme` | - * | `'python` | include-match | Items that include `python` | - * | `!ruby` | inverse-exact-match | Items that do not include `ruby` | - * | `^java` | prefix-exact-match | Items that start with `java` | - * | `!^earlang` | inverse-prefix-exact-match | Items that do not start with `earlang` | - * | `.js$` | suffix-exact-match | Items that end with `.js` | - * | `!.go$` | inverse-suffix-exact-match | Items that do not end with `.go` | - * - * A single pipe character acts as an OR operator. For example, the following - * query matches entries that start with `core` and end with either`go`, `rb`, - * or`py`. - * - * ``` - * ^core go$ | rb$ | py$ - * ``` - */ - - var ExtendedSearch = /*#__PURE__*/function () { - function ExtendedSearch(pattern) { - var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref$isCaseSensitive = _ref.isCaseSensitive, - isCaseSensitive = _ref$isCaseSensitive === void 0 ? Config.isCaseSensitive : _ref$isCaseSensitive, - _ref$includeMatches = _ref.includeMatches, - includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, - _ref$minMatchCharLeng = _ref.minMatchCharLength, - minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, - _ref$ignoreLocation = _ref.ignoreLocation, - ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation, - _ref$findAllMatches = _ref.findAllMatches, - findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, - _ref$location = _ref.location, - location = _ref$location === void 0 ? Config.location : _ref$location, - _ref$threshold = _ref.threshold, - threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, - _ref$distance = _ref.distance, - distance = _ref$distance === void 0 ? Config.distance : _ref$distance; - - _classCallCheck(this, ExtendedSearch); - - this.query = null; - this.options = { - isCaseSensitive: isCaseSensitive, - includeMatches: includeMatches, - minMatchCharLength: minMatchCharLength, - findAllMatches: findAllMatches, - ignoreLocation: ignoreLocation, - location: location, - threshold: threshold, - distance: distance - }; - this.pattern = isCaseSensitive ? pattern : pattern.toLowerCase(); - this.query = parseQuery(this.pattern, this.options); - } - - _createClass(ExtendedSearch, [{ - key: "searchIn", - value: function searchIn(text) { - var query = this.query; - - if (!query) { - return { - isMatch: false, - score: 1 - }; - } - - var _this$options = this.options, - includeMatches = _this$options.includeMatches, - isCaseSensitive = _this$options.isCaseSensitive; - text = isCaseSensitive ? text : text.toLowerCase(); - var numMatches = 0; - var allIndices = []; - var totalScore = 0; // ORs - - for (var i = 0, qLen = query.length; i < qLen; i += 1) { - var searchers = query[i]; // Reset indices - - allIndices.length = 0; - numMatches = 0; // ANDs - - for (var j = 0, pLen = searchers.length; j < pLen; j += 1) { - var searcher = searchers[j]; - - var _searcher$search = searcher.search(text), - isMatch = _searcher$search.isMatch, - indices = _searcher$search.indices, - score = _searcher$search.score; - - if (isMatch) { - numMatches += 1; - totalScore += score; - - if (includeMatches) { - var type = searcher.constructor.type; - - if (MultiMatchSet.has(type)) { - allIndices = [].concat(_toConsumableArray(allIndices), _toConsumableArray(indices)); - } else { - allIndices.push(indices); - } - } - } else { - totalScore = 0; - numMatches = 0; - allIndices.length = 0; - break; - } - } // OR condition, so if TRUE, return - - - if (numMatches) { - var result = { - isMatch: true, - score: totalScore / numMatches - }; - - if (includeMatches) { - result.indices = allIndices; - } - - return result; - } - } // Nothing was matched - - - return { - isMatch: false, - score: 1 - }; - } - }], [{ - key: "condition", - value: function condition(_, options) { - return options.useExtendedSearch; - } - }]); - - return ExtendedSearch; - }(); - - var registeredSearchers = []; - function register() { - registeredSearchers.push.apply(registeredSearchers, arguments); - } - function createSearcher(pattern, options) { - for (var i = 0, len = registeredSearchers.length; i < len; i += 1) { - var searcherClass = registeredSearchers[i]; - - if (searcherClass.condition(pattern, options)) { - return new searcherClass(pattern, options); - } - } - - return new BitapSearch(pattern, options); - } - - var LogicalOperator = { - AND: '$and', - OR: '$or' - }; - var KeyType = { - PATH: '$path', - PATTERN: '$val' - }; - - var isExpression = function isExpression(query) { - return !!(query[LogicalOperator.AND] || query[LogicalOperator.OR]); - }; - - var isPath = function isPath(query) { - return !!query[KeyType.PATH]; - }; - - var isLeaf = function isLeaf(query) { - return !isArray(query) && isObject(query) && !isExpression(query); - }; - - var convertToExplicit = function convertToExplicit(query) { - return _defineProperty({}, LogicalOperator.AND, Object.keys(query).map(function (key) { - return _defineProperty({}, key, query[key]); - })); - }; // When `auto` is `true`, the parse function will infer and initialize and add - // the appropriate `Searcher` instance - - - function parse(query, options) { - var _ref3 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, - _ref3$auto = _ref3.auto, - auto = _ref3$auto === void 0 ? true : _ref3$auto; - - var next = function next(query) { - var keys = Object.keys(query); - var isQueryPath = isPath(query); - - if (!isQueryPath && keys.length > 1 && !isExpression(query)) { - return next(convertToExplicit(query)); - } - - if (isLeaf(query)) { - var key = isQueryPath ? query[KeyType.PATH] : keys[0]; - var pattern = isQueryPath ? query[KeyType.PATTERN] : query[key]; - - if (!isString(pattern)) { - throw new Error(LOGICAL_SEARCH_INVALID_QUERY_FOR_KEY(key)); - } - - var obj = { - keyId: createKeyId(key), - pattern: pattern - }; - - if (auto) { - obj.searcher = createSearcher(pattern, options); - } - - return obj; - } - - var node = { - children: [], - operator: keys[0] - }; - keys.forEach(function (key) { - var value = query[key]; - - if (isArray(value)) { - value.forEach(function (item) { - node.children.push(next(item)); - }); - } - }); - return node; - }; - - if (!isExpression(query)) { - query = convertToExplicit(query); - } - - return next(query); - } - - function computeScore$1(results, _ref) { - var _ref$ignoreFieldNorm = _ref.ignoreFieldNorm, - ignoreFieldNorm = _ref$ignoreFieldNorm === void 0 ? Config.ignoreFieldNorm : _ref$ignoreFieldNorm; - results.forEach(function (result) { - var totalScore = 1; - result.matches.forEach(function (_ref2) { - var key = _ref2.key, - norm = _ref2.norm, - score = _ref2.score; - var weight = key ? key.weight : null; - totalScore *= Math.pow(score === 0 && weight ? Number.EPSILON : score, (weight || 1) * (ignoreFieldNorm ? 1 : norm)); - }); - result.score = totalScore; - }); - } - - function transformMatches(result, data) { - var matches = result.matches; - data.matches = []; - - if (!isDefined(matches)) { - return; - } - - matches.forEach(function (match) { - if (!isDefined(match.indices) || !match.indices.length) { - return; - } - - var indices = match.indices, - value = match.value; - var obj = { - indices: indices, - value: value - }; - - if (match.key) { - obj.key = match.key.src; - } - - if (match.idx > -1) { - obj.refIndex = match.idx; - } - - data.matches.push(obj); - }); - } - - function transformScore(result, data) { - data.score = result.score; - } - - function format(results, docs) { - var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, - _ref$includeMatches = _ref.includeMatches, - includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, - _ref$includeScore = _ref.includeScore, - includeScore = _ref$includeScore === void 0 ? Config.includeScore : _ref$includeScore; - - var transformers = []; - if (includeMatches) transformers.push(transformMatches); - if (includeScore) transformers.push(transformScore); - return results.map(function (result) { - var idx = result.idx; - var data = { - item: docs[idx], - refIndex: idx - }; - - if (transformers.length) { - transformers.forEach(function (transformer) { - transformer(result, data); - }); - } - - return data; - }); - } - - var Fuse = /*#__PURE__*/function () { - function Fuse(docs) { - var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; - var index = arguments.length > 2 ? arguments[2] : undefined; - - _classCallCheck(this, Fuse); - - this.options = _objectSpread2({}, Config, {}, options); - - if (this.options.useExtendedSearch && !true) { - throw new Error(EXTENDED_SEARCH_UNAVAILABLE); - } - - this._keyStore = new KeyStore(this.options.keys); - this.setCollection(docs, index); - } - - _createClass(Fuse, [{ - key: "setCollection", - value: function setCollection(docs, index) { - this._docs = docs; - - if (index && !(index instanceof FuseIndex)) { - throw new Error(INCORRECT_INDEX_TYPE); - } - - this._myIndex = index || createIndex(this.options.keys, this._docs, { - getFn: this.options.getFn - }); - } - }, { - key: "add", - value: function add(doc) { - if (!isDefined(doc)) { - return; - } - - this._docs.push(doc); - - this._myIndex.add(doc); - } - }, { - key: "remove", - value: function remove() { - var predicate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function () { - return ( - /* doc, idx */ - false - ); - }; - var results = []; - - for (var i = 0, len = this._docs.length; i < len; i += 1) { - var doc = this._docs[i]; - - if (predicate(doc, i)) { - this.removeAt(i); - i -= 1; - len -= 1; - results.push(doc); - } - } - - return results; - } - }, { - key: "removeAt", - value: function removeAt(idx) { - this._docs.splice(idx, 1); - - this._myIndex.removeAt(idx); - } - }, { - key: "getIndex", - value: function getIndex() { - return this._myIndex; - } - }, { - key: "search", - value: function search(query) { - var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref$limit = _ref.limit, - limit = _ref$limit === void 0 ? -1 : _ref$limit; - - var _this$options = this.options, - includeMatches = _this$options.includeMatches, - includeScore = _this$options.includeScore, - shouldSort = _this$options.shouldSort, - sortFn = _this$options.sortFn, - ignoreFieldNorm = _this$options.ignoreFieldNorm; - var results = isString(query) ? isString(this._docs[0]) ? this._searchStringList(query) : this._searchObjectList(query) : this._searchLogical(query); - computeScore$1(results, { - ignoreFieldNorm: ignoreFieldNorm - }); - - if (shouldSort) { - results.sort(sortFn); - } - - if (isNumber(limit) && limit > -1) { - results = results.slice(0, limit); - } - - return format(results, this._docs, { - includeMatches: includeMatches, - includeScore: includeScore - }); - } - }, { - key: "_searchStringList", - value: function _searchStringList(query) { - var searcher = createSearcher(query, this.options); - var records = this._myIndex.records; - var results = []; // Iterate over every string in the index - - records.forEach(function (_ref2) { - var text = _ref2.v, - idx = _ref2.i, - norm = _ref2.n; - - if (!isDefined(text)) { - return; - } - - var _searcher$searchIn = searcher.searchIn(text), - isMatch = _searcher$searchIn.isMatch, - score = _searcher$searchIn.score, - indices = _searcher$searchIn.indices; - - if (isMatch) { - results.push({ - item: text, - idx: idx, - matches: [{ - score: score, - value: text, - norm: norm, - indices: indices - }] - }); - } - }); - return results; - } - }, { - key: "_searchLogical", - value: function _searchLogical(query) { - var _this = this; - - var expression = parse(query, this.options); - - var evaluate = function evaluate(node, item, idx) { - if (!node.children) { - var keyId = node.keyId, - searcher = node.searcher; - - var matches = _this._findMatches({ - key: _this._keyStore.get(keyId), - value: _this._myIndex.getValueForItemAtKeyId(item, keyId), - searcher: searcher - }); - - if (matches && matches.length) { - return [{ - idx: idx, - item: item, - matches: matches - }]; - } - - return []; - } - /*eslint indent: [2, 2, {"SwitchCase": 1}]*/ - - - switch (node.operator) { - case LogicalOperator.AND: - { - var res = []; - - for (var i = 0, len = node.children.length; i < len; i += 1) { - var child = node.children[i]; - var result = evaluate(child, item, idx); - - if (result.length) { - res.push.apply(res, _toConsumableArray(result)); - } else { - return []; - } - } - - return res; - } - - case LogicalOperator.OR: - { - var _res = []; - - for (var _i = 0, _len = node.children.length; _i < _len; _i += 1) { - var _child = node.children[_i]; - - var _result = evaluate(_child, item, idx); - - if (_result.length) { - _res.push.apply(_res, _toConsumableArray(_result)); - - break; - } - } - - return _res; - } - } - }; - - var records = this._myIndex.records; - var resultMap = {}; - var results = []; - records.forEach(function (_ref3) { - var item = _ref3.$, - idx = _ref3.i; - - if (isDefined(item)) { - var expResults = evaluate(expression, item, idx); - - if (expResults.length) { - // Dedupe when adding - if (!resultMap[idx]) { - resultMap[idx] = { - idx: idx, - item: item, - matches: [] - }; - results.push(resultMap[idx]); - } - - expResults.forEach(function (_ref4) { - var _resultMap$idx$matche; - - var matches = _ref4.matches; - - (_resultMap$idx$matche = resultMap[idx].matches).push.apply(_resultMap$idx$matche, _toConsumableArray(matches)); - }); - } - } - }); - return results; - } - }, { - key: "_searchObjectList", - value: function _searchObjectList(query) { - var _this2 = this; - - var searcher = createSearcher(query, this.options); - var _this$_myIndex = this._myIndex, - keys = _this$_myIndex.keys, - records = _this$_myIndex.records; - var results = []; // List is Array - - records.forEach(function (_ref5) { - var item = _ref5.$, - idx = _ref5.i; - - if (!isDefined(item)) { - return; - } - - var matches = []; // Iterate over every key (i.e, path), and fetch the value at that key - - keys.forEach(function (key, keyIndex) { - matches.push.apply(matches, _toConsumableArray(_this2._findMatches({ - key: key, - value: item[keyIndex], - searcher: searcher - }))); - }); - - if (matches.length) { - results.push({ - idx: idx, - item: item, - matches: matches - }); - } - }); - return results; - } - }, { - key: "_findMatches", - value: function _findMatches(_ref6) { - var key = _ref6.key, - value = _ref6.value, - searcher = _ref6.searcher; - - if (!isDefined(value)) { - return []; - } - - var matches = []; - - if (isArray(value)) { - value.forEach(function (_ref7) { - var text = _ref7.v, - idx = _ref7.i, - norm = _ref7.n; - - if (!isDefined(text)) { - return; - } - - var _searcher$searchIn2 = searcher.searchIn(text), - isMatch = _searcher$searchIn2.isMatch, - score = _searcher$searchIn2.score, - indices = _searcher$searchIn2.indices; - - if (isMatch) { - matches.push({ - score: score, - key: key, - value: text, - idx: idx, - norm: norm, - indices: indices - }); - } - }); - } else { - var text = value.v, - norm = value.n; - - var _searcher$searchIn3 = searcher.searchIn(text), - isMatch = _searcher$searchIn3.isMatch, - score = _searcher$searchIn3.score, - indices = _searcher$searchIn3.indices; - - if (isMatch) { - matches.push({ - score: score, - key: key, - value: text, - norm: norm, - indices: indices - }); - } - } - - return matches; - } - }]); - - return Fuse; - }(); - - Fuse.version = '6.4.6'; - Fuse.createIndex = createIndex; - Fuse.parseIndex = parseIndex; - Fuse.config = Config; - - { - Fuse.parseQuery = parse; - } - - { - register(ExtendedSearch); - } - - return Fuse; - -}))); +var e,t;e=this,t=function(){"use strict";function e(t){return(e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(t)}function t(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function n(e,t){for(var n=0;ne.length)&&(t=e.length);for(var n=0,r=new Array(t);n0&&void 0!==arguments[0]?arguments[0]:3,t=new Map,n=Math.pow(10,e);return{get:function(e){var r=e.match(w).length;if(t.has(r))return t.get(r);var i=1/Math.sqrt(r),o=parseFloat(Math.round(i*n)/n);return t.set(r,o),o},clear:function(){t.clear()}}}var _=function(){function e(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},r=n.getFn,i=void 0===r?x.getFn:r;t(this,e),this.norm=L(3),this.getFn=i,this.isCreated=!1,this.setIndexRecords()}return r(e,[{key:"setSources",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];this.docs=e}},{key:"setIndexRecords",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];this.records=e}},{key:"setKeys",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];this.keys=t,this._keysMap={},t.forEach((function(t,n){e._keysMap[t.id]=n}))}},{key:"create",value:function(){var e=this;!this.isCreated&&this.docs.length&&(this.isCreated=!0,u(this.docs[0])?this.docs.forEach((function(t,n){e._addString(t,n)})):this.docs.forEach((function(t,n){e._addObject(t,n)})),this.norm.clear())}},{key:"add",value:function(e){var t=this.size();u(e)?this._addString(e,t):this._addObject(e,t)}},{key:"removeAt",value:function(e){this.records.splice(e,1);for(var t=e,n=this.size();t2&&void 0!==arguments[2]?arguments[2]:{},r=n.getFn,i=void 0===r?x.getFn:r,o=new _({getFn:i});return o.setKeys(e.map(b)),o.setSources(t),o.create(),o}function O(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.errors,r=void 0===n?0:n,i=t.currentLocation,o=void 0===i?0:i,a=t.expectedLocation,c=void 0===a?0:a,s=t.distance,h=void 0===s?x.distance:s,u=t.ignoreLocation,l=void 0===u?x.ignoreLocation:u,d=r/e.length;if(l)return d;var f=Math.abs(c-o);return h?d+f/h:f?1:d}function A(){for(var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:x.minMatchCharLength,n=[],r=-1,i=-1,o=0,a=e.length;o=t&&n.push([r,i]),r=-1)}return e[o-1]&&o-r>=t&&n.push([r,o-1]),n}function j(e){for(var t={},n=0,r=e.length;n1&&void 0!==arguments[1]?arguments[1]:{},o=i.location,a=void 0===o?x.location:o,c=i.threshold,s=void 0===c?x.threshold:c,h=i.distance,u=void 0===h?x.distance:h,l=i.includeMatches,d=void 0===l?x.includeMatches:l,f=i.findAllMatches,v=void 0===f?x.findAllMatches:f,y=i.minMatchCharLength,g=void 0===y?x.minMatchCharLength:y,p=i.isCaseSensitive,m=void 0===p?x.isCaseSensitive:p,b=i.ignoreLocation,k=void 0===b?x.ignoreLocation:b;if(t(this,e),this.options={location:a,threshold:s,distance:u,includeMatches:d,findAllMatches:v,minMatchCharLength:g,isCaseSensitive:m,ignoreLocation:k},this.pattern=m?n:n.toLowerCase(),this.chunks=[],this.pattern.length){var M=function(e,t){r.chunks.push({pattern:e,alphabet:j(e),startIndex:t})},w=this.pattern.length;if(w>32){for(var L=0,_=w%32,S=w-_;L3&&void 0!==arguments[3]?arguments[3]:{},i=r.location,o=void 0===i?x.location:i,a=r.distance,c=void 0===a?x.distance:a,s=r.threshold,h=void 0===s?x.threshold:s,u=r.findAllMatches,l=void 0===u?x.findAllMatches:u,d=r.minMatchCharLength,f=void 0===d?x.minMatchCharLength:d,v=r.includeMatches,y=void 0===v?x.includeMatches:v,p=r.ignoreLocation,m=void 0===p?x.ignoreLocation:p;if(t.length>32)throw new Error(g(32));for(var b,k=t.length,M=e.length,w=Math.max(0,Math.min(o,M)),L=h,_=w,S=f>1||y,j=S?Array(M):[];(b=e.indexOf(t,_))>-1;){var E=O(t,{currentLocation:b,expectedLocation:w,distance:c,ignoreLocation:m});if(L=Math.min(E,L),_=b+k,S)for(var I=0;I=J;U-=1){var q=U-1,B=n[e.charAt(q)];if(S&&(j[q]=+!!B),T[U]=(T[U+1]<<1|1)&B,$&&(T[U]|=(C[U+1]|C[U])<<1|1|C[U+1]),T[U]&N&&(F=O(t,{errors:$,currentLocation:q,expectedLocation:w,distance:c,ignoreLocation:m}))<=L){if(L=F,(_=q)<=w)break;J=Math.max(1,2*w-_)}}var V=O(t,{errors:$+1,currentLocation:w,expectedLocation:w,distance:c,ignoreLocation:m});if(V>L)break;C=T}var G={isMatch:_>=0,score:Math.max(.001,F)};if(S){var H=A(j,f);H.length?y&&(G.indices=H):G.isMatch=!1}return G}(e,n,i,{location:a+o,distance:s,threshold:h,findAllMatches:u,minMatchCharLength:l,includeMatches:r,ignoreLocation:d}),m=p.isMatch,b=p.score,k=p.indices;m&&(y=!0),v+=b,m&&k&&(f=[].concat(c(f),c(k)))}));var p={isMatch:y,score:y?v/this.chunks.length:1};return y&&r&&(p.indices=f),p}}]),e}(),I=[];function C(e,t){for(var n=0,r=I.length;n-1&&(n.refIndex=e.idx),t.matches.push(n)}}))}function N(e,t){t.score=e.score}function $(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=n.includeMatches,i=void 0===r?x.includeMatches:r,o=n.includeScore,a=void 0===o?x.includeScore:o,c=[];return i&&c.push(P),a&&c.push(N),e.map((function(e){var n=e.idx,r={item:t[n],refIndex:n};return c.length&&c.forEach((function(t){t(e,r)})),r}))}var D=function(){function e(n){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},i=arguments.length>2?arguments[2]:void 0;if(t(this,e),this.options=a({},x,{},r),this.options.useExtendedSearch)throw new Error("Extended search is not available");this._keyStore=new m(this.options.keys),this.setCollection(n,i)}return r(e,[{key:"setCollection",value:function(e,t){if(this._docs=e,t&&!(t instanceof _))throw new Error("Incorrect 'index' type");this._myIndex=t||S(this.options.keys,this._docs,{getFn:this.options.getFn})}},{key:"add",value:function(e){f(e)&&(this._docs.push(e),this._myIndex.add(e))}},{key:"remove",value:function(){for(var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:function(){return!1},t=[],n=0,r=this._docs.length;n1&&void 0!==arguments[1]?arguments[1]:{},n=t.limit,r=void 0===n?-1:n,i=this.options,o=i.includeMatches,a=i.includeScore,c=i.shouldSort,s=i.sortFn,h=i.ignoreFieldNorm,d=u(e)?u(this._docs[0])?this._searchStringList(e):this._searchObjectList(e):this._searchLogical(e);return F(d,{ignoreFieldNorm:h}),c&&d.sort(s),l(r)&&r>-1&&(d=d.slice(0,r)),$(d,this._docs,{includeMatches:o,includeScore:a})}},{key:"_searchStringList",value:function(e){var t=C(e,this.options),n=this._myIndex.records,r=[];return n.forEach((function(e){var n=e.v,i=e.i,o=e.n;if(f(n)){var a=t.searchIn(n),c=a.isMatch,s=a.score,h=a.indices;c&&r.push({item:n,idx:i,matches:[{score:s,value:n,norm:o,indices:h}]})}})),r}},{key:"_searchLogical",value:function(e){throw new Error("Logical search is not available")}},{key:"_searchObjectList",value:function(e){var t=this,n=C(e,this.options),r=this._myIndex,i=r.keys,o=r.records,a=[];return o.forEach((function(e){var r=e.$,o=e.i;if(f(r)){var s=[];i.forEach((function(e,i){s.push.apply(s,c(t._findMatches({key:e,value:r[i],searcher:n})))})),s.length&&a.push({idx:o,item:r,matches:s})}})),a}},{key:"_findMatches",value:function(e){var t=e.key,n=e.value,r=e.searcher;if(!f(n))return[];var i=[];if(h(n))n.forEach((function(e){var n=e.v,o=e.i,a=e.n;if(f(n)){var c=r.searchIn(n),s=c.isMatch,h=c.score,u=c.indices;s&&i.push({score:h,key:t,value:n,idx:o,norm:a,indices:u})}}));else{var o=n.v,a=n.n,c=r.searchIn(o),s=c.isMatch,u=c.score,l=c.indices;s&&i.push({score:u,key:t,value:o,norm:a,indices:l})}return i}}]),e}();return D.version="6.4.6",D.createIndex=S,D.parseIndex=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.getFn,r=void 0===n?x.getFn:n,i=e.keys,o=e.records,a=new _({getFn:r});return a.setKeys(i),a.setIndexRecords(o),a},D.config=x,D},"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self).Fuse=t(); \ No newline at end of file From 624b1d0afb76652bc555f745612748dd80dbb6a4 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:54:34 +0530 Subject: [PATCH 225/669] trim whitespace before searching --- assets/js/fastsearch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/fastsearch.js b/assets/js/fastsearch.js index 3b7061a7..f2f50385 100644 --- a/assets/js/fastsearch.js +++ b/assets/js/fastsearch.js @@ -52,7 +52,7 @@ function activeToggle() { sInput.onkeyup = function (e) { // run a search query (for "term") every time a letter is typed // in the search box - const results = fuse.search(this.value); // the actual query being run using fuse.js + const results = fuse.search(this.value.trim()); // the actual query being run using fuse.js if (results.length !== 0) { // build our html if result exists From f64c44c8d2a19fd0ad833bea92033b0b13e3c276 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:56:09 +0530 Subject: [PATCH 226/669] tweak fuse opts -rm default opts, - add ignoreLocation (to search everywhere not just 1st 60 chars) - ref https://fusejs.io/concepts/scoring-theory.html#scoring-theory --- assets/js/fastsearch.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/js/fastsearch.js b/assets/js/fastsearch.js index f2f50385..935d8fbd 100644 --- a/assets/js/fastsearch.js +++ b/assets/js/fastsearch.js @@ -14,12 +14,9 @@ function loadSearch() { if (data) { // fuse.js options; check fuse.js website for details var options = { - isCaseSensitive: false, - shouldSort: true, - location: 0, distance: 100, threshold: 0.4, - minMatchCharLength: 0, + ignoreLocation: true, keys: [ 'title', 'permalink', From 6c79b99de8ce1ea14bc013b3c318aec743dac6e1 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 12:14:38 +0530 Subject: [PATCH 227/669] reserve space for scroll-bar --- assets/css/reset.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/css/reset.css b/assets/css/reset.css index 0f3d12fc..4b8e09f8 100644 --- a/assets/css/reset.css +++ b/assets/css/reset.css @@ -5,7 +5,8 @@ } html { - -webkit-tap-highlight-color: transparent + -webkit-tap-highlight-color: transparent; + overflow-y: scroll; } a, From 0c28a4ad5a41b0479cc1e517fbb609a3c4b73f67 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 12:50:16 +0530 Subject: [PATCH 228/669] introduce searchHidden front-matter var - to hide particular pages from search usage: in page's front-matter add searchHidden: true --- layouts/_default/index.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layouts/_default/index.json b/layouts/_default/index.json index deef3c9e..436f9e65 100644 --- a/layouts/_default/index.json +++ b/layouts/_default/index.json @@ -1,6 +1,7 @@ {{- $.Scratch.Add "index" slice -}} {{- range .Site.RegularPages -}} + {{- if not .Params.searchHidden }} {{- $.Scratch.Add "index" (dict "title" .Title "content" .Plain "permalink" .Permalink "summary" .Summary) -}} + {{- end }} {{- end -}} {{- $.Scratch.Get "index" | jsonify -}} - From c7b388346bc69498309d58f7b67422d9d7dc8021 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 12:53:14 +0530 Subject: [PATCH 229/669] hide archives and search page from being searched --- layouts/_default/index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/index.json b/layouts/_default/index.json index 436f9e65..2c86f7c4 100644 --- a/layouts/_default/index.json +++ b/layouts/_default/index.json @@ -1,6 +1,6 @@ {{- $.Scratch.Add "index" slice -}} {{- range .Site.RegularPages -}} - {{- if not .Params.searchHidden }} + {{- if and (not .Params.searchHidden) (ne .Layout `archives`) (ne .Layout `search`) }} {{- $.Scratch.Add "index" (dict "title" .Title "content" .Plain "permalink" .Permalink "summary" .Summary) -}} {{- end }} {{- end -}} From ebbeca4ab4066baaac2bfb9bcc60272dc0303344 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 31 Jan 2021 12:18:04 +0530 Subject: [PATCH 230/669] Revert "fix : footer height increase for mobile devices" This reverts commit f40842915ed7d56f9690777b4eefa04acd50c7dc. --- assets/css/footer.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/footer.css b/assets/css/footer.css index 11cc29a6..c51d1c45 100644 --- a/assets/css/footer.css +++ b/assets/css/footer.css @@ -7,7 +7,7 @@ .footer { max-width: calc(var(--main-width) + var(--gap) * 2); margin: auto; - padding: calc((var(--footer-height) - (var(--gap)) - 10px) / 2) var(--gap); + padding: calc((var(--footer-height) - var(--gap)) / 2) var(--gap); text-align: center; line-height: 24px } From f8781e2cc8437b9af29714e6bc96adbd2797374b Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 31 Jan 2021 17:05:40 +0530 Subject: [PATCH 231/669] Improve header - fix header height 61px->60px - check for elements before displaying - align theme-toggle - rm unnecessary elements - rm theme-toggle class - rm menu class --- assets/css/header.css | 27 ++++++++---- layouts/partials/header.html | 84 ++++++++++++++++++------------------ 2 files changed, 60 insertions(+), 51 deletions(-) diff --git a/assets/css/header.css b/assets/css/header.css index c5fcf9d4..ffba3699 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -13,7 +13,7 @@ } .logo, -.menu { +#menu { display: flex; margin: auto var(--gap); } @@ -25,7 +25,6 @@ .logo a { font-size: 24px; font-weight: 700; - margin-inline-end: 10px } .logo a img { @@ -37,9 +36,14 @@ margin-inline-end: 8px } -.theme-toggle svg { +#theme-toggle svg { height: 18px; +} + +a#theme-toggle { + font-size: 24px; user-select: none; + margin: auto 4px; cursor: pointer } @@ -52,22 +56,22 @@ body:not(.dark) #sun { display: none } -.menu { +#menu { list-style: none; word-break: keep-all; overflow-x: auto; white-space: nowrap } -.menu li+li { +#menu li+li { margin-inline-start: var(--gap) } -.menu a { +#menu a { font-size: 16px } -.menu .active { +#menu .active { font-weight: 500; border-bottom: 2px solid currentColor } @@ -75,13 +79,18 @@ body:not(.dark) #sun { .lang-switch li, .lang-switch ul, .logo-switches { - display: inline-flex + display: inline-flex; + margin: auto 4px; +} + +.lang-switch { + display: flex; + flex-wrap: inherit } .lang-switch a { font-size: 16px; font-weight: 500; - margin: 0 8px } .logo-switches { diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 51773ed8..d91cc6fe 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -50,6 +50,7 @@
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 9716ad14..658d79cc 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -31,24 +31,8 @@ {{- end }} {{- if not (.Param "hideMeta") }}
- {{- partial "post_meta.html" . -}} - {{- if .IsTranslated -}} - {{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) }} | {{- end -}} - - {{- end }} + {{- partial "post_meta.html" . -}} + {{- partial "translation_list.html" . -}}
{{- end}} diff --git a/layouts/partials/translation_list.html b/layouts/partials/translation_list.html new file mode 100644 index 00000000..a2c2d86c --- /dev/null +++ b/layouts/partials/translation_list.html @@ -0,0 +1,19 @@ +{{- if .IsTranslated -}} +{{- if (ne .Layout "search")}} +{{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) }} | {{- end -}} +{{- end }} + +{{- end }} From e03348c041bc8c5c6399d2299a4a63dc93473aa0 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 7 Feb 2021 21:34:34 +0530 Subject: [PATCH 236/669] improve search - fix menu element becoming inactive change class active -> focus - set input type seach #198 - add a reset func - add script to clear searchbox when clicked on X sign --- assets/css/search.css | 2 +- assets/js/fastsearch.js | 39 ++++++++++++++++++++++-------------- layouts/_default/search.html | 4 ++-- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/assets/css/search.css b/assets/css/search.css index 5deb71ed..2b9d4bc9 100644 --- a/assets/css/search.css +++ b/assets/css/search.css @@ -39,7 +39,7 @@ outline: none; } -#searchResults .active { +#searchResults .focus { transform: scale(.98); border: 2px solid var(--tertiary) } diff --git a/assets/js/fastsearch.js b/assets/js/fastsearch.js index 935d8fbd..2546310a 100644 --- a/assets/js/fastsearch.js +++ b/assets/js/fastsearch.js @@ -42,7 +42,13 @@ function itemGen(name, link) { } function activeToggle() { - document.activeElement.parentElement.classList.toggle("active") + document.activeElement.parentElement.classList.toggle("focus") +} + +function reset() { + resultsAvailable = false; + resList.innerHTML = sInput.value = ''; // clear inputbox and searchResults + sInput.focus(); // shift focus to input box } // execute search as each character is typed @@ -59,16 +65,21 @@ sInput.onkeyup = function (e) { resultSet = resultSet + itemGen(results[item].item.title, results[item].item.permalink) } - document.getElementById("searchResults").innerHTML = resultSet; + resList.innerHTML = resultSet; resultsAvailable = true; first = resList.firstChild; last = resList.lastChild; } else { resultsAvailable = false; - document.getElementById("searchResults").innerHTML = ''; + resList.innerHTML = ''; } } +sInput.addEventListener('search', function (e) { + // clicked on x + if (!this.value) reset() +}) + // kb bindings document.onkeydown = function (e) { let key = e.key; @@ -76,9 +87,9 @@ document.onkeydown = function (e) { let inbox = document.getElementById("searchbox").contains(ae) if (ae === sInput) { - var elements = document.getElementsByClassName('active'); + var elements = document.getElementsByClassName('focus'); while (elements.length > 0) { - elements[0].classList.remove('active'); + elements[0].classList.remove('focus'); } } @@ -86,16 +97,16 @@ document.onkeydown = function (e) { e.preventDefault(); if (ae == sInput) { // if the currently focused element is the search input, focus the of first
  • - activeToggle(); // rm active class + activeToggle(); // rm focus class resList.firstChild.lastChild.focus(); - activeToggle(); // add active class + activeToggle(); // add focus class } else if (ae.parentElement == last) { // if the currently focused element's parent is last, do nothing } else { // otherwise select the next search result - activeToggle(); // rm active class + activeToggle(); // rm focus class ae.parentElement.nextSibling.lastChild.focus(); - activeToggle(); // add active class + activeToggle(); // add focus class } } else if (key === "ArrowUp" && resultsAvailable && inbox) { e.preventDefault(); @@ -103,19 +114,17 @@ document.onkeydown = function (e) { // if the currently focused element is input box, do nothing } else if (ae.parentElement == first) { // if the currently focused element is first item, go to input box - activeToggle(); // rm active class + activeToggle(); // rm focus class sInput.focus(); } else { // otherwise select the previous search result - activeToggle(); // rm active class + activeToggle(); // rm focus class ae.parentElement.previousSibling.lastChild.focus(); - activeToggle(); // add active class + activeToggle(); // add focus class } } else if (key === "ArrowRight" && resultsAvailable && inbox) { ae.click(); // click on active link } else if (key === "Escape") { - resultsAvailable = false; - resList.innerHTML = sInput.value = ''; // clear inputbox and searchResults - sInput.focus(); // shift focus to input box + reset() } } diff --git a/layouts/_default/search.html b/layouts/_default/search.html index 8ad0bef4..ae9ba068 100644 --- a/layouts/_default/search.html +++ b/layouts/_default/search.html @@ -21,8 +21,8 @@ -{{- end }}{{/* end main */}} +{{- end }}{{/* end main */}} 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 237/669] 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 658d79cc..ca054336 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 238/669] 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 ca054336..3673ea63 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 00000000..55320892 --- /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 239/669] 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 9518ebf5..30b1527b 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 240/669] 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 30b1527b..bf87ef90 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -16,6 +16,10 @@
    {{- 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 @@ {{- 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 241/669] 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 bf87ef90..ab98c958 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -16,10 +16,6 @@

    {{- 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 @@ {{- 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 242/669] 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 55320892..71ce58a2 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 243/669] 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 910e98ce..beaf5bd6 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 4b8e09f8..ee8e77bd 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 d91cc6fe..301367c4 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 244/669] 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 301367c4..00953ec0 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 267/669] 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 16a6c12e..b4307e2f 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 268/669] 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 b70aa60e..14133f0c 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 269/669] 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 0cdd189a..f0e4bd03 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 270/669] 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 00000000..4ad7682b --- /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 00000000..a69b8ce8 --- /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 271/669] 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 120f9981..11f50a2c 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 272/669] 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 14133f0c..d69ee62d 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 273/669] 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 d69ee62d..6f63a6df 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 274/669] 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 66412775..fcb53301 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 28689422..117ce7b0 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 00000000..21a33eb5 --- /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 275/669] 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 df5170b6..6e0a289c 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 276/669] 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 c0a647df..9c2b8a59 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 277/669] 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 f0e4bd03..23f25885 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 }} +
    • {{- 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 }}
      - {{- i18n "translations" | default "Translations"}}: + {{- i18n "translations" | default "Translations" }}: {{- range .Translations }}
    • @@ -16,4 +16,4 @@
      • {{- 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 293/669] 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 e3795331..3713b96d 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 294/669] 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 3713b96d..45c11fd7 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 295/669] 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 a57c22d1..6c31a49e 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 321/669] 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 b4307e2f..1d31b621 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 322/669] 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 2c6511b8..aa4c0561 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 }} -
    - {{- $isHidden := .Params.cover.hidden | default site.Params.cover.hiddenInSingle | default site.Params.cover.hidden }} + {{- $isHidden := (.Param "cover.hiddenInSingle") | default (.Param "cover.hidden") | default false }} {{- partial "cover.html" (dict "cxt" . "IsHome" false "isHidden" $isHidden) }} {{- if (.Param "ShowToc") }} {{- partial "toc.html" . }} From e0fc64c43e8f170c50c58907d3074e563f55399c Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 10 Dec 2023 12:36:05 +0530 Subject: [PATCH 643/669] Optimize footer margins --- assets/css/common/post-single.css | 24 +++--- assets/css/core/zmedia.css | 6 ++ layouts/partials/share_icons.html | 118 +++++++++++++++++------------- 3 files changed, 87 insertions(+), 61 deletions(-) diff --git a/assets/css/common/post-single.css b/assets/css/common/post-single.css index 47b9888c..14dc701b 100644 --- a/assets/css/common/post-single.css +++ b/assets/css/common/post-single.css @@ -296,10 +296,18 @@ margin-top: 56px; } +.post-footer>* { + margin-bottom: 10px; +} + +.post-tags { + display: flex; + flex-wrap: wrap; + gap: 10px; +} + .post-tags li { display: inline-block; - margin-inline-end: 3px; - margin-bottom: 5px; } .post-tags a, @@ -312,8 +320,7 @@ .post-tags a { display: block; - padding-inline-start: 14px; - padding-inline-end: 14px; + padding: 0 14px; color: var(--secondary); font-size: 14px; line-height: 34px; @@ -326,15 +333,16 @@ } .share-buttons { - margin: 14px 0; - padding-inline-start: var(--radius); + padding: 10px; display: flex; justify-content: center; overflow-x: auto; + gap: 10px; } +.share-buttons li, .share-buttons a { - margin-top: 10px; + display: inline-flex; } .share-buttons a:not(:last-of-type) { @@ -355,10 +363,8 @@ h6:hover .anchor { } .paginav { - margin: 10px 0; display: flex; line-height: 30px; - border-radius: var(--radius); } .paginav a { diff --git a/assets/css/core/zmedia.css b/assets/css/core/zmedia.css index 210d4863..a68fd718 100644 --- a/assets/css/core/zmedia.css +++ b/assets/css/core/zmedia.css @@ -36,6 +36,12 @@ } } +@media screen and (max-width: 340px) { + .share-buttons { + justify-content: unset; + } +} + @media (prefers-reduced-motion) { /* terms; profile-mode; post-single; post-entry; post-entry; search; search */ .terms-tags a:active, diff --git a/layouts/partials/share_icons.html b/layouts/partials/share_icons.html index 4ae18791..910ba7f1 100644 --- a/layouts/partials/share_icons.html +++ b/layouts/partials/share_icons.html @@ -13,69 +13,83 @@ {{- $ShareButtons := (.Param "ShareButtons")}} {{- with $ShareButtons }}{{ $custom = true }}{{ end }} - + From 2ecb08a5bac9723f264a1ee767494d2599a15aa3 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:08:25 +0530 Subject: [PATCH 644/669] Plainify items insize toc list --- layouts/partials/toc.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html index d9b8b234..28f8694c 100644 --- a/layouts/partials/toc.html +++ b/layouts/partials/toc.html @@ -71,10 +71,10 @@ {{- end -}} {{- end }}
  • - {{- $header | safeHTML -}} + {{- $header | plainify | safeHTML -}} {{- else }}
  • - {{- $header | safeHTML -}} + {{- $header | plainify | safeHTML -}} {{- end -}} {{- end -}} From 6864770ad4dd67fe381e143ca48bdd81c38835ce Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:09:15 +0530 Subject: [PATCH 645/669] Fix social icons extraneous margin --- assets/css/common/main.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/assets/css/common/main.css b/assets/css/common/main.css index 50022ac1..cd5c76fb 100644 --- a/assets/css/common/main.css +++ b/assets/css/common/main.css @@ -28,14 +28,12 @@ } .social-icons { - padding: 12px 0; -} - -.social-icons a:not(:last-of-type) { - margin-inline-end: 12px; + display: flex; + gap: 1rem; } .social-icons a svg { + display: block; height: 26px; width: 26px; } From 705ebeb72982dca772d2307cf3936710866dae99 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:09:48 +0530 Subject: [PATCH 646/669] table styles update - reduce margins - rm reduced fontsize --- assets/css/common/post-single.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/assets/css/common/post-single.css b/assets/css/common/post-single.css index 14dc701b..7e40eea1 100644 --- a/assets/css/common/post-single.css +++ b/assets/css/common/post-single.css @@ -130,19 +130,18 @@ } .post-content table { - margin-bottom: 32px; + margin-bottom: var(--content-gap); } .post-content table th, .post-content table:not(.highlighttable, .highlight table, .gist .highlight) td { min-width: 80px; - padding: 12px 8px; + padding: 8px 5px; line-height: 1.5; border-bottom: 1px solid var(--border); } .post-content table th { - font-size: 14px; text-align: start; } From 28ec7a407d5c44789d6f608419dc147692a00327 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 16 Dec 2023 00:32:25 +0530 Subject: [PATCH 647/669] Revert "Fix social icons extraneous margin" This reverts commit 6864770ad4dd67fe381e143ca48bdd81c38835ce. --- assets/css/common/main.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/css/common/main.css b/assets/css/common/main.css index cd5c76fb..50022ac1 100644 --- a/assets/css/common/main.css +++ b/assets/css/common/main.css @@ -28,12 +28,14 @@ } .social-icons { - display: flex; - gap: 1rem; + padding: 12px 0; +} + +.social-icons a:not(:last-of-type) { + margin-inline-end: 12px; } .social-icons a svg { - display: block; height: 26px; width: 26px; } From 65c2720ab99368c2125fa39ed1433e0677683b75 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 16 Dec 2023 13:09:19 +0530 Subject: [PATCH 648/669] lazy load cover images in lists only --- layouts/_default/list.html | 2 +- layouts/_default/single.html | 2 +- layouts/partials/cover.html | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 833f9239..2640f164 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -65,7 +65,7 @@
    {{- $isHidden := (.Param "cover.hiddenInList") | default (.Param "cover.hidden") | default false }} - {{- partial "cover.html" (dict "cxt" . "IsHome" true "isHidden" $isHidden) }} + {{- partial "cover.html" (dict "cxt" . "IsSingle" false "isHidden" $isHidden) }}

    {{- .Title }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index ee0fec43..837f6197 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -22,7 +22,7 @@ {{- end }}

    {{- $isHidden := (.Param "cover.hiddenInSingle") | default (.Param "cover.hidden") | default false }} - {{- partial "cover.html" (dict "cxt" . "IsHome" false "isHidden" $isHidden) }} + {{- partial "cover.html" (dict "cxt" . "IsSingle" true "isHidden" $isHidden) }} {{- if (.Param "ShowToc") }} {{- partial "toc.html" . }} {{- end }} diff --git a/layouts/partials/cover.html b/layouts/partials/cover.html index 0f8bfbce..e92b5557 100644 --- a/layouts/partials/cover.html +++ b/layouts/partials/cover.html @@ -1,9 +1,10 @@ {{- with .cxt}} {{/* Apply proper context from dict */}} {{- if (and .Params.cover.image (not $.isHidden)) }} {{- $alt := (.Params.cover.alt | default .Params.cover.caption | plainify) }} +{{- $loading := cond $.IsSingle "eager" "lazy" }}
    {{- $responsiveImages := (.Params.cover.responsiveImages | default site.Params.cover.responsiveImages) | default true }} - {{- $addLink := (and site.Params.cover.linkFullImages (not $.IsHome)) }} + {{- $addLink := (and site.Params.cover.linkFullImages $.IsSingle) }} {{- $pageBundleCover := (.Resources.ByType "image").GetMatch (printf "*%s*" (.Params.cover.image)) }} {{- $globalResourcesCover := (resources.ByType "image").GetMatch (printf "*%s*" (.Params.cover.image)) }} {{- $cover := (or $pageBundleCover $globalResourcesCover)}} @@ -17,7 +18,7 @@ {{- end -}} {{- $prod := (hugo.IsProduction | or (eq site.Params.env "production")) }} {{- if (and (in $processableFormats $cover.MediaType.SubType) ($responsiveImages) (eq $prod true)) }} - {{ $alt }} {{- else }}{{/* Unprocessable image or responsive images disabled */}} - {{ $alt }} + {{ $alt }} {{- end }} {{- else }}{{/* For absolute urls and external links, no img processing here */}} {{- if $addLink }}{{ end -}} - {{ $alt }} + {{ $alt }} {{- end }} {{- if $addLink }}{{ end -}} {{/* Display Caption */}} - {{- if not $.IsHome }} + {{- if $.IsSingle }} {{ with .Params.cover.caption }}

    {{ . | markdownify }}

    {{- end }} {{- end }}
    From 60984fd13658db175e8945467d3dd799f2fdcc32 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 16 Dec 2023 14:06:46 +0530 Subject: [PATCH 649/669] Add icon for 'draft' posts https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Aedit_note%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048 LICENSE: https://developers.google.com/fonts/faq#can_i_use_any_font_in_a_commercial_product --- assets/css/common/post-entry.css | 10 +++++++--- layouts/_default/archives.html | 13 ++++++++++--- layouts/_default/list.html | 11 +++++++++-- layouts/_default/single.html | 11 +++++++++-- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/assets/css/common/post-entry.css b/assets/css/common/post-entry.css index 885aa2a4..c3cba370 100644 --- a/assets/css/common/post-entry.css +++ b/assets/css/common/post-entry.css @@ -80,13 +80,17 @@ bottom: 0; } -.entry-cover, -.entry-isdraft { - font-size: 14px; +.entry-hint { color: var(--secondary); } +.entry-hint-parent { + display: flex; + justify-content: space-between; +} + .entry-cover { + font-size: 14px; margin-bottom: var(--gap); text-align: center; } diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index d2c4d76b..b38e39a1 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -6,7 +6,7 @@ {{- if (.Param "ShowRssButtonInSectionTermList") }} {{- $rss := (.OutputFormats.Get "rss") }} {{- if (eq .Kind `page`) }} - {{- $rss = (.Parent.OutputFormats.Get "rss") }} + {{- $rss = (.Parent.OutputFormats.Get "rss") }} {{- end }} {{- with $rss }} @@ -46,9 +46,16 @@ {{- range .Pages }} {{- if eq .Kind "page" }}
    -

    +

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

    {{- partial "post_meta.html" . -}} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 2640f164..81aea6e4 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -67,9 +67,16 @@ {{- $isHidden := (.Param "cover.hiddenInList") | default (.Param "cover.hidden") | default false }} {{- partial "cover.html" (dict "cxt" . "IsSingle" false "isHidden" $isHidden) }}
    -

    +

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

    {{- if (ne (.Param "hideSummary") true) }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 837f6197..19a624f4 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -3,9 +3,16 @@
    {{ partial "breadcrumbs.html" . }} -

    +

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

    {{- if .Description }}
    From 86362ebd72776c78c1c30e660ceb903d235f493d Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 16 Dec 2023 19:28:05 +0530 Subject: [PATCH 650/669] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7a80ccab..14b0bf91 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

    ☄️ Fast | ☁️ Fluent | 🌙 Smooth | 📱 Responsive


    -> Hugo PaperMod is a theme based on [hugo-paper](https://github.com/nanxiaobei/hugo-paper/tree/4330c8b12aa48bfdecbcad6ad66145f679a430b3). +> Hugo PaperMod is a theme based on [hugo-paper](https://github.com/nanxiaobei/hugo-paper/tree/4330c8b12aa48bfdecbcad6ad66145f679a430b3).
    > The goal of this project is to add more features and customization to the og theme. **Documentation** can be found here: [**📚 Wiki**](https://github.com/adityatelange/hugo-PaperMod/wiki) @@ -11,10 +11,12 @@ **ExampleSite** can be found here: [**exampleSite**](https://github.com/adityatelange/hugo-PaperMod/tree/exampleSite). Demo is built up with [exampleSite](https://github.com/adityatelange/hugo-PaperMod/tree/exampleSite) as source. [![hugo-papermod](https://img.shields.io/badge/Hugo--Themes-@PaperMod-blue)](https://themes.gohugo.io/themes/hugo-papermod/) -[![Minimum Hugo Version](https://img.shields.io/static/v1?label=HUGO-version&message=>0.97.1&color=blue&logo=hugo)](https://github.com/gohugoio/hugo/releases/tag/v0.97.1) +[![Minimum Hugo Version](https://img.shields.io/static/v1?label=min-HUGO-version&message=>=0.97.1&color=blue&logo=hugo)](https://github.com/gohugoio/hugo/releases/tag/v0.97.1) [![Discord](https://img.shields.io/discord/971046860317921340?label=Discord&logo=discord)](https://discord.gg/ahpmTvhVmp) [![GitHub](https://img.shields.io/github/license/adityatelange/hugo-PaperMod)](https://github.com/adityatelange/hugo-PaperMod/blob/master/LICENSE) ![code-size](https://img.shields.io/github/languages/code-size/adityatelange/hugo-PaperMod) +[![X (formerly Twitter) URL](https://img.shields.io/badge/-Share%20on%20X-gray?style=flat&logo=x)](https://x.com/intent/tweet/?text=Checkout%20Hugo%20PaperMod%20%E2%9C%A8%0AA%20fast,%20clean,%20responsive%20Hugo%20theme.&url=https://github.com/adityatelange/hugo-PaperMod&hashtags=Hugo,PaperMod) + --- From 102e089bc3c1cf30a0f5b204c0182e0ce72b6880 Mon Sep 17 00:00:00 2001 From: Razon Yang Date: Sat, 4 Nov 2023 15:01:23 +0530 Subject: [PATCH 651/669] [PATCH] tpl/embedded: Make Open Graph's series optional cherry-picked from https://github.com/gohugoio/hugo/commit/b82b547acb404cdb883154cc4991137d46caa22a --- layouts/partials/templates/opengraph.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/layouts/partials/templates/opengraph.html b/layouts/partials/templates/opengraph.html index 9e8df143..631dda14 100644 --- a/layouts/partials/templates/opengraph.html +++ b/layouts/partials/templates/opengraph.html @@ -41,12 +41,14 @@ {{- /* If it is part of a series, link to related articles */}} {{- $permalink := .Permalink }} {{- $siteSeries := site.Taxonomies.series }} +{{- if $siteSeries }} {{ 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 }} +{{- end }} {{- /* Facebook Page Admin ID for Domain Insights */}} {{- with site.Social.facebook_admin }}{{ end }} From 3fb112bc851ae88d7457300a262c7a30a7522454 Mon Sep 17 00:00:00 2001 From: Joe Mooring Date: Sat, 4 Nov 2023 15:05:42 +0530 Subject: [PATCH 652/669] [PATCH] tpl/tplimpl: Deprecate .Site.Social usage with internal templates cherry-picked from https://github.com/gohugoio/hugo/commit/4910312ee75a1c67fad68c259ad9576dca854c62 --- layouts/partials/templates/opengraph.html | 13 ++++++++++++- layouts/partials/templates/twitter_cards.html | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/layouts/partials/templates/opengraph.html b/layouts/partials/templates/opengraph.html index 631dda14..b7fe84c7 100644 --- a/layouts/partials/templates/opengraph.html +++ b/layouts/partials/templates/opengraph.html @@ -50,5 +50,16 @@ {{ end }}{{ end }} {{- end }} +{{- /* Deprecate site.Social.facebook_admin in favor of site.Params.social.facebook_admin */}} +{{- $facebookAdmin := "" }} +{{- with site.Params.social.facebook_admin }} + {{- $facebookAdmin = . }} +{{- else }} + {{- with site.Social.facebook_admin }} + {{- $facebookAdmin = . }} + {{- warnf "The social key in site configuration is deprecated. Use params.social.facebook_admin instead." }} + {{- end }} +{{- end }} + {{- /* Facebook Page Admin ID for Domain Insights */}} -{{- with site.Social.facebook_admin }}{{ end }} +{{ with $facebookAdmin }}{{ end }} diff --git a/layouts/partials/templates/twitter_cards.html b/layouts/partials/templates/twitter_cards.html index bd46e376..bdb59239 100644 --- a/layouts/partials/templates/twitter_cards.html +++ b/layouts/partials/templates/twitter_cards.html @@ -28,6 +28,17 @@ {{- end }} -{{ with site.Social.twitter -}} +{{- /* Deprecate site.Social.twitter in favor of site.Params.social.twitter */}} +{{- $twitterSite := "" }} +{{- with site.Params.social.twitter }} + {{- $twitterSite = . }} +{{- else }} + {{- with site.Social.twitter }} + {{- $twitterSite = . }} + {{- warnf "The social key in site configuration is deprecated. Use params.social.twitter instead." }} + {{- end }} +{{- end }} + +{{- with $twitterSite }} -{{ end -}} +{{- end }} From 87df659c185b91ab09f8eb978b3aab5945b0f8b5 Mon Sep 17 00:00:00 2001 From: Joe Mooring Date: Sat, 4 Nov 2023 15:08:01 +0530 Subject: [PATCH 653/669] [PATCH] tpl/tplimpl: Fix deprecation logic in embedded templates cherry-picked from https://github.com/gohugoio/hugo/commit/cb98e9061b3d62b6f1e635a6cf9a8be57dc3f56c --- layouts/partials/templates/opengraph.html | 6 ++++-- layouts/partials/templates/twitter_cards.html | 12 +++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/layouts/partials/templates/opengraph.html b/layouts/partials/templates/opengraph.html index b7fe84c7..38fbd246 100644 --- a/layouts/partials/templates/opengraph.html +++ b/layouts/partials/templates/opengraph.html @@ -52,8 +52,10 @@ {{- /* Deprecate site.Social.facebook_admin in favor of site.Params.social.facebook_admin */}} {{- $facebookAdmin := "" }} -{{- with site.Params.social.facebook_admin }} - {{- $facebookAdmin = . }} +{{- with site.Params.social }} + {{- if reflect.IsMap . }} + {{- $facebookAdmin = .facebook_admin }} + {{- end }} {{- else }} {{- with site.Social.facebook_admin }} {{- $facebookAdmin = . }} diff --git a/layouts/partials/templates/twitter_cards.html b/layouts/partials/templates/twitter_cards.html index bdb59239..0e7760aa 100644 --- a/layouts/partials/templates/twitter_cards.html +++ b/layouts/partials/templates/twitter_cards.html @@ -30,8 +30,10 @@ {{- /* Deprecate site.Social.twitter in favor of site.Params.social.twitter */}} {{- $twitterSite := "" }} -{{- with site.Params.social.twitter }} - {{- $twitterSite = . }} +{{- with site.Params.social }} + {{- if reflect.IsMap . }} + {{- $twitterSite = .twitter }} + {{- end }} {{- else }} {{- with site.Social.twitter }} {{- $twitterSite = . }} @@ -40,5 +42,9 @@ {{- end }} {{- with $twitterSite }} - + {{- $content := . }} + {{- if not (strings.HasPrefix . "@") }} + {{- $content = printf "@%v" $twitterSite }} + {{- end }} + {{- end }} From cf62fa3c40ea9a2527b5081db699e28c0e391985 Mon Sep 17 00:00:00 2001 From: Joe Mooring Date: Sat, 4 Nov 2023 15:19:28 +0530 Subject: [PATCH 654/669] [PATCH] tpl/tplimpl: Use .Language.LanguageCode in built-in templates cherry-pick from https://github.com/gohugoio/hugo/commit/ff77a927f9c032f5a65eff2daf1f7f8c04103711 --- layouts/_default/rss.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 44f14986..db57edac 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -23,8 +23,8 @@ {{ index . 0 | absURL }} {{- end }} - Hugo -- gohugo.io{{ with site.LanguageCode }} - {{.}}{{end}}{{ with site.Author.email }} + Hugo -- gohugo.io + {{ site.Language.LanguageCode }}{{ with site.Author.email }} {{.}}{{ with site.Author.name }} ({{.}}){{end}}{{end}}{{ with site.Author.email }} {{.}}{{ with site.Author.name }} ({{.}}){{end}}{{end}}{{ with site.Copyright }} {{.}}{{end}}{{ if not .Date.IsZero }} From 00488d01463fc8c8db9fbda3f6060a0b5b373464 Mon Sep 17 00:00:00 2001 From: Joe Mooring Date: Sat, 4 Nov 2023 15:23:31 +0530 Subject: [PATCH 655/669] [PATCH] tpl/tplimpl: Deprecate .Site.Author usage in RSS template cherry-pick from https://github.com/gohugoio/hugo/commit/d4016dd5cd57a27f19a5472c6031d156066860b7 --- layouts/_default/rss.xml | 68 ++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index db57edac..22b2e6ed 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -1,21 +1,43 @@ -{{- $pctx := . -}} -{{- if .IsHome -}}{{ $pctx = site }}{{- end -}} -{{- $pages := slice -}} -{{- if or $.IsHome $.IsSection -}} -{{- $pages = $pctx.RegularPages -}} -{{- else -}} -{{- $pages = $pctx.Pages -}} -{{- end -}} -{{- $limit := site.Config.Services.RSS.Limit -}} -{{- if ge $limit 1 -}} -{{- $pages = $pages | first $limit -}} -{{- end -}} +{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}} +{{- $authorEmail := "" }} +{{- with site.Params.author.email }} + {{- $authorEmail = . }} +{{- else }} + {{- with site.Author.email }} + {{- $authorEmail = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }} + {{- end }} +{{- end }} + +{{- /* Deprecate site.Author.name in favor of site.Params.author.name */}} +{{- $authorName := "" }} +{{- with site.Params.author.name }} + {{- $authorName = . }} +{{- else }} + {{- with site.Author.name }} + {{- $authorName = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }} + {{- end }} +{{- end }} + +{{- $pctx := . }} +{{- if .IsHome }}{{ $pctx = .Site }}{{ end }} +{{- $pages := slice }} +{{- if or $.IsHome $.IsSection }} +{{- $pages = $pctx.RegularPages }} +{{- else }} +{{- $pages = $pctx.Pages }} +{{- end }} +{{- $limit := .Site.Config.Services.RSS.Limit }} +{{- if ge $limit 1 }} +{{- $pages = $pages | first $limit }} +{{- end }} {{- printf "" | safeHTML }} - + - {{ if eq .Title site.Title }}{{ site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ site.Title }}{{ end }} + {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} on {{ end }}{{ .Site.Title }}{{ end }} {{ .Permalink }} - Recent content {{ if ne .Title site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ site.Title }} + Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{ . }} {{ end }}{{ end }}on {{ .Site.Title }} {{- with site.Params.images }} {{ site.Title }} @@ -24,21 +46,21 @@ {{- end }} Hugo -- gohugo.io - {{ site.Language.LanguageCode }}{{ with site.Author.email }} - {{.}}{{ with site.Author.name }} ({{.}}){{end}}{{end}}{{ with site.Author.email }} - {{.}}{{ with site.Author.name }} ({{.}}){{end}}{{end}}{{ with site.Copyright }} - {{.}}{{end}}{{ if not .Date.IsZero }} + {{ site.Language.LanguageCode }}{{ with $authorEmail }} + {{.}}{{ with $authorName }} ({{ . }}){{ end }}{{ end }}{{ with $authorEmail }} + {{ . }}{{ with $authorName }} ({{ . }}){{ end }}{{ end }}{{ with .Site.Copyright }} + {{ . }}{{ end }}{{ if not .Date.IsZero }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} - {{- with .OutputFormats.Get "RSS" -}} + {{- with .OutputFormats.Get "RSS" }} {{ printf "" .Permalink .MediaType | safeHTML }} - {{- end -}} - {{ range $pages }} + {{- end }} + {{- range $pages }} {{- if and (ne .Layout `search`) (ne .Layout `archives`) }} {{ .Title }} {{ .Permalink }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with site.Author.email }}{{.}}{{ with site.Author.name }} ({{.}}){{end}}{{end}} + {{- with $authorEmail }}{{ . }}{{ with $authorName }} ({{ . }}){{ end }}{{ end }} {{ .Permalink }} {{ with .Description | html }}{{ . }}{{ else }}{{ .Summary | html }}{{ end -}} {{- if site.Params.ShowFullTextinRSS }} From ff7443b17f597e2307a590c805e39df1d935ebc6 Mon Sep 17 00:00:00 2001 From: Joe Mooring Date: Sat, 4 Nov 2023 15:34:56 +0530 Subject: [PATCH 656/669] [PATCH] tpl/tplimpl: Fix deprecation logic in RSS template cherry-pick from https://github.com/gohugoio/hugo/commit/23fcfb7f741a417f53a8ef4997bb68e64631df01 --- layouts/_default/rss.xml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 22b2e6ed..3b28fbf6 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -1,7 +1,11 @@ {{- /* Deprecate site.Author.email in favor of site.Params.author.email */}} {{- $authorEmail := "" }} -{{- with site.Params.author.email }} - {{- $authorEmail = . }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .email }} + {{- $authorEmail = . }} + {{- end }} + {{- end }} {{- else }} {{- with site.Author.email }} {{- $authorEmail = . }} @@ -11,8 +15,14 @@ {{- /* Deprecate site.Author.name in favor of site.Params.author.name */}} {{- $authorName := "" }} -{{- with site.Params.author.name }} - {{- $authorName = . }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .name }} + {{- $authorName = . }} + {{- end }} + {{- else }} + {{- $authorName = . }} + {{- end }} {{- else }} {{- with site.Author.name }} {{- $authorName = . }} From f51ad4981904a9cb0ad9729b6d204532fef4371d Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 4 Nov 2023 15:36:08 +0530 Subject: [PATCH 657/669] replace .Site with site & fix whitespace --- layouts/_default/rss.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 3b28fbf6..b6a7ec06 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -31,23 +31,23 @@ {{- end }} {{- $pctx := . }} -{{- if .IsHome }}{{ $pctx = .Site }}{{ end }} +{{- if .IsHome }}{{ $pctx = site }}{{ end }} {{- $pages := slice }} {{- if or $.IsHome $.IsSection }} {{- $pages = $pctx.RegularPages }} {{- else }} {{- $pages = $pctx.Pages }} {{- end }} -{{- $limit := .Site.Config.Services.RSS.Limit }} +{{- $limit := site.Config.Services.RSS.Limit }} {{- if ge $limit 1 }} {{- $pages = $pages | first $limit }} {{- end }} {{- printf "" | safeHTML }} - {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} on {{ end }}{{ .Site.Title }}{{ end }} + {{ if eq .Title site.Title }}{{ site.Title }}{{ else }}{{ with .Title }}{{ . }} on {{ end }}{{ site.Title }}{{ end }} {{ .Permalink }} - Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{ . }} {{ end }}{{ end }}on {{ .Site.Title }} + Recent content {{ if ne .Title site.Title }}{{ with .Title }}in {{ . }} {{ end }}{{ end }}on {{ site.Title }} {{- with site.Params.images }} {{ site.Title }} @@ -58,7 +58,7 @@ Hugo -- gohugo.io {{ site.Language.LanguageCode }}{{ with $authorEmail }} {{.}}{{ with $authorName }} ({{ . }}){{ end }}{{ end }}{{ with $authorEmail }} - {{ . }}{{ with $authorName }} ({{ . }}){{ end }}{{ end }}{{ with .Site.Copyright }} + {{ . }}{{ with $authorName }} ({{ . }}){{ end }}{{ end }}{{ with site.Copyright }} {{ . }}{{ end }}{{ if not .Date.IsZero }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} {{- with .OutputFormats.Get "RSS" }} @@ -78,6 +78,6 @@ {{- end }} {{- end }} - {{ end }} + {{- end }} From e3ad0aeb705409639a4a4d860075a2924e00eb23 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 16 Dec 2023 19:59:55 +0530 Subject: [PATCH 658/669] Bump minimum Hugo version to 0.112.4 * language.LanguageCode is required for Fix/hugo depr 0.120.x #1328 --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/workflows/gh-pages.yml | 4 ++-- README.md | 2 +- layouts/_default/baseof.html | 4 ++-- theme.toml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b7d5b289..d88b750f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,7 +26,7 @@ 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.97.1 expected]: + - Hugo Version [ >=0.112.4 expected]: - Theme Version [e.g. v4.0, master, or commit-id ]: **Steps to reproduce the behavior:** diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index c7b8351a..f4acb7e0 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -15,7 +15,7 @@ on: hugoVersion: description: "Hugo Version" required: false - default: "0.97.1" + default: "0.112.4" # Allow one concurrent deployment concurrency: @@ -38,7 +38,7 @@ jobs: build: runs-on: ubuntu-latest env: - HUGO_VERSION: "0.97.1" + HUGO_VERSION: "0.112.4" steps: - name: Check version if: ${{ github.event.inputs.hugoVersion }} diff --git a/README.md b/README.md index 14b0bf91..12bd8cb6 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ **ExampleSite** can be found here: [**exampleSite**](https://github.com/adityatelange/hugo-PaperMod/tree/exampleSite). Demo is built up with [exampleSite](https://github.com/adityatelange/hugo-PaperMod/tree/exampleSite) as source. [![hugo-papermod](https://img.shields.io/badge/Hugo--Themes-@PaperMod-blue)](https://themes.gohugo.io/themes/hugo-papermod/) -[![Minimum Hugo Version](https://img.shields.io/static/v1?label=min-HUGO-version&message=>=0.97.1&color=blue&logo=hugo)](https://github.com/gohugoio/hugo/releases/tag/v0.97.1) +[![Minimum Hugo Version](https://img.shields.io/static/v1?label=min-HUGO-version&message=>=v0.112.4&color=blue&logo=hugo)](https://github.com/gohugoio/hugo/releases/tag/v0.112.4) [![Discord](https://img.shields.io/discord/971046860317921340?label=Discord&logo=discord)](https://discord.gg/ahpmTvhVmp) [![GitHub](https://img.shields.io/github/license/adityatelange/hugo-PaperMod)](https://github.com/adityatelange/hugo-PaperMod/blob/master/LICENSE) ![code-size](https://img.shields.io/github/languages/code-size/adityatelange/hugo-PaperMod) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index d2de5eec..df611bfb 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,5 +1,5 @@ -{{- if lt hugo.Version "0.97.1" }} -{{- errorf "=> hugo v0.97.1 or greater is required for hugo-PaperMod to build " }} +{{- if lt hugo.Version "0.112.4" }} +{{- errorf "=> hugo v0.112.4 or greater is required for hugo-PaperMod to build " }} {{- end -}} diff --git a/theme.toml b/theme.toml index aa26fe06..f659f5c9 100644 --- a/theme.toml +++ b/theme.toml @@ -37,7 +37,7 @@ features = [ "scroll-to-top", "search" ] -min_version = "0.97.1" +min_version = "0.112.4" [author] name = "Aditya Telange" From 5f624757ae894d46c2e96e6ba6c0720a4ec7771a Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 16 Dec 2023 20:07:15 +0530 Subject: [PATCH 659/669] Workflows: Update release bin path for hugo linux-amd64.deb --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index f4acb7e0..4d35f1de 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -45,7 +45,7 @@ jobs: run: export HUGO_VERSION="${{ github.event.inputs.hugoVersion }}" - name: Install Hugo CLI run: | - wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.deb \ + wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_linux-amd64.deb \ && sudo dpkg -i ${{ runner.temp }}/hugo.deb - name: Checkout uses: actions/checkout@v3 From f8e125c7eef82323b11fc2dfc67110dfc7454dd8 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 16 Dec 2023 20:59:08 +0530 Subject: [PATCH 660/669] Add padding to social-icons for better tap sizing --- assets/css/common/main.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/assets/css/common/main.css b/assets/css/common/main.css index 50022ac1..25ae4dae 100644 --- a/assets/css/common/main.css +++ b/assets/css/common/main.css @@ -27,12 +27,10 @@ margin-inline-start: auto; } -.social-icons { - padding: 12px 0; -} -.social-icons a:not(:last-of-type) { - margin-inline-end: 12px; +.social-icons a { + display: inline-flex; + padding: 10px; } .social-icons a svg { From 69e5e085ab0b8d0cae03d9c189c4b262890646ac Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 16 Dec 2023 20:59:36 +0530 Subject: [PATCH 661/669] improved profile mode spacing --- assets/css/common/profile-mode.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/assets/css/common/profile-mode.css b/assets/css/common/profile-mode.css index 58f28198..9e98df55 100644 --- a/assets/css/common/profile-mode.css +++ b/assets/css/common/profile-mode.css @@ -10,19 +10,20 @@ text-align: center; } -.profile .profile_inner h1 { - padding: 12px 0; +.profile .profile_inner { + display: flex; + flex-direction: column; + align-items: center; + gap: 10px; } .profile img { - display: inline-table; border-radius: 50%; } .buttons { flex-wrap: wrap; max-width: 400px; - margin: 0 auto; } .button { From fb1c0aeb6fd5b1b1cfc17a977754cc6d0f03b486 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 16 Dec 2023 21:38:24 +0530 Subject: [PATCH 662/669] social icons refactor Params.socialIcons --- layouts/partials/home_info.html | 2 +- layouts/partials/index_profile.html | 2 +- layouts/partials/social_icons.html | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/layouts/partials/home_info.html b/layouts/partials/home_info.html index efae956e..aece5327 100644 --- a/layouts/partials/home_info.html +++ b/layouts/partials/home_info.html @@ -7,7 +7,7 @@ {{ .Content | markdownify }}
    - {{ partial "social_icons.html" site.Params.socialIcons }} + {{ partial "social_icons.html" }}
    {{- end -}} diff --git a/layouts/partials/index_profile.html b/layouts/partials/index_profile.html index d9ddbda5..6882f39b 100644 --- a/layouts/partials/index_profile.html +++ b/layouts/partials/index_profile.html @@ -32,7 +32,7 @@ {{- end }}

    {{ .title | default site.Title | markdownify }}

    {{ .subtitle | markdownify }} - {{- partial "social_icons.html" site.Params.socialIcons -}} + {{- partial "social_icons.html" -}} {{- with .buttons }}
    diff --git a/layouts/partials/social_icons.html b/layouts/partials/social_icons.html index 876b77c6..761129eb 100644 --- a/layouts/partials/social_icons.html +++ b/layouts/partials/social_icons.html @@ -1,6 +1,7 @@
    - {{ partial "social_icons.html" }} + {{ partial "social_icons.html" (dict "align" site.Params.homeInfoParams.AlignSocialIconsTo) }}
    {{- end -}} diff --git a/layouts/partials/social_icons.html b/layouts/partials/social_icons.html index 761129eb..ce76a308 100644 --- a/layouts/partials/social_icons.html +++ b/layouts/partials/social_icons.html @@ -1,4 +1,4 @@ -