Merge pull request #770 from nunocoracao/dev

🔖 release v2.35.1

assets/icons/graduation-cap.svg

@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512">
+<path fill="currentColor" d="M320 32c-8.1 0-16.1 1.4-23.7 4.1L15.8 137.4C6.3 140.9 0 149.9 0 160s6.3 19.1 15.8 22.6l57.9 20.9C57.3 229.3 48 259.8 48 291.9v28.1c0 28.4-10.8 57.7-22.3 80.8c-6.5 13-13.9 25.8-22.5 37.6C0 442.7-.9 448.3 .9 453.4s6 8.9 11.2 10.2l64 16c4.2 1.1 8.7 .3 12.4-2s6.3-6.1 7.1-10.4c8.6-42.8 4.3-81.2-2.1-108.7C90.3 344.3 86 329.8 80 316.5V291.9c0-30.2 10.2-58.7 27.9-81.5c12.9-15.5 29.6-28 49.2-35.7l157-61.7c8.2-3.2 17.5 .8 20.7 9s-.8 17.5-9 20.7l-157 61.7c-12.4 4.9-23.3 12.4-32.2 21.6l159.6 57.6c7.6 2.7 15.6 4.1 23.7 4.1s16.1-1.4 23.7-4.1L624.2 182.6c9.5-3.4 15.8-12.5 15.8-22.6s-6.3-19.1-15.8-22.6L343.7 36.1C336.1 33.4 328.1 32 320 32zM128 408c0 35.3 86 72 192 72s192-36.7 192-72L496.7 262.6 354.5 314c-11.1 4-22.8 6-34.5 6s-23.5-2-34.5-6L143.3 262.6 128 408z"/></svg>

assets/icons/scale-balanced.svg

@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 640 512">
+<path fill="currentColor" d="M384 32H512c17.7 0 32 14.3 32 32s-14.3 32-32 32H398.4c-5.2 25.8-22.9 47.1-46.4 57.3V448H512c17.7 0 32 14.3 32 32s-14.3 32-32 32H320 128c-17.7 0-32-14.3-32-32s14.3-32 32-32H288V153.3c-23.5-10.3-41.2-31.6-46.4-57.3H128c-17.7 0-32-14.3-32-32s14.3-32 32-32H256c14.6-19.4 37.8-32 64-32s49.4 12.6 64 32zm55.6 288H584.4L512 195.8 439.6 320zM512 416c-62.9 0-115.2-34-126-78.9c-2.6-11 1-22.3 6.7-32.1l95.2-163.2c5-8.6 14.2-13.8 24.1-13.8s19.1 5.3 24.1 13.8l95.2 163.2c5.7 9.8 9.3 21.1 6.7 32.1C627.2 382 574.9 416 512 416zM126.8 195.8L54.4 320H199.3L126.8 195.8zM.9 337.1c-2.6-11 1-22.3 6.7-32.1l95.2-163.2c5-8.6 14.2-13.8 24.1-13.8s19.1 5.3 24.1 13.8l95.2 163.2c5.7 9.8 9.3 21.1 6.7 32.1C242 382 189.7 416 126.8 416S11.7 382 .9 337.1z"/></svg>

config.toml

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

config/_default/languages.en.toml

@@ -1,18 +1,18 @@
 languageCode = "en"
 languageName = "English"
+weight = 1
+title = "Blowfish"
+
+[params]
   displayName = "EN"
   isoCode = "en"
-weight = 1
   rtl = false
-
+  dateFormat = "2 January 2006"
-title = "Blowfish"
   # logo = "img/logo.png"
   # secondaryLogo = "img/secondary-logo.png"
   # description = "My awesome website"
   # copyright = "Copy, _right?_ :thinking_face:"
 
-dateFormat = "2 January 2006"
-
 # [author]
 #   name = "Your name here"
 #   image = "img/blowfish_logo.png"

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]

exampleSite/config/_default/languages.en.toml

@@ -1,18 +1,18 @@
 languageCode = "en"
 languageName = "English"
+weight = 1
+title = "Blowfish"
+
+[params]
   displayName = "EN"
   isoCode = "en"
-weight = 1
   rtl = false
-
+  dateFormat = "2 January 2006"
-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"
-
 [author]
   name = "Blowfish"
   image = "img/blowfish_logo.png"
@@ -23,3 +23,5 @@ dateFormat = "2 January 2006"
     { mastodon = "https://masto.ai/@blowfish" },
     { github = "https://github.com/nunocoracao/blowfish" },
   ]
+
+  

exampleSite/config/_default/params.toml

@@ -113,7 +113,6 @@ smartTOCHideUnfocusedChildren = true
   cardView = true
   cardViewScreenWidth = false
   
-
 [firebase]
   apiKey = "AIzaSyB5tqlqDky77Vb4Tc4apiHV4hRZI18KGiY"
   authDomain = "blowfish-21fff.firebaseapp.com"

