Merge pull request #256 from nunocoracao/dev

🔖 Release new version v2.14.0

.github/workflows/build.yml

@@ -0,0 +1,54 @@
+name: Build Theme
+
+on: [pull_request_target]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: "${{ github.head_ref }}"
+      - name: Install dependencies and Build Theme
+        uses: actions/setup-node@v3
+      - run: npm install
+      - run: npm run assets
+      - name: Commit and push Chart.js changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: "${{ github.head_ref }}"
+          push_options: "--dry-run"
+          file_pattern: "assets/lib/chart/*"
+          commit_message: "📦 Update packaged ChartJS"
+      - name: Commit Fuse changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: "${{ github.head_ref }}"
+          push_options: "--dry-run"
+          file_pattern: "assets/lib/fuse/*"
+          commit_message: "📦 Update packaged FuseJS"
+      - name: Commit KaTeX changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: "${{ github.head_ref }}"
+          push_options: "--dry-run"
+          file_pattern: "assets/lib/katex/*"
+          commit_message: "📦 Update packaged KaTeX"
+      - name: Commit Mermaid changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: "${{ github.head_ref }}"
+          push_options: "--dry-run"
+          file_pattern: "assets/lib/mermaid/*"
+          commit_message: "📦 Update packaged Mermaid"
+      - run: npm run build
+      - name: Commit CSS changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: "${{ github.head_ref }}"
+          push_options: "--dry-run"
+          file_pattern: "assets/css/compiled/main.css"
+          commit_message: "💄 Rebuild CSS"
+      - run: git push

.github/workflows/test.yml

@@ -0,0 +1,25 @@
+name: Test Build
+
+on: [push]
+
+jobs:
+  build:
+    name: Build Example Site
+    runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+
+      - name: Setup Hugo
+        uses: peaceiris/actions-hugo@v2
+        with:
+          hugo-version: "latest"
+
+      - name: Build
+        working-directory: ./exampleSite
+        run: hugo --minify --themesDir ../.. --baseURL https://nunocoracao.github.io/blowfish/

assets/css/compiled/main.css

@@ -1,6 +1,6 @@
 /*! Blowfish | MIT License | https://github.com/nunocoracao/blowfish */
 
