Merge pull request #1048 from gethinode/develop

Add maximized cover style

assets/scss/common/_styles.scss

@@ -146,6 +146,24 @@ $utilities: map-merge(
     }    
 }
 
+.main-cover {
+    height: 100vh;
+}    
+
+@include media-breakpoint-up(xxl) {
+    .main-cover {
+        height: calc(min(100vh, 1000px));
+    }    
+}
+
+/* stylelint-disable media-feature-range-notation */
+@media (min-height: 1400px) { 
+    .main-cover {
+        height: calc(min(100vh, 1000px));
+    }
+}
+/* stylelint-enable media-feature-range-notation */
+
 $utilities: map-merge(
     $utilities,
     (

assets/scss/components/_table.scss

@@ -7,6 +7,7 @@
 }
 
 .datatable-sorter {
+    padding-left: 0;
     padding-right: 1rem;
 }
 

config/postcss.config.js

@@ -27,6 +27,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
       './_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/gethinode/mod-simple-datatables/dist/simple-datatables.scss',
       './_vendor/github.com/twbs/bootstrap/scss/_carousel.scss',
       './_vendor/github.com/twbs/bootstrap/scss/_dropdown.scss',
       './_vendor/github.com/twbs/bootstrap/scss/_modal.scss',

data/structures/card-group.yml

@@ -122,6 +122,13 @@ arguments:
       Enables horizontal scrolling of the cards. By default, the card group
       wraps any cards beyond the amount of defined columns to a new line. When
       `scroll` is set to true, a horizontal scroll bar is added instead.
+  spacer:
+    type: bool
+    optional: true
+    comment: >-
+      Inserts a spacer before the card.
+    release: v0.24.16
+    group: partial
   hook:
     type: string
     optional: true

data/structures/card.yml

@@ -90,6 +90,18 @@ arguments:
         - publication
         - tags
         - none
+  body:
+    type: select
+    optional: true
+    default: full
+    parent: cascade
+    release: v0.24.16
+    comment: >-
+      Body of the card. 
+    options:
+      values:
+        - full
+        - none
   footer:
     type: select
     optional: true
@@ -146,6 +158,16 @@ arguments:
         - 16x9
         - 21x9
     group: partial
+  portrait:
+    type: bool
+    parent: cascade
+    optional: true
+    default: false
+    release: v0.24.16
+    comment: >-
+      Flag to adjust the ratio from landscape to portrait. The image itself is
+      not rotated, only the crop area is adjusted. Not applicable to vector
+      graphics.
   alt:
     type: string
     optional: true

exampleSite/content/en/blog/bootstrap-elements.md

@@ -255,11 +255,12 @@ As an example, the following shortcodes show a square check, a brand logo, a cir
 
 ## Image
 
-As an example, the following shortcode displays an image with rounded corners and a 21x9 aspect ratio.
+As an example, the following shortcode displays an image with rounded corners and a 4x3 aspect ratio in portrait mode.
 
 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
-{{</* image src="img/flowers.jpg" ratio="21x9" caption="Figure caption" class="rounded" */>}}
+{{</* image src="img/flowers.jpg" ratio="4x3" caption="Figure caption" class="rounded col-md-6"
+  portrait=true wrapper="text-center" */>}}
 {{< /example >}}
 <!-- markdownlint-enable MD037 -->
 

exampleSite/hugo_stats.json

@@ -145,6 +145,7 @@
       "col-md-2",
       "col-md-3",
       "col-md-4",
+      "col-md-6",
       "col-md-8",
       "col-md-9",
       "col-md-auto",

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/gethinode/mod-katex v1.1.0 // indirect
 	github.com/gethinode/mod-leaflet v1.1.0 // indirect
 	github.com/gethinode/mod-lottie v1.5.5 // indirect
-	github.com/gethinode/mod-simple-datatables v1.0.2 // indirect
+	github.com/gethinode/mod-simple-datatables v1.0.3 // indirect
 	github.com/gethinode/mod-utils/v2 v2.3.10 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20240110101704-4c3966709f85 // indirect
 	github.com/twbs/bootstrap v5.3.3+incompatible // indirect

go.sum

@@ -188,6 +188,8 @@ github.com/gethinode/mod-simple-datatables v1.0.0 h1:Dj4WGw12OkaimwkCpLn5Jhmd49d
 github.com/gethinode/mod-simple-datatables v1.0.0/go.mod h1:K8T7fIdb8pMOB+OSW4A5lz5IW99+HyzcTgx764fvOGw=
 github.com/gethinode/mod-simple-datatables v1.0.2 h1:zhqxHet3iLQWYCBbGROALpOY9zQlptMycFkz1Tto5bA=
 github.com/gethinode/mod-simple-datatables v1.0.2/go.mod h1:mmrcvAJU2i3SMU56VmQ5PW43uDXBcsJKcZwCHrvl3Kc=
+github.com/gethinode/mod-simple-datatables v1.0.3 h1:JL2nBlEHWMmkE7EZrpfpmzka47dklJUh23/xKJkOQoI=
+github.com/gethinode/mod-simple-datatables v1.0.3/go.mod h1:mmrcvAJU2i3SMU56VmQ5PW43uDXBcsJKcZwCHrvl3Kc=
 github.com/gethinode/mod-utils v1.0.0 h1:cqHm2xS5uDiJzRm1KfHaNbq6uMVDKLhQa8/BuTZ1nhY=
 github.com/gethinode/mod-utils v1.0.0/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE=
 github.com/gethinode/mod-utils v1.0.1 h1:jhZGlGFHHL1f5HXbBMXfiZ2gCz4TVafAzjnRPTIBSEE=

i18n/de.yaml

@@ -28,7 +28,7 @@
 - id: shareLink
   translation: "Diese Seite teilen per {{ . }}"
 - id: shareSystem
-  translation: "Betriebssystem"
+  translation: "System"
 - id: copyToClipboard
   translation: "In die Zwischenablage kopieren"
 - id: copiedToClipboard
@@ -52,7 +52,7 @@
 
 # Navigation
 - id: colorMode
-  translation: "Thema umschalten"
+  translation: "Modus umschalten"
 - id: colorLight
   translation: "Light"
 - id: colorDark
@@ -76,7 +76,7 @@
 
 # Sidebar
 - id: toggleSidebar
-  translation: "Menünavigation anzuzeigen oder auszublenden"
+  translation: "Menünavigation anzeigen oder ausblenden"
 
 # Feature
 - id: addedFeature

layouts/partials/assets/card-group.html

@@ -23,9 +23,11 @@
 {{- $color := .color -}}
 {{- $padding := .padding -}}
 {{- $header := .header -}}
+{{- $body := .body -}}
 {{- $footer := .footer -}}
 {{- $orientation := .orientation -}}
 {{- $ratio := .ratio -}}
+{{- $portrait := .portrait | default false -}}
 {{- $wrapper := .wrapper | default "p-0" -}}
 {{- $style := .style -}}
 {{- $align := .align -}}
@@ -36,7 +38,9 @@
 {{- $buttonType := .buttonType -}}
 {{- $iconRounded := .iconRounded }}
 {{- $scroll := .scroll | default false }}
+{{- $spacer := .spacer | default false }}
 {{- $hook := .hook | default "assets/card.html" }}
+{{- $cols := string .cols | default "3" -}}
 
 <!-- Override arguments -->
 {{ $isPages := in (slice "page.Pages" "resource.Resources") (printf "%T" $pages) }}
@@ -50,6 +54,13 @@
     {{ $pages = first $paginator.PageSize (after (mul (sub $paginator.PageNumber 1) $paginator.PageSize) $pages) }}
 {{ end }}
 
+{{ $cardWrapper := "" }}
+{{ if $scroll }}
+    {{ $cardWrapper = printf "card-block card-block-%d" (int $cols) }}
+{{ end }}
+
+{{ if not $spacer }}{{ $class = printf "%s h-100" $class }}{{ end }}
+
 {{ $list := slice }}
 {{ if $isPages }}
     {{ range $index, $element := $pages }}
@@ -79,13 +90,10 @@
 {{- $max := $count -}}
 {{- $max = math.Min (.max | default $count) $count -}}
 {{- $responsive := .responsive | default true -}}
-{{- $cols := string .cols | default "3" -}}
 
 {{- $sizes := "100vw" }}
 {{- $colGrid := "" -}}
-{{ if $scroll }}
-    {{- $colGrid = (printf "card-block-%d" $cols) -}}
-{{ else }}
+{{ if not $scroll }}
     {{ $colGrid = printf "row-cols-%s" $cols }}
     {{- if eq $cols "1" }}
         {{ $colGrid = "row-cols-1" -}}
@@ -120,18 +128,20 @@
 
 <!-- Main code -->
 <div class="container {{ $wrapper }} {{ if $scroll }}card-container-wrapper{{ end }}">
-    <div class="row g-{{ $gutter }} {{ if $scroll }}d-flex flex-row flex-nowrap card-container scrollbar-horizontal pb-4 w-100{{ else }}{{ $colGrid }}{{ end }}">
+    <div class="row g-{{ $gutter }} {{ if $scroll }}d-flex flex-row flex-nowrap card-container scrollbar-horizontal pb-4 w-100 {{ end  }} {{ $colGrid }}">
         {{ range $index, $element := $list }}
             {{- $params := (dict
-                "class" (printf "h-100 %s" $class)
+                "class" (printf " %s" $class)
                 "color" $color
                 "footer" $footer
+                "body" $body
                 "header" $header
                 "loading" $loading
                 "sizes" $sizes
                 "orientation" $orientation
                 "padding" $padding
                 "ratio" $ratio
+                "portrait" $portrait
                 "subtle" $subtle
                 "style" $style
                 "align" $align
@@ -142,7 +152,8 @@
             ) -}}
             {{- $params = merge $element $params }}
 
-            <div class="col">
+            <div class="{{ with $cardWrapper }}{{ . }}{{ else }}col{{ end }}">
+                {{ if $spacer }}<div class="spacer"></div>{{ end }}
                 {{- partial $hook $params -}}
             </div>
             {{- if and (lt $index (sub $max 1)) $separator -}}

layouts/partials/assets/card.html

@@ -15,6 +15,7 @@
 {{- $class := .class -}}
 {{- $color := .color -}}
 {{- $description := .description -}}
+{{- $body := .body | default "full" -}}
 {{- $footer := .footer | default "none" -}}
 {{- $gutter := .gutter | default "0" -}}
 {{- $header := .header | default "full" -}}
@@ -29,6 +30,7 @@
 {{- $orientation := .orientation | default "stacked" -}}
 {{- $padding := (string .padding) | default "auto" -}}
 {{- $ratio := .ratio -}}
+{{- $portrait := .portrait | default false -}}
 {{- $thumbnail := .thumbnail -}}
 {{- $title := .title -}}
 {{- $subtle := .subtle -}}
@@ -58,6 +60,9 @@
     {{- if not $href }}{{ $href = .RelPermalink  }}{{ end -}}
     {{- if not $description }}{{ $description = partial "utilities/GetDescription.html" (dict "page" .) }}{{ end -}}
     {{- if not $thumbnail }}{{ $thumbnail = (or (and (reflect.IsMap .Params.Thumbnail) .Params.Thumbnail.url) .Params.Thumbnail) }}{{ end -}}
+    {{ if not $ratio }}
+        {{- if and (reflect.IsMap .Params.Thumbnail) .Params.Thumbnail.ratio }}{{ $ratio = .Params.Thumbnail.ratio }}{{ end -}}
+    {{ end }}
     {{- if not $icon }}{{ $icon = .Params.icon }}{{ end -}}
 {{- end -}}
 
@@ -69,6 +74,7 @@
 {{ end }}
 
 {{- if eq $orientation "none" }}{{ $thumbnail = "" }}{{ $icon = "" }}{{ end -}}
+{{- if eq $body "none" }}{{ $description = "" }}{{ end -}}
 
 <!-- Inline partial to render the card's body -->
 {{- define "partials/card-body.html" -}}
@@ -161,7 +167,7 @@
         <div class="row g-0 row-cols-2 h-100{{ if $button }} pb-5{{ end }}">
             {{- if $thumbnail -}}
                 <div class="{{ $col1 }}">
-                    {{- partial $hook (dict "url" $thumbnail "ratio" (or $ratio "1x1") "sizes" $sizes "wrapper" "h-100 card-img-wrap" "class" "rounded-start card-img-h100 card-img-bg" "title" $title "loading" $loading) -}}
+                    {{- partial $hook (dict "url" $thumbnail "ratio" (or $ratio "1x1") "portrait" $portrait "sizes" $sizes "wrapper" "h-100 card-img-wrap" "class" "rounded-start card-img-h100 card-img-bg" "title" $title "loading" $loading) -}}
                 </div>
             {{- else if $icon -}}
                 <div class="{{ $col1 }} p-{{ $padding }}">
@@ -206,7 +212,7 @@
     <!-- Render stacked / default card -->
     <div class="card {{ $colorStyle }} {{ $class }} text-{{ $align }}">
         {{- if $thumbnail -}}
-            {{- partial $hook (dict "url" $thumbnail "ratio" (or $ratio "16x9") "sizes" $sizes "wrapper" "card-img-wrap" "class" "card-img-top card-img-bg" "title" (or $alt $title) "loading" $loading) -}}
+            {{- partial $hook (dict "url" $thumbnail "ratio" (or $ratio "16x9") "portrait" $portrait "sizes" $sizes "wrapper" "card-img-wrap" "class" "card-img-top card-img-bg" "title" (or $alt $title) "loading" $loading) -}}
         {{- else if $icon -}}
             <div class="card-icon p-{{ $padding }} {{ $iconStyle }} text-{{ $align }} {{ if $iconRounded }}fa-stack {{ $stack }}{{ end }} w-100">
                 {{ if $iconRounded }}

layouts/partials/assets/helpers/image-definition.html

@@ -31,6 +31,7 @@
     "page" $page
     "url" .url
     "ratio" $ratio
+    "portrait" $portrait
     "plain" $plain 
     "imageset" true
 ) }}
