Merge pull request #840 from nunocoracao/dev

🔖 v2.38.0

.github/workflows/pages.yml

@@ -51,7 +51,7 @@ jobs:
         run: |
           hugo --minify -s exampleSite --themesDir ../.. -d ../docs --baseURL https://nunocoracao.github.io/blowfish/
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v2
         with:
           path: ./docs
 

FUNDING.yml

@@ -0,0 +1,2 @@
+github: [nunocoracao]
+custom: ["https://www.paypal.me/nunocoracao", "https://www.buymeacoffee.com/nunocoracao"]

assets/css/compiled/main.css

@@ -1,6 +1,6 @@
 /*! Blowfish | MIT License | https://github.com/nunocoracao/blowfish */
 
-/*! tailwindcss v3.3.2 | MIT License | https://tailwindcss.com */
+/*! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com */
 
 /*
 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
@@ -191,6 +191,10 @@ select,
 textarea {
   font-family: inherit;
   /* 1 */
+  font-feature-settings: inherit;
+  /* 1 */
+  font-variation-settings: inherit;
+  /* 1 */
   font-size: 100%;
   /* 1 */
   font-weight: inherit;
@@ -341,6 +345,14 @@ menu {
   padding: 0;
 }
 
+/*
+Reset default styling for dialogs.
+*/
+
+dialog {
+  padding: 0;
+}
+
 /*
 Prevent resizing textareas horizontally by default.
 */
@@ -422,7 +434,7 @@ video {
   display: none;
 }
 
-[type='text'],[type='email'],[type='url'],[type='password'],[type='number'],[type='date'],[type='datetime-local'],[type='month'],[type='search'],[type='tel'],[type='time'],[type='week'],[multiple],textarea,select {
+[type='text'],input:where(:not([type])),[type='email'],[type='url'],[type='password'],[type='number'],[type='date'],[type='datetime-local'],[type='month'],[type='search'],[type='tel'],[type='time'],[type='week'],[multiple],textarea,select {
   -webkit-appearance: none;
      -moz-appearance: none;
           appearance: none;
@@ -439,7 +451,7 @@ video {
   --tw-shadow: 0 0 #0000;
 }
 
-[type='text']:focus, [type='email']:focus, [type='url']:focus, [type='password']:focus, [type='number']:focus, [type='date']:focus, [type='datetime-local']:focus, [type='month']:focus, [type='search']:focus, [type='tel']:focus, [type='time']:focus, [type='week']:focus, [multiple]:focus, textarea:focus, select:focus {
+[type='text']:focus, input:where(:not([type])):focus, [type='email']:focus, [type='url']:focus, [type='password']:focus, [type='number']:focus, [type='date']:focus, [type='datetime-local']:focus, [type='month']:focus, [type='search']:focus, [type='tel']:focus, [type='time']:focus, [type='week']:focus, [multiple]:focus, textarea:focus, select:focus {
   outline: 2px solid transparent;
   outline-offset: 2px;
   --tw-ring-inset: var(--tw-empty,/*!*/ /*!*/);
@@ -485,7 +497,7 @@ select {
           print-color-adjust: exact;
 }
 
-[multiple] {
+[multiple],[size]:where(select:not([size="1"])) {
   background-image: initial;
   background-position: initial;
   background-repeat: unset;

config.toml

@@ -2,4 +2,4 @@
   [module.hugoVersion]
     extended = true
     min = "0.87.0"
-    max = "0.115.3"
+    max = "0.115.4"

exampleSite/content/users/m3upt.com/index.md

@@ -0,0 +1,13 @@
+---
+                title: "m3upt.com"
+                tags: [Project site]
+                externalUrl: "https://m3upt.com"
+                date: 9945-08-08
+                showDate: false
+                showAuthor: false
+                showReadingTime: false
+                showEdit: false
+                showLikes: false
+                showViews: false
+                layoutBackgroundHeaderSpace: false
+                
---

exampleSite/content/users/users.json

@@ -378,6 +378,13 @@
       "Personal site"
     ]
   },
+  {
+    "title": "m3upt.com",
+    "url": "https://m3upt.com",
+    "tags": [
+      "Project site"
+    ]
+  },
   {
     "title": "pacochan.net",
     "url": "https://pacochan.net",
@@ -385,4 +392,4 @@
       "Personal site"
     ]
   }
-]
+]

layouts/_default/rss.xml

@@ -17,7 +17,7 @@
     <link>{{ .Permalink }}</link>
     <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
     <generator>Hugo -- gohugo.io</generator>
-    <language>{{ site.Language.LanguageCode }}</language>{{ with .Site.Author.email }}
+    <language>{{ site.LanguageCode }}</language>{{ with .Site.Author.email }}
     <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
     <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}
     {{ if .Site.Params.footer.showCopyright | default true -}}