-/*! tailwindcss v3.2.3 | MIT License | https://tailwindcss.com */
+/*! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com */
 
 /*
 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
@@ -1550,10 +1550,6 @@ select {
   min-width: 1.8rem;
 }
 
-.min-w-\[2\.4rem\] {
-  min-width: 2.4rem;
-}
-
 .min-w-\[220px\] {
   min-width: 220px;
 }
@@ -1870,6 +1866,10 @@ select {
   padding: 1rem;
 }
 
+.p-1\.5 {
+  padding: 0.375rem;
+}
+
 .p-1 {
   padding: 0.25rem;
 }

config.toml

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

data/sharing.json

@@ -1,32 +1,34 @@
 {
-  "email": {
-    "icon": "email",
-    "title": "sharing.email",
-    "url": "mailto:?body=%s&subject=%s"
-  },
-  "facebook": {
-    "icon": "facebook",
-    "title": "sharing.facebook",
-    "url": "https://www.facebook.com/sharer/sharer.php?u=%s&quote=%s"
-  },
-  "linkedin": {
-    "icon": "linkedin",
-    "title": "sharing.linkedin",
-    "url": "https://www.linkedin.com/shareArticle?mini=true&url=%s&title=%s"
-  },
-  "pinterest": {
-    "icon": "pinterest",
-    "title": "sharing.pinterest",
-    "url": "https://pinterest.com/pin/create/bookmarklet/?url=%s&description=%s"
-  },
-  "reddit": {
-    "icon": "reddit",
-    "title": "sharing.reddit",
-    "url": "https://reddit.com/submit/?url=%s&resubmit=true&title=%s"
-  },
-  "twitter": {
-    "icon": "twitter",
-    "title": "sharing.twitter",
-    "url": "https://twitter.com/intent/tweet/?url=%s&text=%s"
+  "links": {
+    "email": {
+      "icon": "email",
+      "title": "sharing.email",
+      "url": "mailto:?body=%s&subject=%s"
+    },
+    "facebook": {
+      "icon": "facebook",
+      "title": "sharing.facebook",
+      "url": "https://www.facebook.com/sharer/sharer.php?u=%s&quote=%s"
+    },
+    "linkedin": {
+      "icon": "linkedin",
+      "title": "sharing.linkedin",
+      "url": "https://www.linkedin.com/shareArticle?mini=true&url=%s&title=%s"
+    },
+    "pinterest": {
+      "icon": "pinterest",
+      "title": "sharing.pinterest",
+      "url": "https://pinterest.com/pin/create/bookmarklet/?url=%s&description=%s"
+    },
+    "reddit": {
+      "icon": "reddit",
+      "title": "sharing.reddit",
+      "url": "https://reddit.com/submit/?url=%s&resubmit=true&title=%s"
+    },
+    "twitter": {
+      "icon": "twitter",
+      "title": "sharing.twitter",
+      "url": "https://twitter.com/intent/tweet/?url=%s&text=%s"
+    }
   }
 }

exampleSite/config/_default/params.toml

@@ -97,7 +97,7 @@ mainSections = ["docs"]
 [buymeacoffee]
   identifier = "nunocoracao"
   globalWidget = true
-  globalWidgetMessage = "Thank you for visiting."
+  globalWidgetMessage = ""
   globalWidgetColor = "#FFDD00"
   globalWidgetPosition = "Right"
 

i18n/ru.yaml

@@ -0,0 +1,64 @@
+article:
+  anchor_label: "Якорь"
+  date: "{{ .Date }}"
+  date_updated: "Обновлено: {{ .Date }}"
+  draft: "Черновик"
+  edit_title: "Редактировать содержимое"
+  reading_time:
+    one: "{{ .Count }} минута"
+    other: "{{ .Count }} минут"
+  reading_time_title: "Время чтения"
+  table_of_contents: "Оглавление"
+  word_count:
+    one: "{{ .Count }} слово"
+    other: "{{ .Count }} слов"
+  views:
+    one: "{{ .Count }} просмотр"
+    other: "{{ .Count }} просмотров"
+  likes:
+    one: "{{ .Count }} нравится"
+    other: "{{ .Count }} нравится"
+
+author:
+  byline_title: "Автор"
+
+code:
+  copy: "Копировать"
+  copied: "Скопировано"
+
+error:
+  404_title: "Страница не найдена: в замешательстве:"
+  404_error: "Ошибка 404"
+  404_description: "Похоже, запрошенная вами страница не существует."
+
+footer:
+  dark_appearance: "Переключить на темный вид"
+  light_appearance: "Переключить на светлый вид"
+  powered_by: "Работает на {{ .Hugo }} & {{ .Theme }}"
+
+list:
+  externalurl_title: "Ссылка на внешний сайт"
+  no_articles: "Здесь пока нет статей."
+
+nav:
+  scroll_to_top_title: "Пролистать наверх"
+  skip_to_main: "Перейти к основному содержимому"
+
+search:
+  open_button_title: "Поиск (/)"
+  close_button_title: "Закрыть (Esc)"
+  input_placeholder: "Поиск"
+
+sharing:
+  email: "Отправить по электронной почте"
+  facebook: "Поделиться через Facebook"
+  linkedin: "Поделиться через LinkedIn"
+  pinterest: "PДобавить в Pinterest"
+  reddit: "Отправить в Reddit"
+  twitter: "Твитнуть в Twitter"
+
+shortcode:
+  recent_articles: "Недавние"
+
+recent:
+  show_more: "Показать еще"

layouts/partials/author-extra.html

@@ -25,7 +25,7 @@
         {{ range .data.social }}
         {{ range $name, $link := . }}
         <a class="px-1 hover:text-primary-700 dark:hover:text-primary-400" href="{{ $link }}" target="_blank"
-          aria-label="{{ $name | title }}" rel="me noopener noreferrer">{{ partial "icon.html" $name }}</a>
+          aria-label="{{ $name | title }}" rel="me noopener noreferrer"><span class="inline-block align-text-bottom">{{ partial "icon.html" $name }}</span></a>
         {{ end }}
         {{ end }}
       </div>

layouts/partials/author-links.html

@@ -8,7 +8,7 @@
           target="_blank"
           aria-label="{{ $name | title }}"
           rel="me noopener noreferrer"
-          >{{ partial "icon.html" $name }}</a
+          ><span class="inline-block align-text-bottom">{{ partial "icon.html" $name }}</span></a
         >
       {{ end }}
     {{ end }}

layouts/partials/icon.html

@@ -1,6 +1,6 @@
 {{ $icon := resources.Get (print "icons/" . ".svg") }}
 {{ if $icon }}
-  <span class="relative inline-block align-text-bottom icon">
+  <span class="relative block icon">
     {{ $icon.Content | safeHTML }}
   </span>
 {{ end }}

layouts/partials/meta/edit.html

@@ -13,7 +13,7 @@
     rel="noopener noreferrer"
     target="_blank"
     title="{{ i18n "article.edit_title" }}"
-    >{{ partial "icon.html" "edit" }}</a
+    ><span class="inline-block align-text-bottom">{{ partial "icon.html" "edit" }}</span></a
   >
 </span>
 {{- /* Trim EOF */ -}}

