Merge pull request #354 from gethinode/develop

Bump package version

assets/scss/components/_syntax.scss

@@ -10,6 +10,7 @@
 
 .syntax-highlight {
     background-color: var(--bs-light) if($enable-important-utilities, !important, null);
+    overflow-x: auto;
 }
 
 .preview-background {
@@ -29,6 +30,7 @@
 
         .syntax-highlight {
             background-color: var(--bs-tertiary-bg) if($enable-important-utilities, !important, null);
+            overflow-x: auto;
         }
 
         .bg,

config/postcss.config.js

@@ -22,6 +22,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
       './assets/scss/theme/fonts.scss',
       './assets/scss/theme/theme.scss',
       './_vendor/github.com/gethinode/mod-flexsearch/assets/scss/modules/flexsearch/flexsearch.scss',
+      './_vendor/github.com/gethinode/mod-katex/dist/katex.scss',
       './_vendor/github.com/gethinode/mod-leaflet/dist/leaflet.scss',
       './_vendor/github.com/twbs/bootstrap/scss/_carousel.scss',
       './_vendor/github.com/twbs/bootstrap/scss/_dropdown.scss',

go.mod

@@ -4,8 +4,8 @@ go 1.19
 
 require (
 	github.com/gethinode/mod-bootstrap v1.1.0 // indirect
-	github.com/gethinode/mod-flexsearch v1.1.1 // indirect
-	github.com/gethinode/mod-fontawesome v1.2.0 // indirect
+	github.com/gethinode/mod-flexsearch v1.1.2 // indirect
+	github.com/gethinode/mod-fontawesome v1.2.1 // indirect
 	github.com/gethinode/mod-katex v1.0.2 // indirect
-	github.com/gethinode/mod-leaflet v0.3.1 // indirect
+	github.com/gethinode/mod-leaflet v0.3.3 // indirect
 )

go.sum

@@ -8,12 +8,16 @@ github.com/gethinode/mod-flexsearch v1.1.0 h1:7BCMyQDlYlskNXuazt8Jg/jg9WREexu2xV
 github.com/gethinode/mod-flexsearch v1.1.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-flexsearch v1.1.1 h1:zHypfKR/rWPAwqNXvo09Pp3vGqU4w3r7d2VtMudIzkI=
 github.com/gethinode/mod-flexsearch v1.1.1/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
+github.com/gethinode/mod-flexsearch v1.1.2 h1:vA/jHxLq9xxkYGS9cmAoLNIkEBW+iLVCcQ8qKyEa+R4=
+github.com/gethinode/mod-flexsearch v1.1.2/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-fontawesome v1.0.2 h1:ZSK6D20/w4y5GnfYfTBB58uHD0ChIfkpKfRGwioS9rg=
 github.com/gethinode/mod-fontawesome v1.0.2/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.1.0 h1:rsDzUI+3ZlS/do2ff3ne8/z3KwHeysmuA+WsXlumXXk=
 github.com/gethinode/mod-fontawesome v1.1.0/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.2.0 h1:2nWYEjpUKu6IJ6kOh2WDlDUqRQ/dUGw6mJWIdMTA3O0=
 github.com/gethinode/mod-fontawesome v1.2.0/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
+github.com/gethinode/mod-fontawesome v1.2.1 h1:k7z5ZRsNxCohZjlZm8jVAzmTPk17c6xMYBAjAXHs13I=
+github.com/gethinode/mod-fontawesome v1.2.1/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-katex v1.0.0 h1:me/3dIIZBkfk1mRIFt8QiAGYwYDoSG5bc2hHRtIutFc=
 github.com/gethinode/mod-katex v1.0.0/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.1 h1:809QUztxmKgMNchU+v03iMO7Ma+ISc3ZzhXYauc21rs=
@@ -24,3 +28,5 @@ github.com/gethinode/mod-leaflet v0.2.3 h1:QQI4h+IH0jZ7fx4q0um2YIEiYBoW3OAfW8qHz
 github.com/gethinode/mod-leaflet v0.2.3/go.mod h1:uGggt87x4Fw7wBoJpSiUvNkYg+s/Ujne7klAX2rxMRk=
 github.com/gethinode/mod-leaflet v0.3.1 h1:H5MaOa+BB1KuVw7abTqfIn/SNzzRsAyx/WQoSe+2Ykc=
 github.com/gethinode/mod-leaflet v0.3.1/go.mod h1:uGggt87x4Fw7wBoJpSiUvNkYg+s/Ujne7klAX2rxMRk=
+github.com/gethinode/mod-leaflet v0.3.3 h1:isnjja6VRFvVWBatYSouh46TXSJg2C4/E2BQTrQw+yI=
+github.com/gethinode/mod-leaflet v0.3.3/go.mod h1:uGggt87x4Fw7wBoJpSiUvNkYg+s/Ujne7klAX2rxMRk=

i18n/de.yaml

@@ -37,6 +37,8 @@
   translation: "Wörter"
 - id: copyright
   translation: "Copyright"
+- id: rights
+  translation: "Alle Rechte vorbehalten"
 - id: photoBy
   translation: "Foto von"
 - id: photoOn

i18n/en.yaml

@@ -45,6 +45,8 @@
   translation: "words"
 - id: copyright
   translation: "Copyright"
+- id: rights
+  translation: "All rights reserved"
 - id: photoBy
   translation: "Photo by"
 - id: photoOn
@@ -138,7 +140,7 @@
 - id: show
   translation: "Show"
 - id: comments
-  translation: "comments" 
+  translation: "Comments" 
 
 # Related posts
 - id: seeAlso

i18n/nl.yaml

@@ -37,6 +37,8 @@
   translation: "woorden"
 - id: copyright
   translation: "Copyright"
+- id: rights
+  translation: "Alle rechten voorbehouden"
 - id: photoBy
   translation: "Foto van"
 - id: photoOn
@@ -129,7 +131,7 @@
 - id: show
   translation: "Tonen"
 - id: comments
-  translation: "commentaar" 
+  translation: "Reacties" 
 
 # Related posts
 - id: seeAlso

layouts/partials/assets/comments.html

@@ -1,6 +1,6 @@
 {{- $params := .Site.Params.comments -}}
 {{- with $params -}}
-<h2>Comments</h2>
+<h2>{{ T "comments" }}</h2>
 <script src="https://utteranc.es/client.js"
   repo="{{ $params.repo }}"
   issue-term="{{ default "pathname" $params.issueTerm }}"

layouts/partials/assets/icon.html

@@ -1,16 +0,0 @@
-{{- $icon := .icon -}}
-{{- if not $icon -}}
-    {{- errorf "partial [assets/icon.html] - Expected value for param 'icon'" -}}
-{{- end -}}
-
-{{- $icon_class := split $icon " " -}}
-{{- $attr := delimit (after 1 $icon_class) " " -}}
-{{- if eq (index $icon_class 0) "fas" -}}
-    <i class="fa-solid fa-{{ $attr}}"></i>
-{{- else if eq (index $icon_class 0) "fab" -}}
-    <i class="fa-brands fa-{{ $attr }}"></i>
-{{- else if eq (index $icon_class 0) "fa" -}}
-    <i class="fa-regular fa-{{ $attr }}"></i>
-{{- else -}}
-    {{- errorf "partial [assets/icon.html] - Unrecognized icon class: %s" $icon_class -}}
-{{- end -}}

layouts/partials/footer/footer.html

@@ -1,7 +1,7 @@
 <footer class="container-fluid text-center p-3">
     <div class="container-xxl text-center">
         <small class="text-secondary">
-            {{- $copyright := printf "%s © %s %s All rights reserved." (i18n "copyright") (dateFormat "2006" now) .Site.Title }}
+            {{- $copyright := printf "%s © %s %s %s." (T "copyright") (dateFormat "2006" now) .Site.Title (T "rights") }}
             {{ cond (gt (len .Site.Copyright) 0) .Site.Copyright $copyright }}
             {{ .Site.Params.footer.license | safeHTML }}
         </small>

layouts/partials/head/icons.html

@@ -11,7 +11,7 @@
 
     Variable names are converted from kebab case to snake case to make them compatible with Hugo's variable naming
     convention. For example, the css variable '--accordion-icon-active-color' is available as 
-    ''.accordion_icon_active_color' within the Hugo template. The processed svg files are published to the "icons"
+    '.accordion_icon_active_color' within the Hugo template. The processed svg files are published to the "icons"
     folder.
     
     The partial supports the following arguments:

layouts/shortcodes/docs.html

@@ -44,13 +44,23 @@
     {{ errorf "Invalid value for param 'show': %s" $showParam -}}
 {{ end -}}
 
+{{ $fullParam := "true" -}}
+{{ $full := true -}}
+{{ with .Get "full" }}{{ $fullParam = . }}{{ end -}}
+{{ if in $supportedFlags $fullParam -}}
+    {{ if eq $fullParam "true" }}{{ $full = true }}{{ else }}{{ $full = false }}{{ end -}}
+{{ else -}}
+    {{ errorf "Invalid value for param 'full': %s" $fullParam -}}
+{{ end -}}
 
 {{- /* If any parameters are missing, print an error and exit */ -}}
 {{- if or (not $name) (not $file) -}}
     {{- errorf "%s: %q: Missing required parameters! Got: name=%q file=%q!" .Position .Name $name $file -}}
 {{- else -}}
-    {{- $regex := printf `%s((?:.|\n)*)%s` $capture_start $capture_end -}}
+    {{- /* Force-check if the file exists */ -}}
+    {{ $tmp := os.Stat $file }}
 
+    {{- $regex := printf `%s((?:.|\n)*)%s` $capture_start $capture_end -}}
     {{- $match := findRE $regex (readFile $file) -}}
     {{- $match = index $match 0 -}}
 
@@ -70,7 +80,7 @@
                 data-bs-target=".multi-{{ $id }}" 
                 aria-expanded="false" 
                 aria-controls="body-{{ $id }} footer-{{ $id }}">
-                <small>{{ strings.TrimPrefix $basePath $file }}</small>
+                <small>{{ if $full }}{{ strings.TrimPrefix $basePath $file }}{{ else }}{{ path.Base $file }}{{ end }}</small>
             </a>
         </li>
     </ul>

layouts/shortcodes/fa.html

@@ -1,5 +0,0 @@
-{{- if not (.Get 0) -}}
-    {{- errorf "Expected icon name: %s" .Position -}}
-{{- else -}}
-    {{- partial "assets/icon.html" (dict "icon" (printf "fa %s" (delimit .Params " "))) }}
-{{- end -}}

layouts/shortcodes/fab.html

@@ -1,5 +0,0 @@
-{{- if not (.Get 0) -}}
-    {{- errorf "Expected icon name: %s" .Position -}}
-{{- else -}}
-{{- partial "assets/icon.html" (dict "icon" (printf "fab %s" (delimit .Params " "))) }}
-{{- end -}}

layouts/shortcodes/fas.html

@@ -1,5 +0,0 @@
-{{- if not (.Get 0) -}}
-    {{- errorf "Expected icon name: %s" .Position -}}
-{{- else -}}
-{{- partial "assets/icon.html" (dict "icon" (printf "fas %s" (delimit .Params " "))) }}
-{{- end -}}

layouts/shortcodes/file.html

@@ -0,0 +1,68 @@
+{{- /*
+    Source: https://github.com/twbs/bootstrap/blob/main/site/layouts/shortcodes/scss-docs.html
+
+    Usage: `file path="path/to/filename" lang="lang" show="true" full="true"`
+
+    Prints the full content of any given file supported by the Chroma syntax highlighter.
+*/ -}}
+
+{{- $basePath := .Site.Params.docs.basePath -}}
+{{- $file := .Get "path" }}
+{{- if hasPrefix $file "./" -}}
+    {{- $file = path.Clean $file -}}
+{{- else -}}
+    {{- $file = path.Join $basePath (path.Clean $file) -}}
+{{- end -}}
+
+{{- $extension := strings.TrimLeft "." (path.Ext $file)  }}
+{{- $lang := .Get "lang" | default $extension -}}
+{{- $id := printf "docs-collapse-%d" .Ordinal -}}
+
+{{ $supportedFlags := slice "true" "false" -}}
+{{ $showParam := "true" -}}
+{{ $show := true -}}
+{{ with .Get "show" }}{{ $showParam = . }}{{ end -}}
+{{ if in $supportedFlags $showParam -}}
+    {{ if eq $showParam "true" }}{{ $show = true }}{{ else }}{{ $show = false }}{{ end -}}
+{{ else -}}
+    {{ errorf "Invalid value for param 'show': %s" $showParam -}}
+{{ end -}}
+
+{{ $fullParam := "true" -}}
+{{ $full := true -}}
+{{ with .Get "full" }}{{ $fullParam = . }}{{ end -}}
+{{ if in $supportedFlags $fullParam -}}
+    {{ if eq $fullParam "true" }}{{ $full = true }}{{ else }}{{ $full = false }}{{ end -}}
+{{ else -}}
+    {{ errorf "Invalid value for param 'full': %s" $fullParam -}}
+{{ end -}}
+
+{{- /* If any parameters are missing, print an error and exit */ -}}
+{{- if not $file -}}
+    {{- errorf "%s: %q: Missing required parameters! Got: path=%q!" .Position .Name $file -}}
+{{- else -}}
+
+    {{- /* Force-check if the file exists */ -}}
+    {{ $tmp := os.Stat $file }}
+    {{- $content := readFile $file -}}
+
+    <ul class="nav nav-tabs">
+        <li class="nav-item">
+            <a class="nav-link active font-monospace" 
+                href="#body-{{ $id }}" 
+                aria-current="page" 
+                data-bs-toggle="collapse" 
+                data-bs-target=".multi-{{ $id }}" 
+                aria-expanded="false" 
+                aria-controls="body-{{ $id }} footer-{{ $id }}">
+                <small>{{ if $full }}{{ strings.TrimPrefix $basePath $file }}{{ else }}{{ path.Base $file }}{{ end }}</small>
+            </a>
+        </li>
+    </ul>
+    <div class="border-start border-end border-bottom mb-3">
+        <div class="collapse multi-{{ $id }}{{ if $show }} show{{ end }} syntax-highlight" id="body-{{ $id }}">
+            {{- highlight (trim $content "\r\n") $lang "" -}}
+        </div>
+        <div class="collapse multi-{{ $id }}{{ if not $show }} show{{ end }} p-3" id="footer-{{ $id }}"><i>...</i></div>
+    </div>
+{{- end -}}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.16.0-beta2",
+  "version": "0.16.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.16.0-beta2",
+      "version": "0.16.2",
       "license": "MIT",
       "devDependencies": {
         "@fortawesome/fontawesome-free": "^6.4.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.16.0-beta2",
+  "version": "0.16.2",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",