@@ -49,24 +50,26 @@
 <!-- Generate image definition -->
 {{- if $caption -}}
     <figure {{ with $wrapper }}class="{{ . }}"{{ end }}>
+{{ else }}
+    {{ with $wrapper }}<div class="{{ . }}">{{ end }}
+{{ end }}
+{{- if not $anchor -}}
+    <img class="img-fluid {{ $class }}"
+        src="{{ $fallbackURL }}"
+        {{ if $lazy }}loading="lazy"{{ end }}
+        {{ with $priority }}fetchpriority="{{ . }}"{{ end }}
+        {{ with $imgset -}}srcset="{{ . }}" sizes="{{ $sizes }}"{{- end }}
+        {{ with $height }}height="{{ . }}"{{ end }}
+        {{ with $width }}width="{{ . }}"{{ end }}
+        {{ with (or $title $caption) }}alt="{{ . }}"{{ end }}>
+{{- else }}
+    <svg class="{{ $class }}">
+        <use href="{{ $fallbackURL }}#{{ $anchor }}"></use>
+    </svg>
 {{ end }}
-<div class="{{ if not $caption }}{{ $wrapper }}{{ end }}">        
-    {{- if not $anchor -}}
-        <img class="img-fluid {{ $class }}"
-            src="{{ $fallbackURL }}"
-            {{ if $lazy }}loading="lazy"{{ end }}
-            {{ with $priority }}fetchpriority="{{ . }}"{{ end }}
-            {{ with $imgset -}}srcset="{{ . }}" sizes="{{ $sizes }}"{{- end }}
-            {{ with $height }}height="{{ . }}"{{ end }}
-            {{ with $width }}width="{{ . }}"{{ end }}
-            {{ with (or $title $caption) }}alt="{{ . }}"{{ end }}>
-    {{- else }}
-        <svg class="{{ $class }}">
-            <use href="{{ $fallbackURL }}#{{ $anchor }}"></use>
-        </svg>
-    {{ end }}
-</div>
 {{- if $caption -}}
         <figcaption class="figure-caption{{ with $figclass }} {{ . }}{{ end }}">{{ $caption | safeHTML }}</figcaption>
     </figure>