layouts/partials/meta/likes.html

@@ -1,5 +1,5 @@
 <span>
     <span id="likes_{{ .File.Path }}" title="likes">0</span> 
-    <span>{{ partial "icon.html" "heart" }}</span>
+    <span class="inline-block align-text-bottom">{{ partial "icon.html" "heart" }}</span>
 </span>
 {{- /* Trim EOF */ -}}

layouts/partials/meta/likes_button.html

@@ -2,8 +2,8 @@
     <button id="likes_button"
         class="rounded-md border border-primary-400 px-1 py-[1px] text-xs font-normal text-primary-700 dark:border-primary-600 dark:text-primary-400"
         onclick="process_article()">
-        <span id="likes_button_heart" style="display:none">{{ partial "icon.html" "heart" }} </span>
-        <span id="likes_button_emtpty_heart">{{ partial "icon.html" "heart-empty" }}</span>
+        <span id="likes_button_heart" style="display:none" class="inline-block align-text-bottom">{{ partial "icon.html" "heart" }} </span>
+        <span id="likes_button_emtpty_heart" class="inline-block align-text-bottom">{{ partial "icon.html" "heart-empty" }}</span>
         <span id="likes_button_text">&nbsp;Like</span>
     </button>
 </span>

layouts/partials/meta/views.html

@@ -1,5 +1,5 @@
 <span>
     <span id="views_{{ .File.Path }}" title="views">0</span> 
-    <span>{{ partial "icon.html" "eye" }}</span>
+    <span class="inline-block align-text-bottom">{{ partial "icon.html" "eye" }}</span>
 </span>
 {{- /* Trim EOF */ -}}

layouts/partials/recent-articles.html

@@ -44,8 +44,9 @@
     <div class="mt-10 flex justify-center">
       <a href="{{ $showMoreLinkDest }}">
         <button
-          class="bg-transparent hover:text-primary-500 prose dark:prose-invert font-semibold hover:text-white py-2 px-4 border border-primary-500 hover:border-transparent rounded">Show
-          More</button>
+          class="bg-transparent hover:text-primary-500 prose dark:prose-invert font-semibold hover:text-white py-2 px-4 border border-primary-500 hover:border-transparent rounded">
+          {{ i18n "recent.show_more" | markdownify | emojify }}
+        </button>
       </a>
     </div>
     {{ end }}

layouts/partials/sharing-links.html

@@ -1,15 +1,16 @@
 {{ with .Params.sharingLinks | default (.Site.Params.article.sharingLinks | default false) }}
-  {{ $links := site.Data.sharing }}
   <section class="flex flex-row flex-wrap justify-center pt-4 text-xl">
-    {{ range . }}
-      {{ with index $links . }}
+    {{ range $.Site.Data.sharing.links }}
+      {{ with . }}
         <a
-          class="m-1 inline-block min-w-[2.4rem] rounded bg-neutral-300 p-1 text-center text-neutral-700 hover:bg-primary-500 hover:text-neutral dark:bg-neutral-700 dark:text-neutral-300 dark:hover:bg-primary-400 dark:hover:text-neutral-800"
+          target="_blank"
+          class="m-1 rounded bg-neutral-300 p-1.5 text-neutral-700 hover:bg-primary-500 hover:text-neutral dark:bg-neutral-700 dark:text-neutral-300 dark:hover:bg-primary-400 dark:hover:text-neutral-800"
           href="{{ printf .url $.Permalink $.Title }}"
           title="{{ i18n .title }}"
           aria-label="{{ i18n .title }}"
