Merge branch 'master' of github.com:nielsbrakel/hugo-PaperMod into toc-on-the-side

2022-02-07 14:28:56 +01:00 · 2022-02-07 14:28:56 +01:00 · 197a3a47ad
commit 197a3a47ad
parent 2e2670c3f4 06f97458a7
20 changed files with 125 additions and 38 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: adityatelange
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: ['https://www.buymeacoffee.com/adityatelange']
--- a/assets/js/fuse.basic.min.js
+++ b/assets/js/fuse.basic.min.js
--- a/assets/js/fuse.js
+++ b/assets/js/fuse.js
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@ -6,8 +6,13 @@

 - id: read_time
  translation:
-    one: "1 min"
-    other: "{{ .Count }} min"
+    one: "1 Minute"
+    other: "{{ .Count }} Minuten"
+
+- id: words
+  translation:
+    one : "Wort"
+    other: "{{ .Count }} Wörter"

 - id: toc
  translation: "Inhaltsverzeichnis"
@ -15,5 +20,14 @@
 - id: translations
  translation: "Übersetzungen"

+- id: home
+  translation: "Home"
+
 - id: edit_post
  translation: "Bearbeiten"
+
+- id: code_copy
+  translation: "Kopieren"
+
+- id: code_copied
+  translation: "Kopiert!"
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@ -9,6 +9,11 @@
    one : "1 min"
    other: "{{ .Count }} min"

+- id: words
+  translation:
+    one : "word"
+    other: "{{ .Count }} words"
+
 - id: toc
  translation: "Table of Contents"

@ -18,6 +23,9 @@
 - id: home
  translation: "Home"

+- id: edit_post
+  translation: "Edit"
+
 - id: code_copy
  translation: "copy"

--- a/i18n/es.yaml
+++ b/i18n/es.yaml
@ -9,8 +9,25 @@
    one : "1 min"
    other: "{{ .Count }} min"

+- id: words
+  translation:
+    one : "palabra"
+    other: "{{ .Count }} palabras"
+
 - id: toc
  translation: "Tabla de Contenidos"

 - id: translations
  translation: "Traducciones"
+
+- id: home
+  translation: "Inicio"
+
+- id: edit_post
+  translation: "Editar"
+
+- id: code_copy
+  translation: "copiar"
+
+- id: code_copied
+  translation: "¡copiado!"
--- a/i18n/fr.yaml
+++ b/i18n/fr.yaml
@ -9,6 +9,11 @@
    one : "1 min"
    other: "{{ .Count }} min"

+- id: words
+  translation:
+    one : "mot"
+    other: "{{ .Count }} mots"
+
 - id: toc
  translation: "Table des Matières"

--- a/i18n/it.yaml
+++ b/i18n/it.yaml
@ -9,6 +9,11 @@
    one: "1 minuto"
    other: "{{ .Count }} minuti"

+- id: words
+  translation:
+    one : "parola"
+    other: "{{ .Count }} parole"
+
 - id: toc
  translation: "Tabella dei Contenuti"

--- a/i18n/ko.yaml
+++ b/i18n/ko.yaml
@ -3,3 +3,23 @@

 - id: next_page
  translation: "다음 페이지"
+
+- id: read_time
+  translation:
+    one : "1 분"
+    other: "{{ .Count }} 분"
+
+- id: toc
+  translation: "목차"
+
+- id: translations
+  translation: "번역"
+
+- id: home
+  translation: "홈페이지"
+
+- id: code_copy
+  translation: "복사"
+
+- id: code_copied
+  translation: "복사완료!"
--- a/i18n/nl.yaml
+++ b/i18n/nl.yaml
@ -9,6 +9,11 @@
      one: "1 min"
      other: "{{ .Count }} min"

+- id: words
+  translation:
+    one : "woord"
+    other: "{{ .Count }} woorden"
+
 - id: toc
  translation: "Inhoudsopgave"

--- a/i18n/pt.yaml
+++ b/i18n/pt.yaml
@ -9,6 +9,11 @@
    one: "1 minuto"
    other: "{{ .Count }} minutos"

