Merge pull request #822 from nunocoracao/dev

🔖 v2.37.0
2025-01-22 14:35:43 -06:00 · 2023-07-14 10:33:33 +01:00 · 2023-07-14 10:33:33 +01:00 · 869da321a6
commit 869da321a6
parent eceda27458 02258281cf
11 changed files with 70 additions and 53 deletions
--- a/assets/css/compiled/main.css
+++ b/assets/css/compiled/main.css
@ -1609,6 +1609,10 @@ select {
  margin-bottom: 0.625rem;
 }

+.mb-20 {
+  margin-bottom: 5rem;
+}
+
 .mb-3 {
  margin-bottom: 0.75rem;
 }
--- a/config.toml
+++ b/config.toml
@ -2,4 +2,4 @@
  [module.hugoVersion]
    extended = true
    min = "0.87.0"
-    max = "0.115.1"
+    max = "0.115.3"
--- a/exampleSite/content/users/index.md
+++ b/exampleSite/content/users/index.md
@ -81,6 +81,8 @@ Real websites that are built with Blowfish.
 | [halcyonstraits.com](https://www.halcyonstraits.com/)                 | Doll photography             |
 | [50-nuances-octets.fr](https://www.50-nuances-octets.fr/)             | Organization site            |
 | [marupanda.art/marucomics](https://marupanda.art/marucomics/)         | Comics site                  |
+| [seanomahoney.com](https://seanomahoney.com/)                         | Personal site                |
+| [pacochan.net](https://pacochan.net)                                  | Personal site                |

 {{< alert >}}

--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@ -18,7 +18,7 @@ article:
  part_of_series: "Dieser Artikel ist Teil einer Serie."
  part: "Teil"
  this_article: "Dieser Artikel"
-  related_articles: "Related"
+  related_articles: "Verwandte Artikel"

 author:
  byline_title: "Autor"
@ -63,4 +63,4 @@ shortcode:


 recent:
-  show_more: "Zeige Mehr"
+  show_more: "Zeige Mehr"
--- a/i18n/es.yaml
+++ b/i18n/es.yaml
@ -15,10 +15,16 @@ article:
  word_count:
    one: "{{ .Count }} palabra"
    other: "{{ .Count }} palabras"
+  views:
+    one: "{{ .Count }} visualización"
+    other: "{{ .Count }} visualizaciones"
+  likes:
+    one: "{{ .Count }} me gusta"
+    other: "{{ .Count }} me gusta"
  part_of_series: "Este artículo es parte de una serie."
  part: "Parte"
  this_article: "Este artículo"
-  related_articles: "Related"
+  related_articles: "Relacionados"

 author:
  byline_title: "Autor"
@ -38,7 +44,7 @@ footer:
  powered_by: "Desarrollada con {{ .Hugo }} &amp; {{ .Theme }}"

 list:
-  externalurl_title: "Link a página externa"
+  externalurl_title: "Enlace a página externa"
  no_articles: "Aún no hay artículos para listar aquí."

 nav:
@ -62,4 +68,4 @@ shortcode:
  recent_articles: "Reciente"

 recent:
-  show_more: "Mostrar Más"
+  show_more: "Mostrar más"
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@ -34,7 +34,8 @@
    {{- end }} prose flex max-w-full flex-col dark:prose-invert lg:flex-row">
    {{ if $toc }}
    <div class="order-first px-0 lg:order-last lg:max-w-xs ltr:lg:pl-8 rtl:lg:pr-8">
-      <div class="toc ltr:pl-5 rtl:pr-5 lg:sticky lg:top-10">
+      <div class="toc ltr:pl-5 rtl:pr-5 lg:sticky {{ if hasPrefix .Site.Params.header.layout "fixed" -}}
+      lg:top-[140px]{{ else }}lg:top-10{{ end }}">
        {{ partial "toc.html" . }}
      </div>
    </div>
--- a/layouts/_default/index.rss.xml
+++ b/layouts/_default/index.rss.xml
@ -16,12 +16,14 @@
    <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
    <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>{{ with .Site.LanguageCode }}
-    <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
+    <generator>Hugo -- gohugo.io</generator>
+    <language>{{ site.Language.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}}{{ with .Site.Copyright }}
-    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
-    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
+    <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}
+    {{ if .Site.Params.footer.showCopyright | default true -}}
+    <copyright>{{ with replace .Site.Params.copyright "{ year }" now.Year }}{{.}}{{ else }}© {{ now.Format "2006" }} {{ .Site.Author.name }}{{- end }}</copyright>
+    {{- end }}
+    {{ if not .Date.IsZero }}<lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
    {{- with .OutputFormats.Get "RSS" -}}
    {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
    {{- end -}}
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@ -58,23 +58,32 @@
    {{ end }}
  
  </header>
+  
  <section class="flex flex-col max-w-full mt-0 prose dark:prose-invert lg:flex-row">
+    
    {{ if or (and (.Params.showTableOfContents | default (.Site.Params.article.showTableOfContents | default false)) (in
    .TableOfContents "<ul")) (.Site.Params.article.showRelatedPosts | default false) }} <div
      class="order-first sm:max-w-prose lg:ml-auto px-0 lg:order-last lg:max-w-xs ltr:lg:pl-8 rtl:lg:pr-8">
-      <div class="toc ltr:pl-5 rtl:pr-5 print:hidden lg:sticky {{ if eq .Site.Params.header.layout " fixed" }}
-        lg:top-[140px] {{ else }} lg:top-10 {{ end }}">
+      <div class="toc ltr:pl-5 rtl:pr-5 print:hidden lg:sticky {{ if hasPrefix .Site.Params.header.layout "fixed" -}}
+        lg:top-[140px]{{ else }}lg:top-10{{ end }}">

        {{ if and (.Params.showTableOfContents | default (.Site.Params.article.showTableOfContents | default false)) (in
        .TableOfContents "<ul") }} {{ partial "toc.html" . }} {{ end }} {{ if .Site.Params.article.showRelatedPosts |
          default false }} sd {{ end }} </div>
      </div>
      {{ end }}
-      <div class="min-w-0 min-h-0 max-w-prose">
+
+      <div class="min-w-0 min-h-0 max-w-fit">
+        
        {{ partial "series.html" . }}
-        {{ .Content | emojify }}
-        </br></br>
+
+        <div class="max-w-prose mb-20">
+          {{ .Content | emojify }}
+        </div>
+                
        {{ partial "series-closed.html" . }}
+        {{ partial "sharing-links.html" . }}
+        {{ partial "related.html" . }}  
      </div>
     
     <script>
@ -88,11 +97,6 @@
    </section>
  <footer class="pt-8 max-w-prose print:hidden">

-    
-    {{ partial "sharing-links.html" . }}
-
-    {{ partial "related.html" . }}
-
    {{ partial "article-pagination.html" . }}
    {{ if .Params.showComments | default (.Site.Params.article.showComments | default false) }}
    {{ if templates.Exists "partials/comments.html" }}
--- a/layouts/partials/header/basic.html
+++ b/layouts/partials/header/basic.html
@ -92,7 +92,7 @@
                {{ partial "icon.html" "bars" }}
            </div>
            <div id="menu-wrapper" style="padding-top:5px;"
-                class="fixed inset-0 z-30 invisible w-screen h-screen m-auto overflow-auto transition-opacity opacity-0 cursor-default bg-neutral-100/50 backdrop-blur-sm dark:bg-neutral-900/50">
+                class="fixed inset-0 z-30 invisible w-screen h-screen m-0 overflow-auto transition-opacity opacity-0 cursor-default bg-neutral-100/50 backdrop-blur-sm dark:bg-neutral-900/50">
                <ul
                    class="flex space-y-2 mt-3 flex-col items-end w-full px-6 py-6 mx-auto overflow-visible list-none ltr:text-right rtl:text-left max-w-7xl">

--- a/package-lock.json
+++ b/package-lock.json
@ -1,18 +1,18 @@
 {
  "name": "hugo-blowfish-theme",
-  "version": "2.35.1",
+  "version": "2.36.1",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "hugo-blowfish-theme",
-      "version": "2.35.1",
+      "version": "2.36.1",
      "hasInstallScript": true,
      "license": "MIT",
      "dependencies": {
        "@headlessui/react": "^1.7.15",
        "@heroicons/react": "^2.0.18",
-        "@tailwindcss/forms": "^0.5.3",
+        "@tailwindcss/forms": "^0.5.4",
        "commander": "^11.0.0"
      },
      "devDependencies": {
@ -24,9 +24,9 @@
        "packery": "^2.1.2",
        "prettier": "^2.8.8",
        "prettier-plugin-go-template": "^0.0.13",
-        "prettier-plugin-tailwindcss": "^0.3.0",
+        "prettier-plugin-tailwindcss": "^0.4.0",
        "rimraf": "^5.0.1",
-        "tailwindcss": "^3.3.2",
+        "tailwindcss": "^3.3.3",
        "tw-elements": "1.0.0-beta2",
        "typeit": "^8.7.1",
        "vendor-copy": "^3.0.1"
@ -190,9 +190,9 @@
      }
    },
    "node_modules/@tailwindcss/forms": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.3.tgz",
-      "integrity": "sha512-y5mb86JUoiUgBjY/o6FJSFZSEttfb3Q5gllE4xoKjAAD+vBrnIhE4dViwUuow3va8mpH4s9jyUbUbrRGoRdc2Q==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.4.tgz",
+      "integrity": "sha512-YAm12D3R7/9Mh4jFbYSMnsd6jG++8KxogWgqs7hbdo/86aWjjlIEvL7+QYdVELmAI0InXTpZqFIg5e7aDVWI2Q==",
      "dependencies": {
        "mini-svg-data-uri": "^1.2.3"
      },
@ -1200,9 +1200,9 @@
      }
    },
    "node_modules/prettier-plugin-tailwindcss": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.3.0.tgz",
-      "integrity": "sha512-009/Xqdy7UmkcTBpwlq7jsViDqXAYSOMLDrHAdTMlVZOrKfM2o9Ci7EMWTMZ7SkKBFTG04UM9F9iM2+4i6boDA==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.0.tgz",
+      "integrity": "sha512-Rna0sDPETA0KNhMHlN8wxKNgfSa8mTl2hPPAGxnbv6tUcHT6J4RQmQ8TLXyhB7Dm5Von4iHloBxTyClYM6wT0A==",
      "dev": true,
      "engines": {
        "node": ">=12.17.0"
@ -1213,7 +1213,7 @@
        "@shopify/prettier-plugin-liquid": "*",
        "@shufo/prettier-plugin-blade": "*",
        "@trivago/prettier-plugin-sort-imports": "*",
-        "prettier": ">=2.2.0",
+        "prettier": "^2.2 || ^3.0",
        "prettier-plugin-astro": "*",
        "prettier-plugin-css-order": "*",
        "prettier-plugin-import-sort": "*",
@ -1639,9 +1639,9 @@
      }
    },
    "node_modules/tailwindcss": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
-      "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
+      "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
      "dependencies": {
        "@alloc/quick-lru": "^5.2.0",
        "arg": "^5.0.2",
@ -1663,7 +1663,6 @@
        "postcss-load-config": "^4.0.1",
        "postcss-nested": "^6.0.1",
        "postcss-selector-parser": "^6.0.11",
-        "postcss-value-parser": "^4.2.0",
        "resolve": "^1.22.2",
        "sucrase": "^3.32.0"
      },
@ -2143,9 +2142,9 @@
      "dev": true
    },
    "@tailwindcss/forms": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.3.tgz",
-      "integrity": "sha512-y5mb86JUoiUgBjY/o6FJSFZSEttfb3Q5gllE4xoKjAAD+vBrnIhE4dViwUuow3va8mpH4s9jyUbUbrRGoRdc2Q==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.4.tgz",
+      "integrity": "sha512-YAm12D3R7/9Mh4jFbYSMnsd6jG++8KxogWgqs7hbdo/86aWjjlIEvL7+QYdVELmAI0InXTpZqFIg5e7aDVWI2Q==",
      "requires": {
        "mini-svg-data-uri": "^1.2.3"
      }
@ -2858,9 +2857,9 @@
      }
    },
    "prettier-plugin-tailwindcss": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.3.0.tgz",