-          >{{ partial "icon.html" .icon }}</a
-        >
+          >
+          {{ partial "icon.html" .icon }}
+        </a>
       {{ end }}
     {{ end }}
   </section>

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "hugo-blowfish-theme",
-      "version": "2.11.0",
+      "version": "2.14.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -17,7 +17,7 @@
       },
       "devDependencies": {
         "@tailwindcss/typography": "^0.5.8",
-        "chart.js": "^3.9.1",
+        "chart.js": "^4.0.1",
         "fuse.js": "^6.6.2",
         "katex": "^0.16.3",
         "mermaid": "^9.2.2",
@@ -25,7 +25,7 @@
         "prettier-plugin-go-template": "^0.0.13",
         "prettier-plugin-tailwindcss": "^0.1.13",
         "rimraf": "^3.0.2",
-        "tailwindcss": "^3.2.3",
+        "tailwindcss": "^3.2.4",
         "vendor-copy": "^3.0.1"
       }
     },
@@ -206,10 +206,13 @@
       }
     },
     "node_modules/chart.js": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz",
-      "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w==",
-      "dev": true
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.0.1.tgz",
+      "integrity": "sha512-5/8/9eBivwBZK81mKvmIwTb2Pmw4D/5h1RK9fBWZLLZ8mCJ+kfYNmV9rMrGoa5Hgy2/wVDBMLSUDudul2/9ihA==",
+      "dev": true,
+      "engines": {
+        "pnpm": "^7.0.0"
+      }
     },
     "node_modules/chokidar": {
       "version": "3.5.3",
@@ -1900,9 +1903,9 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.3.tgz",
-      "integrity": "sha512-Xt9D4PK4zuuQCEB8bwK9JUCKmTgUwyac/6b0/42Vqhgl6YJkep+Wf5wq+5uXYfmrupdAD0YY2NY1hyZp1HjRrg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz",
+      "integrity": "sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==",
       "dependencies": {
         "arg": "^5.0.2",
         "chokidar": "^3.5.3",
@@ -2144,9 +2147,9 @@
       "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="
     },
     "chart.js": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz",
-      "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.0.1.tgz",
+      "integrity": "sha512-5/8/9eBivwBZK81mKvmIwTb2Pmw4D/5h1RK9fBWZLLZ8mCJ+kfYNmV9rMrGoa5Hgy2/wVDBMLSUDudul2/9ihA==",
       "dev": true
     },
     "chokidar": {
@@ -3439,9 +3442,9 @@
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
     },
     "tailwindcss": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.3.tgz",
-      "integrity": "sha512-Xt9D4PK4zuuQCEB8bwK9JUCKmTgUwyac/6b0/42Vqhgl6YJkep+Wf5wq+5uXYfmrupdAD0YY2NY1hyZp1HjRrg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz",
+      "integrity": "sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==",
       "requires": {
         "arg": "^5.0.2",
         "chokidar": "^3.5.3",

package.json

@@ -1,8 +1,9 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.12.1",
+  "version": "2.14.0",
   "description": "Blowfish theme for Hugo",
   "scripts": {
+    "fullinstall": "npm run preinstall && npm install && npm run postinstall",
     "preinstall": "rimraf assets/vendor",
     "postinstall": "vendor-copy",
     "assets": "rimraf assets/vendor && vendor-copy",
@@ -34,7 +35,7 @@
   "homepage": "https://github.com/nunocoracao/blowfish#readme",
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.8",
-    "chart.js": "^3.9.1",
+    "chart.js": "^4.0.1",
     "fuse.js": "^6.6.2",
     "katex": "^0.16.3",
     "mermaid": "^9.2.2",
@@ -42,7 +43,7 @@
     "prettier-plugin-go-template": "^0.0.13",
     "prettier-plugin-tailwindcss": "^0.1.13",
     "rimraf": "^3.0.2",
-    "tailwindcss": "^3.2.3",
+    "tailwindcss": "^3.2.4",
     "vendor-copy": "^3.0.1"
   },
   "vendorCopy": [],
@@ -52,7 +53,7 @@
       "to": "assets/lib/mermaid/mermaid.min.js"
     },
     {
-      "from": "node_modules/chart.js/dist/chart.min.js",
+      "from": "node_modules/chart.js/dist/chart.umd.js",
       "to": "assets/lib/chart/chart.min.js"
     },
     {