+{{ else if $wrapper }}
+    </div>
 {{- end -}}

layouts/partials/assets/helpers/image-dimension.html

@@ -2,6 +2,7 @@
 {{- $page := .page -}}
 {{- $url := .url -}}
 {{- $ratio := .ratio -}}
+{{- $portrait := .portrait -}}
 {{- $height := .height -}}
 {{- $width := .width -}}
 {{- $plain := .plain | default false }}
@@ -84,10 +85,27 @@
 
 <!-- Derive image width and height -->
 {{ if not $plain }}
-    {{ with $dims }}
-        {{ range $dim := (. | last 1) }}
-            {{ $width = (int (index (split $dim "x") 0)) }}
-            {{ $height = (int (index (split $dim "x") 1)) }}
+    {{ if $portrait }}
+        {{ with $dims }}
+            {{ $newDims := slice }}
+            {{ range $dim := . }}
+                {{ $width = (int (index (split $dim "x") 1)) }}
+                {{ $height = (int (index (split $dim "x") 0)) }}
+                {{- $newDims = $newDims | append (printf "%dx%d" (int $width) $height ) -}}
+            {{ end }}
+            {{ $dims = $newDims }}
+        {{ end }}
+
+        {{ $newWidth := $height }}
+        {{ $newHeight := $width }}
+        {{ $width = $newWidth }}
+        {{ $height = $newHeight }}
+    {{ else  }}
+        {{ with $dims }}
+            {{ range $dim := (. | last 1) }}
+                {{ $width = (int (index (split $dim "x") 0)) }}
+                {{ $height = (int (index (split $dim "x") 1)) }}
+            {{ end }}
         {{ end }}
     {{ end }}
 {{ end }}