@@ -46,4 +46,4 @@
     </item>
     {{ end }}
   </channel>
-</rss>
+</rss>

layouts/partials/home/background.html

@@ -34,7 +34,7 @@
                         {{ . | markdownify | emojify }}
                     </h2>
                     {{ end }}
-                    <div class="mt-1 mb-10 text-2xl">
+                    <div class="mt-3 mb-10 text-2xl">
                         {{ with .Site.Author.links }}
                         <div class="flex flex-wrap">
                             {{ range $links := . }}

package-lock.json

@@ -24,8 +24,8 @@
         "packery": "^2.1.2",
         "prettier": "^2.8.8",
         "prettier-plugin-go-template": "^0.0.13",
-        "prettier-plugin-tailwindcss": "^0.4.0",
-        "puppeteer": "^20.8.2",
+        "prettier-plugin-tailwindcss": "^0.4.1",
+        "puppeteer": "^20.8.3",
         "rimraf": "^5.0.1",
         "tailwindcss": "^3.3.3",
         "tw-elements": "1.0.0-beta2",
@@ -1839,9 +1839,9 @@
       }
     },
     "node_modules/prettier-plugin-tailwindcss": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.0.tgz",
-      "integrity": "sha512-Rna0sDPETA0KNhMHlN8wxKNgfSa8mTl2hPPAGxnbv6tUcHT6J4RQmQ8TLXyhB7Dm5Von4iHloBxTyClYM6wT0A==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.1.tgz",
+      "integrity": "sha512-hwn2EiJmv8M+AW4YDkbjJ6HlZCTzLyz1QlySn9sMuKV/Px0fjwldlB7tol8GzdgqtkdPtzT3iJ4UzdnYXP25Ag==",
       "dev": true,
       "engines": {
         "node": ">=12.17.0"
@@ -1938,24 +1938,24 @@
       }
     },
     "node_modules/puppeteer": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.8.2.tgz",
-      "integrity": "sha512-+VRywTRGF09UyiesFL7pcU19Cq7vf2HsE/eulwSpl7YHcr8g8X+Va4qLmp7mOECwteGvP7rU8vQ7PP43fcubbA==",
+      "version": "20.8.3",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.8.3.tgz",
+      "integrity": "sha512-NaJEZkhRmcIR0KTLfJktLF2aRpf+Nvr/YQi1geUSUkANWKRmIj+u+Fh9Us9tEzuuuuk56okJ+fhV4vrimQzI3g==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
         "@puppeteer/browsers": "1.4.5",
         "cosmiconfig": "8.2.0",
-        "puppeteer-core": "20.8.2"
+        "puppeteer-core": "20.8.3"
       },
       "engines": {
         "node": ">=16.3.0"
       }
     },
     "node_modules/puppeteer-core": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.8.2.tgz",
-      "integrity": "sha512-dWo60gFuFPdNhdabW9MMm6GpvkG6tND2D8FvrZ2MF+HggNApHrvLfbERj8vD6vXKV7UqDAJO0KI1OMo3S3Cm5w==",
+      "version": "20.8.3",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.8.3.tgz",
+      "integrity": "sha512-/57/tKtjjRyPP/FgZMG+nkmyajm4OXms6Qu0r8sbTu5tyIbCQTqx82yZj859Rx0Zf0enOVEnN1pD9cqVc9i78g==",
       "dev": true,
       "dependencies": {
         "@puppeteer/browsers": "1.4.5",
@@ -4270,9 +4270,9 @@
       }
     },
     "prettier-plugin-tailwindcss": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.0.tgz",
-      "integrity": "sha512-Rna0sDPETA0KNhMHlN8wxKNgfSa8mTl2hPPAGxnbv6tUcHT6J4RQmQ8TLXyhB7Dm5Von4iHloBxTyClYM6wT0A==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.1.tgz",
+      "integrity": "sha512-hwn2EiJmv8M+AW4YDkbjJ6HlZCTzLyz1QlySn9sMuKV/Px0fjwldlB7tol8GzdgqtkdPtzT3iJ4UzdnYXP25Ag==",
       "dev": true,
       "requires": {}
     },
