Merge pull request #1083 from nunocoracao/dev

🔖 v2.46.0

.github/workflows/firebase-preview.yml

@@ -8,6 +8,9 @@ jobs:
       
       - name: Hugo setup
         uses: peaceiris/actions-hugo@v2.6.0
+        with: 
+          hugo-version: 0.115.4
+          extended: true
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
 

.github/workflows/firebase-production.yml

@@ -10,6 +10,9 @@ jobs:
       
       - name: Hugo setup
         uses: peaceiris/actions-hugo@v2.6.0
+        with: 
+          hugo-version: 0.120.4
+          extended: true
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
 

assets/css/compiled/main.css

@@ -4914,6 +4914,10 @@ body:has(#menu-controller:checked) {
 
 /* Custom */
 
+pre {
+  text-align: left;
+}
+
 .thumbnail {
   min-width: 300px;
   height: 180px;

assets/css/main.css

@@ -339,6 +339,10 @@ body:has(#menu-controller:checked) {
 
 /* Custom */
 
+pre {
+  text-align: left;
+}
+
 .thumbnail {
   min-width: 300px;
   height: 180px;

config/_default/params.toml

@@ -15,7 +15,8 @@ enableCodeCopy = false
 # mainSections = ["section1", "section2"]
 # robots = ""
 
-disableImageOptimization = true
+disableImageOptimization = false
+disableTextInHeader = false
 
 # defaultBackgroundImage = "IMAGE.jpg" # used as default for background images 
 # defaultFeaturedImage = "IMAGE.jpg" # used as default for featured images in all articles

exampleSite/config/_default/params.toml

@@ -16,6 +16,7 @@ mainSections = ["docs"]
 # robots = ""
 
 disableImageOptimization = false
+disableTextInHeader = false
 
 defaultBackgroundImage = "/img/ocean.jpg"
 defaultFeaturedImage = "/img/ocean.jpg"

exampleSite/content/docs/configuration/index.md

@@ -167,6 +167,7 @@ Many of the article defaults here can be overridden on a per article basis by sp
 | `robots`                        | _Not set_    | String that indicates how robots should handle your site. If set, it will be output in the page head. Refer to [Google's docs](https://developers.google.com/search/docs/advanced/robots/robots_meta_tag#directives) for valid values.            |
 | `disableImageZoom`              | `false`      | Disables image zoom feature across all the images in the site.                                                                                                                                                                                    |
 | `disableImageOptimization`      | `false`      | Disables image resize and optimization features across all the images in the site.                                                                                                                                                                |
+| `disableTextInHeader`           | `false`      | Disables text in header, useful for logo based headers.                                                                                                                                                                                           |
 | `defaultBackgroundImage`        | _Not set_    | Default background image for both `background` homepage layout and `background` hero style                                                                                                                                                        |
 | `defaultFeaturedImage`          | _Not set_    | Default background image for all `featured` images across articles, will be overriden by a local `featured` image.                                                                                                                                |
 | `highlightCurrentMenuArea`      | _Not set_    | Marks menu entries in the main manu when selected                                                                                                                                                                                                 |

exampleSite/content/docs/shortcodes/index.md

@@ -16,12 +16,12 @@ In addition to all the [default Hugo shortcodes](https://gohugo.io/content-manag
 `alert` outputs its contents as a stylised message box within your article. It's useful for drawing attention to important information that you don't want the reader to miss.
 
 <!-- prettier-ignore-start -->
-| Parameter      | Description                                                                                                                                                                                |
-| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `icon`         | **Optional.** the icon to display on the left side.<br>**Default:** `exclaimation triangle icon` (Check out the [icon shortcode](#icon) for more details on using icons.)                    |
-| `iconColor`    | **Optional.** the color for the icon in basic CSS style.<br>Can be either hex values (`#FFFFFF`) or color names (`white`)<br>By default chosen based on the current color theme .              |
-| `cardColor`    | **Optional.** the color for the card background in basic CSS style.<br>Can be either hex values (`#FFFFFF`) or color names (`white`)<br>By default chosen based on the current color theme .   |
-| `textColor`    | **Optional.** the color for the text in basic CSS style.<br>Can be either hex values (`#FFFFFF`) or color names (`white`)<br>By default chosen based on the current color theme .              |
+| Parameter   | Description                                                                                                                                                                                  |
+| ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `icon`      | **Optional.** the icon to display on the left side.<br>**Default:** `exclaimation triangle icon` (Check out the [icon shortcode](#icon) for more details on using icons.)                    |
+| `iconColor` | **Optional.** the color for the icon in basic CSS style.<br>Can be either hex values (`#FFFFFF`) or color names (`white`)<br>By default chosen based on the current color theme .            |
+| `cardColor` | **Optional.** the color for the card background in basic CSS style.<br>Can be either hex values (`#FFFFFF`) or color names (`white`)<br>By default chosen based on the current color theme . |
+| `textColor` | **Optional.** the color for the text in basic CSS style.<br>Can be either hex values (`#FFFFFF`) or color names (`white`)<br>By default chosen based on the current color theme .            |
 <!-- prettier-ignore-end -->
 
 The input is written in Markdown so you can format it however you please.
@@ -297,7 +297,7 @@ In order to add images to the gallery, use `img` tags for each image and add `cl
 
 <!-- prettier-ignore-start -->
 | Parameter | Description                                           |
-|-----------|-------------------------------------------------------|
+| --------- | ----------------------------------------------------- |
 | `repo`    | [String] github repo in the format of `username/repo` |
 <!-- prettier-ignore-end -->
 
@@ -320,7 +320,7 @@ Finaly custom GitLab instace URL can be provided, as long as the `api/v4/project
 
 <!-- prettier-ignore-start -->
 | Parameter   | Description                                                            |
-|-------------|------------------------------------------------------------------------|
+| ----------- | ---------------------------------------------------------------------- |
 | `projectID` | [String] gitlab numeric ProjectID                                      |
 | `baseURL`   | [String] optional gitlab instace URL, default is `https://gitlab.com/` |
 <!-- prettier-ignore-end -->
@@ -400,12 +400,13 @@ When life gives you lemons, make lemonade.
 `List` will display a list of recent articles. This shortcode requires a limit value to constraint the list. Additionally, it supports a `where` and a `value` in order to filter articles by their parameters. Note that this shortcode will not display its parent page but it will count for the limit value.
 
 <!-- prettier-ignore-start -->
-| Parameter | Description                                                                                                                                             |
-| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `limit`   | **Required.** the number of recent articles to display.                                                                                                 |
-| `title`   | Optional title for the list, default is `Recent`                                                                                                        |
-| `where`   | The variable to be used for the query of articles e.g. `Type`                                                                                           |
-| `value`   | The value that will need to match the parameter defined in `where` for the query of articles e.g. for `where` == `Type` a valid value could be `sample` |
+| Parameter  | Description                                                                                                                                             |
+| ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `limit`    | **Required.** the number of recent articles to display.                                                                                                 |
+| `title`    | Optional title for the list, default is `Recent`                                                                                                        |
+| `cardView` | Optional card view enabled for the list, default is `false`                                                                                             |
+| `where`    | The variable to be used for the query of articles e.g. `Type`                                                                                           |
+| `value`    | The value that will need to match the parameter defined in `where` for the query of articles e.g. for `where` == `Type` a valid value could be `sample` |
 
 {{< alert >}}
 The `where` and `value` values are used in the following query `where .Site.RegularPages $where $value` in the code of the shortcode. Check [Hugo docs](https://gohugo.io/variables/page/) to learn more about which parameters are available to use.
@@ -424,10 +425,10 @@ The `where` and `value` values are used in the following query `where .Site.Regu
 **Example #2:**
 
 ```md
-{{</* list title="Samples" limit=5 where="Type" value="sample" */>}}
+{{</* list title="Samples" cardView=true limit=5 where="Type" value="sample" */>}}
 ```
 
-{{< list title="Samples" limit=5 where="Type" value="sample">}}
+{{< list title="Samples" cardView=true limit=6 where="Type" value="sample">}}
 
 <br/><br/><br/>
 

exampleSite/content/users/BoringTech.net/index.md

@@ -0,0 +1,13 @@
+---
+                title: "BoringTech.net"
+                tags: [Personal Site,Blog]
+                externalUrl: "https://boringtech.net/"
+                date: 9928-08-08
+                showDate: false
+                showAuthor: false
+                showReadingTime: false
+                showEdit: false
+                showLikes: false
+                showViews: false
+                layoutBackgroundHeaderSpace: false
+                
---

exampleSite/content/users/blog.stonegarden.dev/index.md

@@ -0,0 +1,13 @@
+---
+                title: "blog.stonegarden.dev"
+                tags: [Personal Site]
+                externalUrl: "https://blog.stonegarden.dev/"
+                date: 9930-08-08
+                showDate: false
+                showAuthor: false
+                showReadingTime: false
+                showEdit: false
+                showLikes: false
+                showViews: false
+                layoutBackgroundHeaderSpace: false
+                
---

exampleSite/content/users/renaud.warnotte.be/index.md

@@ -0,0 +1,13 @@
+---
+                title: "renaud.warnotte.be"
+                tags: [Personal site]
+                externalUrl: "https://renaud.warnotte.be"
+                date: 9929-08-08
+                showDate: false
+                showAuthor: false
+                showReadingTime: false
+                showEdit: false
+                showLikes: false
+                showViews: false
+                layoutBackgroundHeaderSpace: false
+                
---

exampleSite/content/users/users.json

@@ -482,5 +482,27 @@
     "tags": [
       "Personal Site"
     ]
+  },
+  {
+    "title": "blog.stonegarden.dev",
+    "url": "https://blog.stonegarden.dev/",
+    "tags": [
+      "Personal Site"
+    ]
+  },
+  {
+    "title": "renaud.warnotte.be",
+    "url": "https://renaud.warnotte.be",
+    "tags": [
+      "Personal site"
+    ]
+  },
+  {
+    "title": "BoringTech.net",
+    "url": "https://boringtech.net/",
+    "tags": [
+      "Personal Site",
+      "Blog"
+    ]
   }
 ]

layouts/_default/_markup/render-heading.html

@@ -1,8 +1,10 @@
-<div id="{{ .Anchor | safeURL }}" class="anchor"></div>
 <h{{ .Level }} class="relative group">{{ .Text | safeHTML }} 
-    {{ if.Page.Params.showHeadingAnchors | default (.Page.Site.Params.article.showHeadingAnchors | default true) }}<span
+    <div id="{{ .Anchor | safeURL }}" class="anchor"></div>
+    {{ if.Page.Params.showHeadingAnchors | default (.Page.Site.Params.article.showHeadingAnchors | default true) }}
+    <span
         class="absolute top-0 w-6 transition-opacity opacity-0 ltr:-left-6 rtl:-right-6 not-prose group-hover:opacity-100">
         <a class="group-hover:text-primary-300 dark:group-hover:text-neutral-700"
-            style="text-decoration-line: none !important;" href="#{{ .Anchor | safeURL }}" aria-label="{{ i18n "article.anchor_label" }}">#</a></span>        
+            style="text-decoration-line: none !important;" href="#{{ .Anchor | safeURL }}" aria-label="{{ i18n "article.anchor_label" }}">#</a>
+    </span>        
     {{ end }}
 </h{{ .Level }}>

layouts/partials/article-link/simple.html

@@ -2,7 +2,7 @@
 
 {{ $articleClasses := "flex flex-wrap article" }}
 {{ if .Site.Params.list.showCards }}
-{{ $articleClasses = delimit (slice $articleClasses "border border-neutral-200 dark:border-neutral-700 border-2 rounded-md backdrop-blur") " " }}
+{{ $articleClasses = delimit (slice $articleClasses "border border-neutral-200 dark:border-neutral-700 border-2 rounded-md backdrop-blur overflow-hidden") " " }}
 {{ else }}
 {{ $articleClasses = delimit (slice $articleClasses "") " " }}
 {{ end }}

layouts/partials/article-meta/basic.html

@@ -47,7 +47,7 @@
 {{ end }}
 
 
-<div class="flex flex-row flex-wrap items-center">
+<div style="cursor: default;" class="flex flex-row flex-wrap items-center">
   {{/* Output partials */}}
   {{ with ($meta.Get "partials") }}
   {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" | safeHTML }}
@@ -60,7 +60,7 @@
 </div>
 
 {{ if .Params.showAuthorsBadges | default (.Site.Params.article.showAuthorsBadges | default false) }}
-<div class="flex flex-row flex-wrap items-center">
+<div style="cursor: pointer;" class="flex flex-row flex-wrap items-center">
   {{ range $taxonomy, $terms := .Site.Taxonomies }}
   {{ if (eq $taxonomy "authors")}}
   {{ if (gt (len ($context.GetTerms $taxonomy)) 0) }}
@@ -75,7 +75,7 @@
 
 {{/* Output taxonomies */}}
 {{ if .Params.showTaxonomies | default (.Site.Params.article.showTaxonomies | default false) }}
-<div class="flex flex-row flex-wrap items-center">
+<div style="cursor: pointer;" class="flex flex-row flex-wrap items-center">
   {{ range $taxonomy, $terms := .Site.Taxonomies }}
   {{ if and (not (eq $taxonomy "authors")) (not (eq $taxonomy "series"))}}
   {{ if (gt (len ($context.GetTerms $taxonomy)) 0) }}

layouts/partials/head.html

@@ -73,7 +73,9 @@
     integrity="{{ $bundleJS.Data.Integrity }}" data-copy="{{ i18n " code.copy" }}" data-copied="{{ i18n " code.copied"
     }}"></script>
   {{ end }}
+  {{ if not .Site.Params.disableImageZoom | default true }}
   <script src="{{ "js/zoom.min.js" | relURL }}"></script>
+  {{ end }}
   {{/* Icons */}}
   {{ if templates.Exists "partials/favicons.html" }}
   {{ partialCached "favicons.html" .Site }}

layouts/partials/header/basic.html

@@ -17,10 +17,11 @@
     <div class="flex flex-1 items-center justify-between">
         <nav class="flex space-x-3">
 
+            {{ if not .Site.Params.disableTextInHeader | default true }}
             <a href="{{ "" | relLangURL }}" class="text-base font-medium text-gray-500 hover:text-gray-900">{{
                 .Site.Title | markdownify
                 | emojify }}</a>
-
+            {{ end }}
 
         </nav>
         <nav class="hidden md:flex items-center space-x-5 md:ml-12 h-12">
@@ -88,6 +89,7 @@
 
         <label id="menu-button" for="menu-controller" class="block">
             <input type="checkbox" id="menu-controller" class="hidden" />
+            {{ if .Site.Menus.main }}
             <div class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400">
                 {{ partial "icon.html" "bars" }}
             </div>
@@ -104,13 +106,11 @@
                             "xmark" }}</span>
                     </li>
 
-                    {{ if .Site.Menus.main }}
                     {{ range .Site.Menus.main }}
 
                     {{ partial "header/header-mobile-option.html" . }}
 
                     {{ end }}
-                    {{ end }}
 
                 </ul>
                 {{ if .Site.Menus.subnavigation }}
@@ -137,6 +137,7 @@
 
                 </ul>
                 {{ end }}
+                {{ end }}
 
             </div>
         </label>

layouts/partials/home/background.html

@@ -42,7 +42,7 @@
                         <div class="flex flex-wrap">
                             {{ range $links := . }}
                             {{ range $name, $url := $links }}
-                            <a class="px-2 hover:text-primary-400 text-primary-800 dark:text-primary-200" href="{{ $url }}" target="_blank"
+                            <a class="px-1 hover:text-primary-400 text-primary-800 dark:text-primary-200" href="{{ $url }}" target="_blank"
                                 aria-label="{{ $name | title }}" rel="me noopener noreferrer">{{ partial
                                 "icon.html" $name }}</a>
                             {{ end }}

layouts/partials/home/hero.html

@@ -39,7 +39,7 @@
                         <div class="flex flex-wrap">
                             {{ range $links := . }}
                             {{ range $name, $url := $links }}
-                            <a class="px-2 hover:text-primary-400 text-primary-300" href="{{ $url }}" target="_blank"
+                            <a class="px-1 hover:text-primary-400 text-primary-300" href="{{ $url }}" target="_blank"
                                 aria-label="{{ $name | title }}" rel="me noopener noreferrer">{{ partial
                                 "icon.html" $name }}</a>
                             {{ end }}

layouts/shortcodes/list.html

@@ -2,9 +2,32 @@
 {{ $limit := .Get "limit" | default 1 }}
 {{ $title := .Get "title" | default (i18n "shortcode.recent_articles" | emojify) }}
 {{ $parent := .Page.RelPermalink }}
+{{ $cardView := .Get "cardView" }}
 {{ $where := .Get "where" }}
 {{ $value := .Get "value" }}
 <h2 class="mt-20 text-2xl font-extrabold mb-10">{{ $title }}</h2>
+
+
+{{ if $cardView | default false}}
+
+<section class="w-full grid gap-4 sm:grid-cols-2 md:grid-cols-3">
+    {{ if $where }}
+        {{ range ( where .Site.RegularPages $where $value | first $limit ) }}
+            {{ if not (eq .RelPermalink $parent) }}
+                {{ partial "article-link/card.html" . }}
+            {{ end }}
+        {{end}}
+    {{ else }}
+        {{ range .Site.RegularPages | first $limit }}
+            {{ if not (eq .RelPermalink $parent) }}
+                {{ partial "article-link/card.html" . }}
+            {{ end }}
+        {{end}}
+    {{ end }}
+</section>
+
+{{ else }}
+
 <section class="space-y-10 w-full mt-10 mb-10">
     {{ if $where }}
         {{ range ( where .Site.RegularPages $where $value | first $limit ) }}
@@ -19,4 +42,6 @@
             {{ end }}
         {{end}}
     {{ end }}
-</section>
+</section>
+
+{{ end }}

package-lock.json

@@ -29,7 +29,7 @@
         "rimraf": "^5.0.5",
         "tailwindcss": "^3.3.5",
         "tw-elements": "1.0.0",
-        "typeit": "^8.7.1",
+        "typeit": "^8.8.0",
         "vendor-copy": "^3.0.1"
       }
     },
@@ -289,6 +289,12 @@
         "undici-types": "~5.26.4"
       }
     },
+    "node_modules/@types/web-animations-js": {
+      "version": "2.2.16",
+      "resolved": "https://registry.npmjs.org/@types/web-animations-js/-/web-animations-js-2.2.16.tgz",
+      "integrity": "sha512-ATELeWMFwj8eQiH0KmvsCl1V2lu/qx/CjOBmv4ADSZS5u8r4reMyjCXtxG7khqyiwH3IOMNdrON/Ugn94OUcRA==",
+      "dev": true
+    },
     "node_modules/@types/yauzl": {
       "version": "2.10.3",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
@@ -2920,11 +2926,14 @@
       }
     },
     "node_modules/typeit": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/typeit/-/typeit-8.7.1.tgz",
-      "integrity": "sha512-Bx/O4NMz10NWh9FWYtVwV4XwGHF9UDJfpCZPJRtw2/oUcahFAStU8J0t19aroPfTV6s1UlS5ICoqilOqmEnh2Q==",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/typeit/-/typeit-8.8.0.tgz",
+      "integrity": "sha512-GQp6OW7vxro1HN3F7UPL0C2KzkGs8bFtUgmJSeK+xNhdofI40mkWxrBT2AXQwtS5Txkg7ttwplxvWCQxnUXyrw==",
       "dev": true,
-      "hasInstallScript": true
+      "hasInstallScript": true,
+      "dependencies": {
+        "@types/web-animations-js": "^2.2.16"
+      }
     },
     "node_modules/ulid": {
       "version": "2.3.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.45.0",
+  "version": "2.46.0",
   "description": "Blowfish theme for Hugo",
   "scripts": {
     "fullinstall": "npm run preinstall && npm install && npm run postinstall",
@@ -47,7 +47,7 @@
     "rimraf": "^5.0.5",
     "tailwindcss": "^3.3.5",
     "tw-elements": "1.0.0",
-    "typeit": "^8.7.1",
+    "typeit": "^8.8.0",
     "vendor-copy": "^3.0.1"
   },
   "vendorCopy": [],