layouts/partials/assets/navbar-item.html

@@ -24,7 +24,7 @@
 {{- $menuURL := "" -}}
 {{ if or (strings.HasPrefix $menu.PageRef "http") (strings.HasPrefix $menu.URL "http") }}
     {{ $menuURL = or $menu.PageRef $menu.URL }}
-{{ else }}
+{{ else if (or $menu.PageRef $menu.URL) }}
     {{- $menuURL = urls.JoinPath $baseURL ((or $menu.PageRef $menu.URL) | relLangURL) -}}
 {{ end }}
 {{- $pageURL := $page.RelPermalink -}}
@@ -47,6 +47,11 @@
     {{- if $cue -}}
         {{ $suffix = partial "assets/icon.html" (dict "icon" "fas up-right-from-square fa-2xs") }}
     {{- end -}}
+{{ else if $menuURL }}
+    {{ $ref := partial "utilities/GetPage.html" (dict "url" $url.Path "page" $page) }}
+    {{- if not $ref -}}
+        {{- warnf "partial [assets/navbar-item.html] - Cannot find page of menu item '%s': %s" $menu.Name $url -}}
+    {{ end }}
 {{ end -}}
 
 {{- $mainNav := urlize (lower $menu.Name) -}}
@@ -82,7 +87,7 @@
         <a class="{{ $anchorClass }}{{ if $isActive }} active{{ end }}{{ with $class }} {{ . }}{{ end }}" 
             {{ if $isIcon }}aria-label="{{ $menu.Name }}"{{ end }}
             data-nav="main" data-nav-main="{{ $mainNav }}"{{ with $childNav }} data-nav-child="{{ . }}"{{ end }} 
