Merge pull request #770 from nunocoracao/dev

🔖 release v2.35.1
nunocoracao · Jun 6, 2023 · aa03e67 · aa03e67
2 parents 02da08d + 6f08a1d
commit aa03e67
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 15 deletions.
diff --git a/assets/icons/graduation-cap.svg b/assets/icons/graduation-cap.svg
diff --git a/assets/icons/scale-balanced.svg b/assets/icons/scale-balanced.svg
diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml
@@ -113,7 +113,6 @@ smartTOCHideUnfocusedChildren = true
   cardView = true
   cardViewScreenWidth = false
 
-
 [firebase]
   apiKey = "AIzaSyB5tqlqDky77Vb4Tc4apiHV4hRZI18KGiY"
   authDomain = "blowfish-21fff.firebaseapp.com"

diff --git a/exampleSite/content/samples/icons/index.md b/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 >}}     |

diff --git a/layouts/partials/analytics.html b/layouts/partials/analytics.html
diff --git a/layouts/partials/analytics/fathom.html b/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 }}
diff --git a/layouts/partials/ga-analytics.html → layouts/partials/analytics/ga.html b/layouts/partials/ga-analytics.html → layouts/partials/analytics/ga.html
@@ -1,10 +1,8 @@
-{{ 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 || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
 
   gtag('config', '{{ site.Config.Services.GoogleAnalytics.ID }}');
-</script>
-{{ end }}
+</script>
diff --git a/layouts/partials/analytics/main.html b/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 }}
diff --git a/layouts/partials/head.html b/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 }}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.35.0",
+  "version": "2.35.1",
   "description": "Blowfish theme for Hugo",
   "scripts": {
     "fullinstall": "npm run preinstall && npm install && npm run postinstall",