diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 3e6cf7e0..b7d5b289 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.83.0 expected]: + - Hugo Version [ >=0.97.1 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 305a6dec..4f59e302 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.83.0" + default: "0.97.1" # Allow one concurrent deployment concurrency: @@ -38,7 +38,7 @@ jobs: build: runs-on: ubuntu-latest env: - HUGO_VERSION: "0.83.0" + HUGO_VERSION: "0.97.1" steps: - name: Check version if: ${{ github.event.inputs.hugoVersion }} diff --git a/LICENSE b/LICENSE index 1580f7f1..34f08856 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ MIT License Copyright (c) 2020 nanxiaobei and adityatelange -Copyright (c) 2021-2022 adityatelange +Copyright (c) 2021-2023 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 diff --git a/assets/css/common/post-single.css b/assets/css/common/post-single.css index eac2c127..24afb9e4 100644 --- a/assets/css/common/post-single.css +++ b/assets/css/common/post-single.css @@ -81,8 +81,7 @@ } .post-content del { - text-decoration: none; - background: linear-gradient(to right, var(--primary) 100%, transparent 0) 0 50%/1px 1px repeat-x; + text-decoration: line-through; } .post-content dl, @@ -417,4 +416,4 @@ h1>a>svg { img.in-text { display: inline; margin: auto; -} \ No newline at end of file +} diff --git a/assets/css/core/license.css b/assets/css/core/license.css index 8e81d229..62340074 100644 --- a/assets/css/core/license.css +++ b/assets/css/core/license.css @@ -1,6 +1,6 @@ /* - PaperMod v6 + PaperMod v7 License: MIT https://github.com/adityatelange/hugo-PaperMod/blob/master/LICENSE Copyright (c) 2020 nanxiaobei and adityatelange - Copyright (c) 2021-2022 adityatelange + Copyright (c) 2021-2023 adityatelange */ diff --git a/assets/js/license.js b/assets/js/license.js index 8e81d229..62340074 100644 --- a/assets/js/license.js +++ b/assets/js/license.js @@ -1,6 +1,6 @@ /* - PaperMod v6 + PaperMod v7 License: MIT https://github.com/adityatelange/hugo-PaperMod/blob/master/LICENSE Copyright (c) 2020 nanxiaobei and adityatelange - Copyright (c) 2021-2022 adityatelange + Copyright (c) 2021-2023 adityatelange */ diff --git a/i18n/ar.yaml b/i18n/ar.yaml index 11f50a2c..52990c28 100644 --- a/i18n/ar.yaml +++ b/i18n/ar.yaml @@ -1,8 +1,8 @@ - id: prev_page - translation: "الصفحة السابقة" + translation: "السابق" - id: next_page - translation: "الصفحة التالية" + translation: "التالي" - id: read_time translation: @@ -20,3 +20,9 @@ - id: home translation: "الصفحة الرئيسية" + +- id: code_copied + translation: "تم النسخ!" + +- id: code_copy + translation: "نسخ الكود" diff --git a/i18n/be.yaml b/i18n/be.yaml new file mode 100644 index 00000000..22902ab8 --- /dev/null +++ b/i18n/be.yaml @@ -0,0 +1,39 @@ +- id: prev_page + translation: "Папярэдняя" + +- id: next_page + translation: "Наступная" + +- id: read_time + translation: + zero: "0 хвілін" + one: "1 хвіліна" + few: "{{ .Count }} хвіліны" + many: "{{ .Count }} хвілін" + other: "{{ .Count }} хвілін" + +- id: words + translation: + zero: "няма слоў" + one: "1 слова" + few: "{{ .Count }} слова" + many: "{{ .Count }} слоў" + other: "{{ .Count }} слова" + +- id: toc + translation: "Змест" + +- id: translations + translation: "Пераклады" + +- id: home + translation: "Галоўная" + +- id: edit_post + translation: "Рэдагаваць" + +- id: code_copy + translation: "капіяваць" + +- id: code_copied + translation: "скапіявана!" diff --git a/i18n/el.yaml b/i18n/el.yaml new file mode 100644 index 00000000..4257bac8 --- /dev/null +++ b/i18n/el.yaml @@ -0,0 +1,33 @@ +- id: prev_page + translation: "Προηγούμενο" + +- id: next_page + translation: "Επόμενο" + +- id: read_time + translation: + one: "1 λεπτό" + other: "{{ .Count }} λεπτά" + +- id: words + translation: + one: "λέξη" + other: "{{ .Count }} λέξεις" + +- id: toc + translation: "Πίνακας Περιεχομένων" + +- id: translations + translation: "Μεταφράσεις" + +- id: home + translation: "Αρχική" + +- id: edit_post + translation: "Επεξεργασία" + +- id: code_copy + translation: "αντιγραφή" + +- id: code_copied + translation: "αντιγράφηκε!" \ No newline at end of file diff --git a/i18n/fr.yaml b/i18n/fr.yaml index b074c107..e48d8e98 100644 --- a/i18n/fr.yaml +++ b/i18n/fr.yaml @@ -1,8 +1,8 @@ - id: prev_page - translation: "Page précédente" + translation: "Précédent" - id: next_page - translation: "Page suivante" + translation: "Suivant" - id: read_time translation: diff --git a/i18n/he.yaml b/i18n/he.yaml index 6d203f4d..3912fb8d 100644 --- a/i18n/he.yaml +++ b/i18n/he.yaml @@ -1,19 +1,33 @@ - id: prev_page - translation: "לעמוד הקודם" + translation: "קודם" - id: next_page - translation: "לעמוד הבא" + translation: "הבא" - id: read_time translation: one : "דקה אחת" - other: "{{ .Count }} דקות" + other: "דקות {{ .Count }}" + +- id: words + translation: + one : "word" + other: "מילים {{ .Count }} " - id: toc - translation: "תוכן עניינים" + translation: "תוכן העניינים" - id: translations translation: "תרגומים" - id: home - translation: "דף בית" + translation: "בית" + +- id: edit_post + translation: "ערוך" + +- id: code_copy + translation: "העתק" + +- id: code_copied + translation: "!הועתק" diff --git a/i18n/it.yaml b/i18n/it.yaml index ef41db4e..c87c95d0 100644 --- a/i18n/it.yaml +++ b/i18n/it.yaml @@ -1,8 +1,8 @@ - id: prev_page - translation: "Pag Prec" + translation: "Precedente" - id: next_page - translation: "Pag Succ" + translation: "Successivo" - id: read_time translation: @@ -15,11 +15,17 @@ other: "{{ .Count }} parole" - id: toc - translation: "Tabella dei Contenuti" + translation: "Indice contenuti" - id: translations translation: "Traduzioni" +- id: home + translation: "Home" + +- id: edit_post + translation: "Modifica" + - id: code_copy translation: "copia" diff --git a/i18n/ja.yaml b/i18n/ja.yaml index bc7bf377..93948d37 100644 --- a/i18n/ja.yaml +++ b/i18n/ja.yaml @@ -1,8 +1,8 @@ - id: prev_page - translation: "前のページ" + translation: "前へ" - id: next_page - translation: "次のページ" + translation: "次へ" - id: read_time translation: diff --git a/i18n/pl.yaml b/i18n/pl.yaml index fdf6b0cb..81b0e778 100644 --- a/i18n/pl.yaml +++ b/i18n/pl.yaml @@ -1,14 +1,19 @@ - id: prev_page - translation: "Poprzednia strona" + translation: "Poprzednia" - id: next_page - translation: "Następna strona" + translation: "Następna" - id: read_time translation: one: "1 min" other: "{{ .Count }} min" +- id: words + translation: + one : "słowo" + other: "{{ .Count }} słów" + - id: toc translation: "Spis treści" diff --git a/i18n/pt.yaml b/i18n/pt.yaml index f449de9c..ab06429c 100644 --- a/i18n/pt.yaml +++ b/i18n/pt.yaml @@ -19,3 +19,15 @@ - id: translations translation: "Traduções" + +- id: home + translation: "Início" + +- id: edit_post + translation: "Editar" + +- id: code_copy + translation: "copiar" + +- id: code_copied + translation: "copiado!" diff --git a/i18n/tr.yaml b/i18n/tr.yaml index e598b41e..d11ef210 100644 --- a/i18n/tr.yaml +++ b/i18n/tr.yaml @@ -1,14 +1,19 @@ - id: prev_page - translation: "Önceki Sayfa" + translation: "Önceki" - id: next_page - translation: "Sonraki Sayfa" + translation: "Sonraki" - id: read_time translation: one : "1 dk" other: "{{ .Count }} dk" +- id: words + translation: + one : "kelime" + other: "{{ .Count }} kelime" + - id: toc translation: "İçindekiler" @@ -18,6 +23,9 @@ - id: home translation: "Anasayfa" +- id: edit_post + translation: "Düzenle" + - id: code_copy translation: "Kopyala" diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index e400e2c5..d2c4d76b 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -1,7 +1,25 @@ {{- define "main" }}
-

{{ .Title }}

+

+ {{ .Title }} + {{- if (.Param "ShowRssButtonInSectionTermList") }} + {{- $rss := (.OutputFormats.Get "rss") }} + {{- if (eq .Kind `page`) }} + {{- $rss = (.Parent.OutputFormats.Get "rss") }} + {{- end }} + {{- with $rss }} + + + + + + + + {{- end }} + {{- end }} +

{{- if .Description }}
{{ .Description }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 3a6f316e..9c5bc54d 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -10,7 +10,8 @@

{{ .Title }} {{- if and (or (eq .Kind `term`) (eq .Kind `section`)) (.Param "ShowRssButtonInSectionTermList") }} - + {{- with .OutputFormats.Get "rss" }} + @@ -19,6 +20,7 @@ {{- end }} + {{- end }}

{{- if .Description }}
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 134d50d4..44f14986 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -18,6 +18,7 @@ Recent content {{ if ne .Title site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ site.Title }} {{- with site.Params.images }} + {{ site.Title }} {{ index . 0 | absURL }} {{ index . 0 | absURL }} diff --git a/layouts/partials/cover.html b/layouts/partials/cover.html index 0f131f79..692fd6fc 100644 --- a/layouts/partials/cover.html +++ b/layouts/partials/cover.html @@ -4,7 +4,9 @@
{{- $responsiveImages := (.Params.cover.responsiveImages | default site.Params.cover.responsiveImages) | default true }} {{- $addLink := (and site.Params.cover.linkFullImages (not $.IsHome)) }} - {{- $cover := (.Resources.ByType "image").GetMatch (printf "*%s*" (.Params.cover.image)) }} + {{- $pageBundleCover := (.Resources.ByType "image").GetMatch (printf "*%s*" (.Params.cover.image)) }} + {{- $globalResourcesCover := (resources.ByType "image").GetMatch (printf "*%s*" (.Params.cover.image)) }} + {{- $cover := (or $pageBundleCover $globalResourcesCover)}} {{- if $cover -}}{{/* i.e it is present in page bundle */}} {{- if $addLink }}{{ end -}} diff --git a/layouts/partials/edit_post.html b/layouts/partials/edit_post.html index 8f5ea21e..e9ccf77f 100644 --- a/layouts/partials/edit_post.html +++ b/layouts/partials/edit_post.html @@ -1,4 +1,4 @@ -{{- if or .Params.editPost.URL site.Params.editPost.URL -}} +{{- if and (or .Params.editPost.URL site.Params.editPost.URL) (not (.Param "editPost.disabled")) -}} {{- $fileUrlPath := path.Join .File.Path }} {{- if or .Params.author site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) .IsTranslated }} | {{- end -}} diff --git a/layouts/partials/svg.html b/layouts/partials/svg.html index 49f5389f..e2246402 100644 --- a/layouts/partials/svg.html +++ b/layouts/partials/svg.html @@ -96,6 +96,11 @@ +{{- else if (eq $icon_name "codeforces") -}} + + + {{- else if (eq $icon_name "cryptohack") -}} +{{- else if (eq $icon_name "douban") -}} + + + + + {{- else if (eq $icon_name "dreamstime") -}} @@ -230,10 +242,10 @@ d="M1.503 9.678c-.83 0-1.5.67-1.5 1.5v1.63a1.5 1.5 0 103 0v-1.63c0-.83-.67-1.5-1.5-1.5zm20.994 0c-.83 0-1.5.67-1.5 1.5v1.63a1.5 1.5 0 103 0v-1.63c0-.83-.67-1.5-1.5-1.5zM6.68 14.587c-.83 0-1.5.67-1.5 1.5v1.63a1.5 1.5 0 103 0v-1.62c0-.83-.67-1.5-1.5-1.5zm0-9.817c-.83 0-1.5.67-1.5 1.5v5.357a1.5 1.5 0 003 0V6.258c0-.83-.67-1.5-1.5-1.5zm10.638 0c-.83 0-1.5.67-1.5 1.5v1.64a1.5 1.5 0 003 0V6.27c0-.83-.67-1.5-1.5-1.5zM12 0c-.83 0-1.5.67-1.5 1.5v1.63a1.5 1.5 0 103 0V1.5c0-.83-.67-1.499-1.5-1.499zm0 19.355c-.83 0-1.5.67-1.5 1.5v1.64a1.5 1.5 0 103 .01v-1.64c0-.82-.67-1.5-1.5-1.5zm5.319-8.457c-.83 0-1.5.68-1.5 1.5v5.328a1.5 1.5 0 003 0v-5.329c0-.83-.67-1.5-1.5-1.5zM12 6.128c-.83 0-1.5.68-1.5 1.5v8.728a1.5 1.5 0 003 0V7.638c0-.83-.67-1.5-1.5-1.5z"/> {{- else if (eq $icon_name "googlescholar") -}} - + d="M5.242 13.769L0.5 9.5 12 1l11.5 9-5.242 3.769C17.548 11.249 14.978 9.5 12 9.5c-2.977 0-5.548 1.748-6.758 4.269zM12 10a7 7 0 1 0 0 14 7 7 0 0 0 0-14z" /> {{- else if (eq $icon_name "gurushots") -}} +{{- else if (eq $icon_name "neteasecloudmusic") -}} + + + {{- else if (eq $icon_name "nuget") -}} @@ -568,6 +584,12 @@ + +{{- else if (eq $icon_name "substack") -}} + + + + {{- else if (eq $icon_name "telegram") -}} @@ -585,6 +607,14 @@ c-14.7-15.1-2.1-40.5,19-37.7v12.3c-9.5-3-17.2,8-11.2,15.9c5.8,7.7,18.3,3.6,18.3-6.1c0,0,0-48.2,0-48.2c2.4,0,9.9,0,12.2,0v1.6 c0.7,7.4,6.1,13.4,13.3,15v0C65.4,19.3,65.6,19.4,65.9,19.4z"/> +{{- else if (eq $icon_name "tryhackme") -}} + + + +{{- else if (eq $icon_name "tumblr") -}} + + + {{- else if (eq $icon_name "twitch") -}} @@ -608,6 +638,10 @@ +{{- else if or (eq $icon_name "vk") (eq $icon_name "vkontakte") -}} + + + {{- else if (eq $icon_name "xda") -}} +{{- else if (eq $icon_name "zhihu") -}} + + + {{- else if $icon_name -}} diff --git a/theme.toml b/theme.toml index 1c3eace8..dd31720e 100644 --- a/theme.toml +++ b/theme.toml @@ -37,7 +37,7 @@ features = [ "scroll-to-top", "search" ] -min_version = "0.83.0" +min_version = "0.97.1" [author] name = "Wonderfall"