-            href="{{ $menuURL }}{{ $params | safeHTMLAttr }}"{{ with $externalHref }} {{ . | safeHTMLAttr }}{{ end }} {{ $button | safeHTMLAttr }}>
+            {{ if $menuURL }} href="{{ $menuURL }}{{ $params | safeHTMLAttr }}"{{ with $externalHref }} {{ . | safeHTMLAttr }}{{ end }}{{ end }} {{ $button | safeHTMLAttr }}>
             
             {{- with $menu.Pre }}
                 {{ if hasPrefix . "<i" }}

package-lock.json

@@ -1,19 +1,19 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.24.14",
+  "version": "0.24.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.24.14",
+      "version": "0.24.19",
       "license": "MIT",
       "dependencies": {
         "@fullhuman/postcss-purgecss": "^6.0.0",
         "autoprefixer": "^10.4.19",
         "cssnano": "^7.0.4",
         "cssnano-preset-advanced": "^7.0.4",
-        "hugo-bin": "0.125.2",
+        "hugo-bin": "0.126.0",
         "purgecss-whitelister": "^2.4.0"
       },
       "devDependencies": {
@@ -22,7 +22,7 @@
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-n": "^16.6.2",
-        "eslint-plugin-promise": "^6.4.0",
+        "eslint-plugin-promise": "^6.6.0",
         "markdownlint-cli2": "^0.13.0",
         "netlify-plugin-hugo-cache-resources": "^0.2.1",
         "npm-run-all": "^4.1.5",
@@ -2296,9 +2296,9 @@
       }
     },
     "node_modules/eslint-plugin-promise": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.4.0.tgz",
