Merge remote-tracking branch 'upstream/master'

Related to #914

.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:**

.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 }}

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

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;
-}
+}

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
 */

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
 */

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: "نسخ الكود"

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: "скапіявана!"

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: "αντιγράφηκε!"

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:

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: "!הועתק"

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"
 

i18n/ja.yaml

@@ -1,8 +1,8 @@
 - id: prev_page
-  translation: "前のページ"
+  translation: "前へ"
 
 - id: next_page
-  translation: "次のページ"
+  translation: "次へ"
 
 - id: read_time
   translation:

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"
 

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!"

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"
 

layouts/_default/archives.html

@@ -1,7 +1,25 @@
 {{- define "main" }}
 
 <header class="page-header">
-  <h1>{{ .Title }}</h1>
+  <h1>
+    {{ .Title }}
+    {{- if (.Param "ShowRssButtonInSectionTermList") }}
+    {{- $rss := (.OutputFormats.Get "rss") }}
+    {{- if (eq .Kind `page`) }}
+      {{- $rss = (.Parent.OutputFormats.Get "rss") }}
+    {{- end }}
+    {{- with $rss }}
+    <a href="{{ .RelPermalink }}" title="RSS" aria-label="RSS">
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
+        stroke-linecap="round" stroke-linejoin="round" height="23">
+        <path d="M4 11a9 9 0 0 1 9 9" />
+        <path d="M4 4a16 16 0 0 1 16 16" />
+        <circle cx="5" cy="19" r="1" />
+      </svg>
+    </a>
+    {{- end }}
+    {{- end }}
+  </h1>
   {{- if .Description }}
   <div class="post-description">
     {{ .Description }}

layouts/_default/list.html

@@ -10,7 +10,8 @@
   <h1>
     {{ .Title }}
     {{- if and (or (eq .Kind `term`) (eq .Kind `section`)) (.Param "ShowRssButtonInSectionTermList") }}
-    <a href="index.xml" title="RSS" aria-label="RSS">
+    {{- with .OutputFormats.Get "rss" }}
+    <a href="{{ .RelPermalink }}" title="RSS" aria-label="RSS">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
         stroke-linecap="round" stroke-linejoin="round" height="23">
         <path d="M4 11a9 9 0 0 1 9 9" />
@@ -19,6 +20,7 @@
       </svg>
     </a>
     {{- end }}
+    {{- end }}
   </h1>
   {{- if .Description }}
   <div class="post-description">

layouts/_default/rss.xml

@@ -18,6 +18,7 @@
     <description>Recent content {{ if ne  .Title  site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ site.Title }}</description>
     {{- with site.Params.images }}
     <image>
+      <title>{{ site.Title }}</title>
       <url>{{ index . 0 | absURL }}</url>
       <link>{{ index . 0 | absURL }}</link>
     </image>

layouts/partials/cover.html

@@ -4,7 +4,9 @@
 <figure class="entry-cover">
     {{- $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 }}<a href="{{ (path.Join .RelPermalink .Params.cover.image) | absURL }}"
             rel="noopener noreferrer">{{ end -}}

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 -}}

theme.toml

@@ -37,7 +37,7 @@ features = [
   "scroll-to-top",
   "search"
 ]
-min_version = "0.83.0"
+min_version = "0.97.1"
 
 [author]
   name = "Wonderfall"