-      "integrity": "sha512-009/Xqdy7UmkcTBpwlq7jsViDqXAYSOMLDrHAdTMlVZOrKfM2o9Ci7EMWTMZ7SkKBFTG04UM9F9iM2+4i6boDA==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.0.tgz",
+      "integrity": "sha512-Rna0sDPETA0KNhMHlN8wxKNgfSa8mTl2hPPAGxnbv6tUcHT6J4RQmQ8TLXyhB7Dm5Von4iHloBxTyClYM6wT0A==",
      "dev": true,
      "requires": {}
    },
@ -3105,9 +3104,9 @@
      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
    },
    "tailwindcss": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
-      "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
+      "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
      "requires": {
        "@alloc/quick-lru": "^5.2.0",
        "arg": "^5.0.2",
@ -3129,7 +3128,6 @@
        "postcss-load-config": "^4.0.1",
        "postcss-nested": "^6.0.1",
        "postcss-selector-parser": "^6.0.11",
-        "postcss-value-parser": "^4.2.0",
        "resolve": "^1.22.2",
        "sucrase": "^3.32.0"
      },
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "hugo-blowfish-theme",
-  "version": "2.36.1",
+  "version": "2.37.0",
  "description": "Blowfish theme for Hugo",
  "scripts": {
    "fullinstall": "npm run preinstall && npm install && npm run postinstall",
@ -42,9 +42,9 @@
    "packery": "^2.1.2",
    "prettier": "^2.8.8",
    "prettier-plugin-go-template": "^0.0.13",
-    "prettier-plugin-tailwindcss": "^0.3.0",
+    "prettier-plugin-tailwindcss": "^0.4.0",
    "rimraf": "^5.0.1",
-    "tailwindcss": "^3.3.2",
+    "tailwindcss": "^3.3.3",
    "tw-elements": "1.0.0-beta2",
    "typeit": "^8.7.1",
    "vendor-copy": "^3.0.1"
@ -95,7 +95,7 @@
  "dependencies": {
    "@headlessui/react": "^1.7.15",
    "@heroicons/react": "^2.0.18",
-    "@tailwindcss/forms": "^0.5.3",
+    "@tailwindcss/forms": "^0.5.4",
    "commander": "^11.0.0"
  }
 }