From 9952298f85b90d8aedc8983cb2339f14a026ebae Mon Sep 17 00:00:00 2001 From: Guillaume Assier <18405490+Sykursen@users.noreply.github.com> Date: Tue, 30 May 2023 10:06:49 +0000 Subject: [PATCH 01/26] Add 50-nuances-octets.fr --- exampleSite/content/users/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exampleSite/content/users/index.md b/exampleSite/content/users/index.md index 563dd7dc..07261006 100644 --- a/exampleSite/content/users/index.md +++ b/exampleSite/content/users/index.md @@ -79,7 +79,7 @@ Real websites that are built with Blowfish. | [nikarashihatsu.github.io](https://nikarashihatsu.github.io/) | Personal site | | [blog.enmanuelmoreira.com](https://blog.enmanuelmoreira.com) | Personal site | | [halcyonstraits.com](https://www.halcyonstraits.com/) | Doll photography | - +| [50-nuances-octets.fr](https://www.50-nuances-octets.fr/) | Organization site | {{< alert >}} From fb55b339d38eeb92f0cd22eea2f0e2fdda5ae5ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 06:03:04 +0000 Subject: [PATCH 02/26] =?UTF-8?q?=F0=9F=93=8C=20Bump=20@headlessui/react?= =?UTF-8?q?=20from=201.7.14=20to=201.7.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [@headlessui/react](https://github.com/tailwindlabs/headlessui/tree/HEAD/packages/@headlessui-react) from 1.7.14 to 1.7.15. - [Release notes](https://github.com/tailwindlabs/headlessui/releases) - [Changelog](https://github.com/tailwindlabs/headlessui/blob/main/packages/@headlessui-react/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/headlessui/commits/@headlessui/react@v1.7.15/packages/@headlessui-react) --- updated-dependencies: - dependency-name: "@headlessui/react" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5356ae06..7553c930 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "name": "hugo-blowfish-theme", - "version": "2.33.2", + "version": "2.34.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "hugo-blowfish-theme", - "version": "2.33.2", + "version": "2.34.1", "hasInstallScript": true, "license": "MIT", "dependencies": { - "@headlessui/react": "^1.7.14", + "@headlessui/react": "^1.7.15", "@heroicons/react": "^2.0.18", "@tailwindcss/forms": "^0.5.3", "commander": "^10.0.1" @@ -44,9 +44,9 @@ } }, "node_modules/@headlessui/react": { - "version": "1.7.14", - "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.7.14.tgz", - "integrity": "sha512-znzdq9PG8rkwcu9oQ2FwIy0ZFtP9Z7ycS+BAqJ3R5EIqC/0bJGvhT7193rFf+45i9nnPsYvCQVW4V/bB9Xc+gA==", + "version": "1.7.15", + "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.7.15.tgz", + "integrity": "sha512-OTO0XtoRQ6JPB1cKNFYBZv2Q0JMqMGNhYP1CjPvcJvjz8YGokz8oAj89HIYZGN0gZzn/4kk9iUpmMF4Q21Gsqw==", "dependencies": { "client-only": "^0.0.1" }, @@ -2032,9 +2032,9 @@ "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==" }, "@headlessui/react": { - "version": "1.7.14", - "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.7.14.tgz", - "integrity": "sha512-znzdq9PG8rkwcu9oQ2FwIy0ZFtP9Z7ycS+BAqJ3R5EIqC/0bJGvhT7193rFf+45i9nnPsYvCQVW4V/bB9Xc+gA==", + "version": "1.7.15", + "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.7.15.tgz", + "integrity": "sha512-OTO0XtoRQ6JPB1cKNFYBZv2Q0JMqMGNhYP1CjPvcJvjz8YGokz8oAj89HIYZGN0gZzn/4kk9iUpmMF4Q21Gsqw==", "requires": { "client-only": "^0.0.1" } diff --git a/package.json b/package.json index 8f305e08..f6f9db26 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ } ], "dependencies": { - "@headlessui/react": "^1.7.14", + "@headlessui/react": "^1.7.15", "@heroicons/react": "^2.0.18", "@tailwindcss/forms": "^0.5.3", "commander": "^10.0.1" From c40880a70b37b4c495a393691e9f22cac355a84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20Cora=C3=A7=C3=A3o?= Date: Sun, 4 Jun 2023 21:35:23 +0100 Subject: [PATCH 03/26] increased max version to Hugo latest v0.112.7 --- config.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.toml b/config.toml index eff0e53c..e376db5a 100644 --- a/config.toml +++ b/config.toml @@ -1,4 +1,5 @@ [module] [module.hugoVersion] extended = true - min = "0.87.0" \ No newline at end of file + min = "0.87.0" + max = "0.112.7" \ No newline at end of file From 14ceca7ca11492611242901d3ad7de4df7af54d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20Cora=C3=A7=C3=A3o?= Date: Sun, 4 Jun 2023 21:43:20 +0100 Subject: [PATCH 04/26] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f6f9db26..91ffabb9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-blowfish-theme", - "version": "2.34.1", + "version": "2.34.2", "description": "Blowfish theme for Hugo", "scripts": { "fullinstall": "npm run preinstall && npm install && npm run postinstall", From 982d80dae659b44bcf4f2a66aeb032104e101694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20Cora=C3=A7=C3=A3o?= Date: Mon, 5 Jun 2023 21:37:17 +0100 Subject: [PATCH 05/26] updated support for Hugo latest version --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index e376db5a..7211132b 100644 --- a/config.toml +++ b/config.toml @@ -2,4 +2,4 @@ [module.hugoVersion] extended = true min = "0.87.0" - max = "0.112.7" \ No newline at end of file + max = "0.113.0" \ No newline at end of file From 9f741eb71d40c073fd30dc168e2b0791f8e89fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20Cora=C3=A7=C3=A3o?= Date: Mon, 5 Jun 2023 22:42:37 +0100 Subject: [PATCH 06/26] updated deprecated configs --- config/_default/languages.en.toml | 18 +++--- config/_default/params.toml | 6 +- exampleSite/config/_default/languages.en.toml | 20 ++++--- .../content/docs/configuration/index.md | 57 ++++++++++++------- layouts/partials/header/basic.html | 6 +- 5 files changed, 63 insertions(+), 44 deletions(-) diff --git a/config/_default/languages.en.toml b/config/_default/languages.en.toml index 31e570ba..f138bb18 100644 --- a/config/_default/languages.en.toml +++ b/config/_default/languages.en.toml @@ -1,17 +1,17 @@ languageCode = "en" languageName = "English" -displayName = "EN" -isoCode = "en" weight = 1 -rtl = false - title = "Blowfish" -# logo = "img/logo.png" -# secondaryLogo = "img/secondary-logo.png" -# description = "My awesome website" -# copyright = "Copy, _right?_ :thinking_face:" -dateFormat = "2 January 2006" +[params] + displayName = "EN" + isoCode = "en" + rtl = false + dateFormat = "2 January 2006" + # logo = "img/logo.png" + # secondaryLogo = "img/secondary-logo.png" + # description = "My awesome website" + # copyright = "Copy, _right?_ :thinking_face:" # [author] # name = "Your name here" diff --git a/config/_default/params.toml b/config/_default/params.toml index fad98102..0e2f91ab 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -9,13 +9,13 @@ colorScheme = "blowfish" defaultAppearance = "light" # valid options: light or dark autoSwitchAppearance = true -enableSearch = false +enableSearch = true enableCodeCopy = false # mainSections = ["section1", "section2"] # robots = "" -disableImageOptimization = false +disableImageOptimization = true # defaultBackgroundImage = "IMAGE.jpg" # used as default for background images # defaultFeaturedImage = "IMAGE.jpg" # used as default for featured images in all articles @@ -31,7 +31,7 @@ disableImageOptimization = false showMenu = true showCopyright = true showThemeAttribution = true - showAppearanceSwitcher = false + showAppearanceSwitcher = true showScrollToTop = true [homepage] diff --git a/exampleSite/config/_default/languages.en.toml b/exampleSite/config/_default/languages.en.toml index 6131c4e7..e217854e 100644 --- a/exampleSite/config/_default/languages.en.toml +++ b/exampleSite/config/_default/languages.en.toml @@ -1,17 +1,17 @@ languageCode = "en" languageName = "English" -displayName = "EN" -isoCode = "en" weight = 1 -rtl = false - title = "Blowfish" -logo = "img/blowfish_logo_transparent.png" -#secondaryLogo = "PATH" -description = "A powerful, lightweight theme for Hugo built with Tailwind CSS." -# copyright = "Copy, _right?_ :thinking_face:" -dateFormat = "2 January 2006" +[params] + displayName = "EN" + isoCode = "en" + rtl = false + dateFormat = "2 January 2006" + logo = "img/blowfish_logo_transparent.png" + # secondaryLogo = "PATH" + description = "A powerful, lightweight theme for Hugo built with Tailwind CSS." + # copyright = "Copy, _right?_ :thinking_face:" [author] name = "Blowfish" @@ -23,3 +23,5 @@ dateFormat = "2 January 2006" { mastodon = "https://masto.ai/@blowfish" }, { github = "https://github.com/nunocoracao/blowfish" }, ] + + \ No newline at end of file diff --git a/exampleSite/content/docs/configuration/index.md b/exampleSite/content/docs/configuration/index.md index af844c6c..3fc570e1 100644 --- a/exampleSite/content/docs/configuration/index.md +++ b/exampleSite/content/docs/configuration/index.md @@ -57,7 +57,7 @@ The theme currently supports the following languages by default: | Language | Code | | ------------------------------ | ------- | -| 🇧🇬 Bulgarian | `bg` | +| 🇧🇬 Bulgarian | `bg` | | 🇧🇩 Bengali | `bn` | | 🇨🇿 Czech | `cs` | | 🇩🇪 German | `de` | @@ -95,24 +95,43 @@ The default file can be used as a template to create additional languages, or re **Note:** Ensure the `defaultContentLanguage` parameter in the [site configuration](#site-configuration) matches the language code in your language config filename. {{< /alert >}} + +### Global + -| Name | Default | Description | -| ----------------- | ------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `languageCode` | `"en"` | The Hugo language code for this file. It can be a top-level language (ie. `en`) or a sub-variant (ie. `en-au`) and should match the language code in the filename. Hugo expects this value to always be in lowercase. For proper HTML compliance, set the `isoCode` parameter which is case-sensitive. | -| `languageName` | `"English"` | The name of the language. | -| `displayName` | `"EN"` | The name used when the language appears on the website. | -| `isoCode` | `"en"` | The ISO language code for HTML metadata purposes. It can be a top-level language (ie. `en`) or a sub-variant (ie. `en-AU`). | -| `weight` | `1` | The weight determines the order of languages when building multilingual sites. | -| `rtl` | `false` | Whether or not this is a RTL language. Set to `true` to reflow content from right-to-left. Blowfish fully supports using RTL and LTR languages at the same time and will dynamically adjust to both. | -| `dateFormat` | `"2 January 2006"` | How dates are formatted in this language. Refer to the [Hugo docs](https://gohugo.io/functions/format/#gos-layout-string) for acceptable formats. | -| `title` | `"Blowfish"` | The title of the website. This will be displayed in the site header and footer. | -| `description` | _Not set_ | The website description. This will be used in the site metadata. | -| `copyright` | _Not set_ | A Markdown string for the site footer copyright message can include the placeholder { year } to dynamically insert the current year. If none is provided, Blowfish will automatically generate a copyright string using the site `title`. | -| `author.name` | _Not set_ | The author's name. This will be displayed in article footers, and on the homepage when the profile layout is used. | -| `author.image` | _Not set_ | Path to the image file of the author. The image should be a 1:1 aspect ratio and placed in the site's `assets/` folder. | -| `author.headline` | _Not set_ | A Markdown string containing the author's headline. It will be displayed on the profile homepage under the author's name. | -| `author.bio` | _Not set_ | A Markdown string containing the author's bio. It will be displayed in article footers. | -| `author.links` | _Not set_ | The links to display alongside the author's details. The config file contains example links which can simply be uncommented to enable. The order that the links are displayed is determined by the order they appear in the array. Custom links can be added by providing corresponding SVG icon assets in `assets/icons/`. | +| Name | Default | Description | +| -------------- | ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `languageCode` | `"en"` | The Hugo language code for this file. It can be a top-level language (ie. `en`) or a sub-variant (ie. `en-au`) and should match the language code in the filename. Hugo expects this value to always be in lowercase. For proper HTML compliance, set the `isoCode` parameter which is case-sensitive. | +| `languageName` | `"English"` | The name of the language. | +| `weight` | `1` | The weight determines the order of languages when building multilingual sites. | +| `title` | `"Blowfish"` | The title of the website. This will be displayed in the site header and footer. | + + +### Params + + +| Name | Default | Description | +| --------------- | ------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `params.displayName` | `"EN"` | The name used when the language appears on the website. | +| `params.isoCode` | `"en"` | The ISO language code for HTML metadata purposes. It can be a top-level language (ie. `en`) or a sub-variant (ie. `en-AU`). | +| `params.rtl` | `false` | Whether or not this is a RTL language. Set to `true` to reflow content from right-to-left. Blowfish fully supports using RTL and LTR languages at the same time and will dynamically adjust to both. | +| `params.dateFormat` | `"2 January 2006"` | How dates are formatted in this language. Refer to the [Hugo docs](https://gohugo.io/functions/format/#gos-layout-string) for acceptable formats. | +| `params.logo` | _Not set_ | The relative path to the site logo file within the `assets/` folder. The logo file should be provided at 2x resolution and supports any image dimensions. | +| `params.secondaryLogo` | _Not set_ | The relative path to the secondary site logo file within the `assets/` folder. The logo file should be provided at 2x resolution and supports any image dimensions. This should have an inverted/contrasting colour scheme to `logo`. If set, this logo will be shown when users toggle from the `defaultAppearance` mode. | +| `params.description` | _Not set_ | The website description. This will be used in the site metadata. | +| `params.copyright` | _Not set_ | A Markdown string for the site footer copyright message can include the placeholder { year } to dynamically insert the current year. If none is provided, Blowfish will automatically generate a copyright string using the site `title`. | + + + + +### Author +| Name | Default | Description | +| ----------------- | --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `author.name` | _Not set_ | The author's name. This will be displayed in article footers, and on the homepage when the profile layout is used. | +| `author.image` | _Not set_ | Path to the image file of the author. The image should be a 1:1 aspect ratio and placed in the site's `assets/` folder. | +| `author.headline` | _Not set_ | A Markdown string containing the author's headline. It will be displayed on the profile homepage under the author's name. | +| `author.bio` | _Not set_ | A Markdown string containing the author's bio. It will be displayed in article footers. | +| `author.links` | _Not set_ | The links to display alongside the author's details. The config file contains example links which can simply be uncommented to enable. The order that the links are displayed is determined by the order they appear in the array. Custom links can be added by providing corresponding SVG icon assets in `assets/icons/`. | ### Menus @@ -140,8 +159,6 @@ Many of the article defaults here can be overridden on a per article basis by sp | `autoSwitchAppearance` | `true` | Whether the theme appearance automatically switches based upon the visitor's operating system preference. Set to `false` to force the site to always use the `defaultAppearance`. | | `enableSearch` | `false` | Whether site search is enabled. Set to `true` to enable search functionality. Note that the search feature depends on the `outputs.home` setting in the [site configuration](#site-configuration) being set correctly. | | `enableCodeCopy` | `false` | Whether copy-to-clipboard buttons are enabled for `` blocks. The `highlight.noClasses` parameter must be set to `false` for code copy to function correctly. Read more about [other configuration files](#other-configuration-files) below. | -| `logo` | _Not set_ | The relative path to the site logo file within the `assets/` folder. The logo file should be provided at 2x resolution and supports any image dimensions. | -| `secondaryLogo` | _Not set_ | The relative path to the secondary site logo file within the `assets/` folder. The logo file should be provided at 2x resolution and supports any image dimensions. This should have an inverted/contrasting colour scheme to `logo`. If set, this logo will be shown when users toggle from the `defaultAppearance` mode. | | `mainSections` | _Not set_ | The sections that should be displayed in the recent articles list. If not provided the section with the greatest number of articles is used. | | `showViews` | _Not set_ | Whether or not articles and list views are displayed. This requires firebase integrations to be enabled, look below. | | `showLikes` | _Not set_ | Whether or not articles and list likes are displayed. This requires firebase integrations to be enabled, look below. | diff --git a/layouts/partials/header/basic.html b/layouts/partials/header/basic.html index c370accc..fd438429 100644 --- a/layouts/partials/header/basic.html +++ b/layouts/partials/header/basic.html @@ -4,7 +4,7 @@ {{ $logo := resources.Get .Site.Params.Logo }} {{ if $logo }}
- + {{ .Site.Title | markdownify | emojify }} -