+- id: words
+  translation:
+    one : "palavra"
+    other: "{{ .Count }} palavras"
+
 - id: toc
  translation: "Conteúdo"

--- a/i18n/zh-tw.yaml
+++ b/i18n/zh-tw.yaml
@ -18,6 +18,9 @@
 - id: home
  translation: "首頁"

+- id: edit_post
+  translation: "編輯"
+
 - id: code_copy
  translation: "複製"

--- a/i18n/zh.yaml
+++ b/i18n/zh.yaml
@ -18,6 +18,9 @@
 - id: home
  translation: "主页"

+- id: edit_post
+  translation: "编辑"
+
 - id: code_copy
  translation: "复制"

--- a/layouts/partials/cover.html
+++ b/layouts/partials/cover.html
@ -4,7 +4,7 @@
 <figure class="entry-cover">
    {{- $responsiveImages := (.Params.cover.responsiveImages | default .Site.Params.cover.responsiveImages) | default true }}
    {{- $addLink := (and .Site.Params.cover.linkFullImages (not $.IsHome)) }}
-    {{- $cover := (.Page.Resources.ByType "image").GetMatch (printf "*%s*" (.Params.cover.image)) }}
+    {{- $cover := (.Resources.ByType "image").GetMatch (printf "*%s*" (.Params.cover.image)) }}
    {{- if $cover -}}{{/* i.e it is present in page bundle */}}
        {{- if $addLink }}<a href="{{ (path.Join .RelPermalink .Params.cover.image) | absURL }}" target="_blank"
            rel="noopener noreferrer">{{ end -}}
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@ -72,7 +72,7 @@
 {{- if (eq .Layout `search`) -}}
 <link crossorigin="anonymous" rel="preload" as="fetch" href="../index.json">
 {{- $fastsearch := resources.Get "js/fastsearch.js" | js.Build (dict "params" (dict "fuseOpts" .Site.Params.fuseOpts)) }}
-{{- $fusejs := resources.Get "js/fuse.js" }}
+{{- $fusejs := resources.Get "js/fuse.basic.min.js" }}
 {{- if not .Site.Params.assets.disableFingerprinting }}
 {{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify | fingerprint }}
 <script defer crossorigin="anonymous" src="{{ $search.RelPermalink }}" integrity="{{ $search.Data.Integrity }}"></script>
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@ -46,7 +46,7 @@
            {{- if .Site.Title }}
            <a href="{{ "" | absLangURL }}" accesskey="h" title="{{ $label_text }} (Alt + H)">
                {{- if .Site.Params.label.icon }}
-                <img src="{{- .Site.Params.label.icon -}}" alt="logo" aria-label="logo"
+                <img src="{{- .Site.Params.label.icon | absURL -}}" alt="logo" aria-label="logo"
                    height="{{- .Site.Params.label.iconHeight | default " 30px" -}}">
                {{- end -}}
                {{- $label_text -}}
--- a/layouts/partials/index_profile.html
+++ b/layouts/partials/index_profile.html
@ -2,7 +2,7 @@
    {{- with .Site.Params.profileMode }}
    <div class="profile_inner">
        {{- if .imageUrl -}}
-        <img src="{{ .imageUrl }}" alt="{{ .imageTitle | default "profile image" }}"
+        <img src="{{ .imageUrl | absURL }}" alt="{{ .imageTitle | default "profile image" }}"
            height="{{ .imageHeight | default 150 }}" width="{{ .imageWidth | default 150 }}" />
        {{- end }}
        <h1>{{ .title | default $.Site.Title | markdownify }}</h1>
--- a/layouts/partials/post_meta.html
+++ b/layouts/partials/post_meta.html
@ -1,13 +1,17 @@
 {{- $scratch := newScratch }}

 {{- if not .Date.IsZero -}}