-      "integrity": "sha512-/KWWRaD3fGkVCZsdR0RU53PSthFmoHVhZl+y9+6DqeDLSikLdlUVpVEAmI6iCRR5QyOjBYBqHZV/bdv4DJ4Gtw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz",
+      "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3313,9 +3313,9 @@
       }
     },
     "node_modules/hugo-bin": {
-      "version": "0.125.2",
-      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.125.2.tgz",
-      "integrity": "sha512-JNjhuoGFBwJo6qDOeYUiXSoD7rPbwY36wyHJaqbRe9APNY1nPGO1Yy/Ut7rLcriKTBWKPZrh5Hz+9PzGnLV5Lw==",
+      "version": "0.126.0",
+      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.126.0.tgz",
+      "integrity": "sha512-tncBaQ1Gku3eVKB7PUiubj1VGXdTVB7OCYgrRqwlxxYMaIte9weg+uvEkZLJZJItNMv2wV2GpfIXblS5mLlvvg==",
       "funding": [
         {
           "type": "github",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.24.14",
+  "version": "0.24.19",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",
@@ -71,7 +71,7 @@
     "autoprefixer": "^10.4.19",
     "cssnano": "^7.0.4",
     "cssnano-preset-advanced": "^7.0.4",
-    "hugo-bin": "0.125.2",
+    "hugo-bin": "0.126.0",
     "purgecss-whitelister": "^2.4.0"
   },
   "devDependencies": {
@@ -80,7 +80,7 @@
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.4.0",
+    "eslint-plugin-promise": "^6.6.0",
     "markdownlint-cli2": "^0.13.0",
     "netlify-plugin-hugo-cache-resources": "^0.2.1",
     "npm-run-all": "^4.1.5",