exampleSite/content/docs/configuration/index.md

@@ -95,19 +95,38 @@ 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
+
 <!-- prettier-ignore-start -->
 | 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.                                                                                                                                                                                                                                                            |
+<!-- prettier-ignore-end -->
-| `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`.                                                                                   |
+
+#### Params
+
+<!-- prettier-ignore-start -->
+| 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`.                                                                                  |
+
+
+<!-- prettier-ignore-end -->
+
+#### 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.                                                                                                                                                                                                   |
@@ -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 `<code>` 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.                                                                                                                              |

exampleSite/content/samples/icons/index.md

@@ -49,6 +49,7 @@ The full list of built-in icons and their corresponding names can referenced bel
 | globe                | {{< icon globe >}}                |
 | goodreads            | {{< icon goodreads >}}            |
 | google               | {{< icon google >}}               |
+| graduation-cap       | {{< icon graduation-cap >}}       |
 | hackernews           | {{< icon hackernews >}}           |
 | hashnode             | {{< icon hashnode >}}             |
 | heart-empty          | {{< icon heart-empty >}}          |
@@ -83,6 +84,7 @@ The full list of built-in icons and their corresponding names can referenced bel
 | researchgate         | {{< icon researchgate >}}         |
 | rss                  | {{< icon rss >}}                  |
 | rss-square           | {{< icon rss-square >}}           |
+| scale-balanced       | {{< icon scale-balanced >}}       |
 | search               | {{< icon search >}}               |
 | shield               | {{< icon shield >}}               |
 | skull-crossbones     | {{< icon skull-crossbones >}}     |

layouts/partials/analytics.html

@@ -1,9 +0,0 @@
-{{ with site.Params.fathomAnalytics.site }}
-{{ if isset $.Site.Params.fathomanalytics "domain" }}
-<script defer src="https://{{ $.Site.Params.fathomanalytics.domain }}/script.js" data-site="{{ . }}"></script>
-{{ else }}
-<script defer src="https://cdn.usefathom.com/script.js" data-site="{{ . }}"></script>
-{{ end }}
-{{ end }}
-{{/* template "_internal/google_analytics.html" . */}}
-{{ partial "ga-analytics.html" }}

layouts/partials/analytics/fathom.html

@@ -0,0 +1,5 @@
+{{ if isset site.Params.fathomAnalytics "domain" }}
+<script defer src="https://{{ site.Params.fathomAnalytics.domain }}/script.js" data-site="{{ . }}"></script>
+{{ else }}
+<script defer src="https://cdn.usefathom.com/script.js" data-site="{{ . }}"></script>
+{{ end }}

layouts/partials/analytics/ga.html

@@ -1,4 +1,3 @@
-{{ if site.Config.Services.GoogleAnalytics.ID }}
 <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.Config.Services.GoogleAnalytics.ID }}"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
@@ -7,4 +6,3 @@
 
   gtag('config', '{{ site.Config.Services.GoogleAnalytics.ID }}');
 </script>
-{{ end }}

layouts/partials/analytics/main.html

@@ -0,0 +1,6 @@
+{{ with site.Params.fathomAnalytics.site }}
+{{ partial "analytics/fathom.html" }}
+{{ end }}
+{{ with site.Config.Services.GoogleAnalytics.ID }}
+{{ partial "analytics/ga.html" }}
+{{ end }}

layouts/partials/head.html

@@ -113,7 +113,7 @@
   {{/* Vendor */}}
   {{ partial "vendor.html" . }}
   {{/* Analytics */}}
-  {{ partial "analytics.html" .Site }}
+  {{ partial "analytics/main.html" .Site }}
   {{/* Extend head - eg. for custom analytics scripts, etc. */}}
   {{ if templates.Exists "partials/extend-head.html" }}
   {{ partialCached "extend-head.html" .Site }}

layouts/partials/header/basic.html

@@ -23,7 +23,7 @@
 
 
         </nav>
-        <nav class="hidden md:flex items-center space-x-5 md:ml-12">
+        <nav class="hidden md:flex items-center space-x-5 md:ml-12 h-12">
 
             {{ if .Site.Menus.main }}
             {{ range .Site.Menus.main }}
@@ -34,7 +34,7 @@
             {{ partial "translations.html" . }}
 
             {{ if .Site.Params.enableSearch | default false }}
-            <button id="search-button" aria-label="Search" class="text-base hover:text-primary-600 dark:hover:text-primary-400"
+            <button id="search-button" aria-label="Search" class="text-base hover:text-primary-600 dark:hover:text-primary-400 h-12"
                 title="{{ i18n " search.open_button_title" }}">
                 {{ partial "icon.html" "search" }}
             </button>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.34.2",
+  "version": "2.35.1",
   "description": "Blowfish theme for Hugo",
   "scripts": {
     "fullinstall": "npm run preinstall && npm install && npm run postinstall",