-{{- $scratch.Add "meta" (slice (printf "<span title='%s'>%s</span>" (.Date) (.Date.Format (default "January 2, 2006" .Site.Params.DateFormat)))) }}
+{{- $scratch.Add "meta" (slice (printf "<span title='%s'>%s</span>" (.Date) (.Date | time.Format (default "January 2, 2006" .Site.Params.DateFormat)))) }}
 {{- end }}

 {{- if (.Param "ShowReadingTime") -}}
 {{- $scratch.Add "meta" (slice (i18n "read_time" .ReadingTime | default (printf "%d min" .ReadingTime))) }}
 {{- end }}

+{{- if (.Param "ShowWordCount") -}}
+{{- $scratch.Add "meta" (slice (i18n "words" .WordCount | default (printf "%d words" .WordCount))) }}
+{{- end }}
+
 {{- with (partial "author.html" .) }}
 {{- $scratch.Add "meta" (slice .) }}
 {{- end }}
--- a/layouts/partials/svg.html
+++ b/layouts/partials/svg.html
@ -322,6 +322,12 @@
        d="M7.144 19.532l1.049-5.751c.11-.606.691-1.002 1.304-.948 2.155.192 6.877.1 8.818-4.002 2.554-5.397-.59-7.769-6.295-7.769H7.43a1.97 1.97 0 0 0-1.944 1.655L2.77 19.507a.857.857 0 0 0 .846.994h2.368a1.18 1.18 0 0 0 1.161-.969zM7.967 22.522a.74.74 0 0 0 .666.416h2.313c.492 0 .923-.351 1.003-.837l.759-4.601c.095-.523.597-.866 1.127-.819 1.86.166 5.567-.118 6.85-3.821.554-1.6.705-2.954.408-4.018"
        style="font-variation-settings:normal" stroke="currentColor" stroke-linejoin="miter" />
 </svg>
+{{- else if (eq $icon_name "phone") -}}
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="9" y="4" width="6" height="1" rx="0.5" fill="currentColor"/>
+    <path d="M12 20C12.2652 20 12.5196 19.8946 12.7071 19.7071C12.8946 19.5196 13 19.2652 13 19C13 18.7348 12.8946 18.4804 12.7071 18.2929C12.5196 18.1054 12.2652 18 12 18C11.7348 18 11.4804 18.1054 11.2929 18.2929C11.1054 18.4804 11 18.7348 11 19C11 19.2652 11.1054 19.5196 11.2929 19.7071C11.4804 19.8946 11.7348 20 12 20Z" fill="currentColor"/>
+    <rect x="5" y="1" width="14" height="22" rx="2" stroke="currentColor" stroke-width="2"/>
+</svg>
 {{- else if (eq $icon_name "polywork") -}}
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img"
    fill="currentColor" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">
--- a/layouts/partials/toc.html
+++ b/layouts/partials/toc.html
@ -8,15 +8,18 @@
                <span class="details">{{- i18n "toc" | default "Table of Contents" }}</span>
            </summary>

-            <div class="inner">
-                {{- $largest := 6 -}}
-                {{- range $headers -}}
-                {{- $headerLevel := index (findRE "[1-6]" . 1) 0 -}}
-                {{- $headerLevel := len (seq $headerLevel) -}}
-                {{- if lt $headerLevel $largest -}}
-                {{- $largest = $headerLevel -}}
-                {{- end -}}
-                {{- end -}}
+        <div class="inner">
+            {{- if (.Param "UseHugoToc") }}
+            {{- .TableOfContents -}}
+            {{- else }}
+            {{- $largest := 6 -}}
+            {{- range $headers -}}
+            {{- $headerLevel := index (findRE "[1-6]" . 1) 0 -}}
+            {{- $headerLevel := len (seq $headerLevel) -}}
+            {{- if lt $headerLevel $largest -}}
+            {{- $largest = $headerLevel -}}
+            {{- end -}}
+            {{- end -}}

                {{- $firstHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers 0) 1) 0)) -}}

@ -88,6 +91,7 @@
                {{- end -}}
                {{- end }}
                </ul>
+                {{- end }}
            </div>
        </details>
    </div>
@ -151,4 +155,4 @@
        return rect.top + win.pageYOffset;   
    }
 </script>
-{{- end }}
+{{- end }}