Merge pull request #247 from nunocoracao/dev

Dev
2025-01-22 14:35:43 -06:00 · 2022-11-14 20:54:42 +00:00 · 2022-11-14 20:54:42 +00:00 · ea0a6c3698
commit ea0a6c3698
parent 12471e0aa3 6e4ed17ab7
7 changed files with 112 additions and 45 deletions
--- a/assets/css/compiled/main.css
+++ b/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)
--- a/data/sharing.json
+++ b/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"
+    }
  }
 }
--- a/exampleSite/config/_default/params.toml
+++ b/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"

--- a/i18n/ru.yaml
+++ b/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 }} &amp; {{ .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: "Показать еще"
--- a/layouts/partials/sharing-links.html
+++ b/layouts/partials/sharing-links.html
@ -1,9 +1,9 @@
 {{ 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
+          target="_blank"
          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"
          href="{{ printf .url $.Permalink $.Title }}"
          title="{{ i18n .title }}"
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "hugo-blowfish-theme",
-  "version": "2.11.0",
+  "version": "2.12.1",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "hugo-blowfish-theme",
-      "version": "2.11.0",
+      "version": "2.12.1",
      "hasInstallScript": true,
      "license": "MIT",
      "dependencies": {
@ -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"
      }
    },
@ -1900,9 +1900,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",
@ -3439,9 +3439,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",
--- a/package.json
+++ b/package.json
@ -1,8 +1,9 @@
 {
  "name": "hugo-blowfish-theme",
-  "version": "2.12.1",
+  "version": "2.13.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",
@ -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": [],