@@ -4299,20 +4299,20 @@
       }
     },
     "puppeteer": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.8.2.tgz",
-      "integrity": "sha512-+VRywTRGF09UyiesFL7pcU19Cq7vf2HsE/eulwSpl7YHcr8g8X+Va4qLmp7mOECwteGvP7rU8vQ7PP43fcubbA==",
+      "version": "20.8.3",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.8.3.tgz",
+      "integrity": "sha512-NaJEZkhRmcIR0KTLfJktLF2aRpf+Nvr/YQi1geUSUkANWKRmIj+u+Fh9Us9tEzuuuuk56okJ+fhV4vrimQzI3g==",
       "dev": true,
       "requires": {
         "@puppeteer/browsers": "1.4.5",
         "cosmiconfig": "8.2.0",
-        "puppeteer-core": "20.8.2"
+        "puppeteer-core": "20.8.3"
       }
     },
     "puppeteer-core": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.8.2.tgz",
-      "integrity": "sha512-dWo60gFuFPdNhdabW9MMm6GpvkG6tND2D8FvrZ2MF+HggNApHrvLfbERj8vD6vXKV7UqDAJO0KI1OMo3S3Cm5w==",
+      "version": "20.8.3",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.8.3.tgz",
+      "integrity": "sha512-/57/tKtjjRyPP/FgZMG+nkmyajm4OXms6Qu0r8sbTu5tyIbCQTqx82yZj859Rx0Zf0enOVEnN1pD9cqVc9i78g==",
       "dev": true,
       "requires": {
         "@puppeteer/browsers": "1.4.5",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.37.0",
+  "version": "2.38.0",
   "description": "Blowfish theme for Hugo",
   "scripts": {
     "fullinstall": "npm run preinstall && npm install && npm run postinstall",
@@ -42,8 +42,8 @@
     "packery": "^2.1.2",
     "prettier": "^2.8.8",
     "prettier-plugin-go-template": "^0.0.13",
-    "prettier-plugin-tailwindcss": "^0.4.0",
-    "puppeteer": "^20.8.2",
+    "prettier-plugin-tailwindcss": "^0.4.1",
+    "puppeteer": "^20.8.3",
     "rimraf": "^5.0.1",
     "tailwindcss": "^3.3.3",
     "tw-elements": "1.0.0-beta2",

processUsers.js

@@ -6,7 +6,7 @@ const usersFolderPath = "./exampleSite/content/users/"
 let rawdata = fs.readFileSync(usersFolderPath + 'users.json');
 let users = JSON.parse(rawdata);
 let userDict = {}
-for(var i in users){
+for (var i in users) {
     userDict[users[i].title.replaceAll("/", "-")] = true;
 }
 
@@ -17,11 +17,8 @@ for (file in files) {
 
     let stats = fs.statSync(usersFolderPath + files[file]);
     if (files[file] != 'users.json' && files[file] != '_index.md') {
-
-
         if (stats.isDirectory()) {
-
-            if(!userDict[files[file].replaceAll("/", "-")]){
+            if (!userDict[files[file].replaceAll("/", "-")]) {
                 console.log('deleting: ', files[file]);
                 fs.rmdirSync(usersFolderPath + files[file], { recursive: true, force: true });
             }
@@ -45,13 +42,12 @@ puppeteer
         const page = await browser.newPage();
 
         for (var i in users) {
-            console.log(i, users[i].title);
 
             var userMDFile = "---\n\
                 title: \""+ users[i].title + "\"\n\
-                tags: ["+users[i].tags+"]\n\
+                tags: ["+ users[i].tags + "]\n\
                 externalUrl: \""+ users[i].url + "\"\n\
-                date: "+(9999-i)+"-08-08\n\
+                date: "+ (9999 - i) + "-08-08\n\
                 showDate: false\n\
                 showAuthor: false\n\
                 showReadingTime: false\n\
@@ -67,6 +63,7 @@ puppeteer
                 fs.mkdirSync(dir);
             }
 
+            console.log(i, users[i].title);
             fs.writeFileSync(dir + '/index.md', userMDFile);
             await page.goto(users[i].url);
             await page.screenshot({ path: dir + "/feature.jpg" });