Merge pull request #247 from nunocoracao/dev

Dev

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)

data/sharing.json

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

exampleSite/content/_index.md

@@ -3,11 +3,11 @@ title: "Welcome to Blowfish! :tada:"
 description: "This is a demo of the Blowfish theme for Hugo."
 ---
 
-<center style="display:flex;align-items:center;flex-wrap:wrap;justify-content:space-evenly;">
+<!--center style="display:flex;align-items:center;flex-wrap:wrap;justify-content:space-evenly;">
 <a target="_blank" href="https://www.buymeacoffee.com/nunocoracao"><img class="nozoom" src="https://img.buymeacoffee.com/button-api/?text=Buy me a coffee&emoji=&slug=nunocoracao&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff" /></a>
 
 <a target="_blank" href="http://tee.pub/lic/qwSlWVBL5zc"><img class="nozoom" src="https://img.buymeacoffee.com/button-api/?text=Merch Store &emoji=💎&slug=nunocoracao&button_colour=5F7FFF&font_colour=ffffff&font_family=Lato&outline_colour=000000&coffee_colour=FFDD00" /></a>
-</center>
+</center-->
 
 This is a demo site built entirely using Blowfish. It also contains a complete set of [theme documentation]({{< ref "docs" >}}). Blowfish is flexible and is great for both static page-based content (like this demo) or a traditional blog with a feed of recent posts.
 

exampleSite/content/docs/configuration/index.md

@@ -137,6 +137,7 @@ Many of the article defaults here can be overridden on a per article basis by sp
 | `showLikes`                         | _Not set_              | Whether or not articles and list likes are displayed. This requires firebase integrations to be enabled, look below.                                                                                                                                                                                               |
 | `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.                                                                                                                                                                                                                                                     |
+| `defaultBackgroundImage`            | _Not set_              | Default background image for both `background` homepage layout and `background` hero style |
 | `header.layout`                     | `"basic"`              | Defines the header for the entire site, supported values are `basic` and `fixed`.                                                                                                                                                                                                                                  |
 | `footer.showMenu`                   | `true`                 | Show/hide the footer menu, which can be configured in the `[[footer]]` section of the `config/_default/menus.en.toml` file.                                                                                                                                                                                        |
 | `footer.showCopyright`              | `true`                 | Whether or not to show the copyright string in the site footer. Note that the string itself can be customised using the `copyright` parameter in the [languages configuration](#language-and-i18n).                                                                                                                |

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/hero/background.html

@@ -1,6 +1,7 @@
 {{- $images := .Resources.ByType "image" -}}
 {{- $featured := $images.GetMatch "*feature*" -}}
 {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}}
+{{- if not $featured }}{{ with .Site.Params.defaultBackgroundImage }}{{ $featured = resources.Get . }}{{ end }}{{ end -}}
 {{- with $featured -}}
 {{ with .Resize "1200x" }}
 <div id="hero" class="h-[150px] md:h-[200px]"></div>
@@ -23,4 +24,4 @@
 </script>
 {{ end }}
 {{ end }}
-{{- end -}}
+{{- end -}}

layouts/partials/home/background.html

@@ -4,9 +4,10 @@
         <div class="mx-auto max-w-7xl p-0">
             <div class="relative sm:overflow-hidden">
                 <div class="fixed inset-x-0 top-0" style="z-index:-10">
-                    {{ with .Site.Params.homepage.homepageImage }}
+                    {{ $homepageImage := "" }}
-                    {{ $homepageImage := resources.Get . }}
+                    {{ with .Site.Params.defaultBackgroundImage }}{{ $homepageImage = resources.Get . }}{{ end }}
-                    {{ if $homepageImage }}
+                    {{ with .Site.Params.homepage.homepageImage }}{{ $homepageImage = resources.Get . }}{{ end }}
+                    {{ if not (eq $homepageImage "") }}
                     <img class="w-full h-[1000px] object-cover m-0 nozoom" src="{{ $homepageImage.RelPermalink }}">
                     <div
                         class="absolute inset-0 h-[1000px] bg-gradient-to-t from-neutral dark:from-neutral-800 to-transparent mix-blend-normal">
@@ -15,7 +16,6 @@
                         class="opacity-70 absolute inset-0 h-[1000px] bg-gradient-to-t from-neutral dark:from-neutral-800 to-neutral dark:to-neutral-800 mix-blend-normal">
                     </div>
                     {{ end }}
-                    {{ end }}
                 </div>
                 <div class="relative px-4 py-16 sm:px-6 sm:py-24 lg:py-32 lg:px-8 flex flex-col items-center justify-center text-center">
                     {{ with .Site.Author.image }}
@@ -65,4 +65,4 @@
         background_blur.style.opacity = (scroll / 300)
     });
 </script>
-{{ end }}
+{{ end }}

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 . }}
+    {{ range $.Site.Data.sharing.links }}
-      {{ with index $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 }}"

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",
+      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz",
-      "integrity": "sha512-Xt9D4PK4zuuQCEB8bwK9JUCKmTgUwyac/6b0/42Vqhgl6YJkep+Wf5wq+5uXYfmrupdAD0YY2NY1hyZp1HjRrg==",
+      "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",
+      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz",
-      "integrity": "sha512-Xt9D4PK4zuuQCEB8bwK9JUCKmTgUwyac/6b0/42Vqhgl6YJkep+Wf5wq+5uXYfmrupdAD0YY2NY1hyZp1HjRrg==",
+      "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.0",
+  "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": [],