Merge 984bb01c79 into e615de3755

CHANGELOG.md

@@ -6,20 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
-### Added
-
-- Warning when building if links to markdown files cannot be resolved ([#691](https://github.com/jpanther/congo/pull/691))
-
-### Removed
-
-- Fathom Analytics custom domain parameter as this is no longer supported by Fathom
-
-## [2.7.6] - 2023-11-26
-
-### Fixed
-
-- Some Mermaid diagram elements not styled correctly in dark mode ([#706](https://github.com/jpanther/congo/issues/706))
-
 ## [2.7.5] - 2023-11-25
 
 ### Added
@@ -811,8 +797,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Advanced customisation using simple Tailwind colour definitions and styles
 - Fully documented
 
-[Unreleased]: https://github.com/jpanther/congo/compare/v2.7.6...HEAD
-[2.7.6]: https://github.com/jpanther/congo/compare/v2.7.5...v2.7.6
+[Unreleased]: https://github.com/jpanther/congo/compare/v2.7.5...HEAD
 [2.7.5]: https://github.com/jpanther/congo/compare/v2.7.4...v2.7.5
 [2.7.4]: https://github.com/jpanther/congo/compare/v2.7.3...v2.7.4
 [2.7.3]: https://github.com/jpanther/congo/compare/v2.7.2...v2.7.3

CODE_OF_CONDUCT.md

@@ -1,43 +0,0 @@
-# Code of Conduct - Congo
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behaviour that contributes to a positive environment for our community include:
-
-- Demonstrating empathy and kindness toward other people
-- Being respectful of differing opinions, viewpoints, and experiences
-- Giving and gracefully accepting constructive feedback
-- Accepting responsibility and apologising to those affected by our mistakes, and learning from the experience
-- Focusing on what is best not just for us as individuals, but for the overall community
-
-Examples of unacceptable behaviour include:
-
-- The use of sexualised language or imagery, and sexual attention or advances
-- Trolling, insulting or derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or email address, without their explicit permission
-- Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying and enforcing our standards of acceptable behaviour and will take appropriate and fair corrective action in response to any instances of unacceptable behaviour.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviours that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behaviour may be reported to the [project maintainer](https://github.com/jpanther/). All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant](https://contributor-covenant.org/), version [1.4](https://www.contributor-covenant.org/version/1/4/code-of-conduct/code_of_conduct.md) and [2.0](https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md), and was generated by [contributing-gen](https://github.com/bttger/contributing-gen).

assets/css/compiled/main.css

@@ -1,4 +1,4 @@
-/*! Congo v2.7.6 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.7.5 | MIT License | https://github.com/jpanther/congo */
 
 /*! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com */
 

assets/css/main.css

@@ -1,4 +1,4 @@
-/*! Congo v2.7.6 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.7.5 | MIT License | https://github.com/jpanther/congo */
 
 @tailwind base;
 @tailwind components;

assets/js/mermaid.js

@@ -2,29 +2,19 @@ function css(name) {
   return "rgb(" + getComputedStyle(document.documentElement).getPropertyValue(name) + ")";
 }
 
-let isDark = document.documentElement.classList.contains("dark");
-
 mermaid.initialize({
   theme: "base",
   themeVariables: {
     background: css("--color-neutral"),
-    primaryTextColor: isDark ? css("--color-neutral-200") : css("--color-neutral-700"),
-    primaryColor: isDark ? css("--color-primary-700") : css("--color-primary-200"),
-    secondaryColor: isDark ? css("--color-secondary-700") : css("--color-secondary-200"),
-    tertiaryColor: isDark ? css("--color-neutral-700") : css("--color-neutral-100"),
-    primaryBorderColor: isDark ? css("--color-primary-500") : css("--color-primary-400"),
+    primaryColor: css("--color-primary-200"),
+    secondaryColor: css("--color-secondary-200"),
+    tertiaryColor: css("--color-neutral-100"),
+    primaryBorderColor: css("--color-primary-400"),
     secondaryBorderColor: css("--color-secondary-400"),
-    tertiaryBorderColor: isDark ? css("--color-neutral-300") : css("--color-neutral-400"),
-    lineColor: isDark ? css("--color-neutral-300") : css("--color-neutral-600"),
+    tertiaryBorderColor: css("--color-neutral-400"),
+    lineColor: css("--color-neutral-600"),
     fontFamily:
       "ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif",
     fontSize: "16px",
-    pieTitleTextSize: "19px",
-    pieSectionTextSize: "16px",
-    pieLegendTextSize: "16px",
-    pieStrokeWidth: "1px",
-    pieOuterStrokeWidth: "0.5px",
-    pieStrokeColor: isDark ? css("--color-neutral-300") : css("--color-neutral-400"),
-    pieOpacity: "1",
   },
 });

config/_default/params.toml

@@ -68,6 +68,7 @@ fingerprintAlgorithm = "sha256"
 
 [fathomAnalytics]
   # site = "ABC12345"
+  # domain = "llama.yoursite.com"
 
 [plausibleAnalytics]
   # domain = "blog.yoursite.com"

exampleSite/config/_default/params.toml

@@ -68,6 +68,7 @@ fingerprintAlgorithm = "sha256"
 
 [fathomAnalytics]
   # site = "ABC12345"
+  # domain = "llama.yoursite.com"
 
 [verification]
   # google = ""

exampleSite/content/docs/configuration/index.ja.md

@@ -169,6 +169,7 @@ Congoはテーマの機能を制御する多数の設定パラメーターを提
 |`sitemap.excludedKinds`|`["taxonomy", "term"]`|生成される `/sitemap.xml` から除外されるべきコンテンツの種類。許容される値については[Hugo docs](https://gohugo.io/templates/section-templates/#page-kinds)を参照してください。|
 |`taxonomy.showTermCount`|`true`|TaxonomiesのリストにTermごとの記事数を表示するかどうか。|
 |`fathomAnalytics.site`|_Not set_|Fathom Analyticsによって生成されたウェブサイトのサイトコード。詳細は[アナリティクス]({{< ref "partials#アナリティクス" >}})を参照してください。|
+|`fathomAnalytics.domain`|_Not set_|Fathom Analyticsでカスタムドメインを使用している場合、カスタムドメインから`script.js`を提供するためにここに指定します。|
 |`verification.google`|_Not set_|サイトのメタデータに含めるGoogleが提供するサイト検証文字列。|
 |`verification.bing`|_Not set_|サイトのメタデータに含めるBingが提供するサイト検証文字列。|
 |`verification.pinterest`|_Not set_|サイトのメタデータに含めるPinterestが提供するサイト検証文字列。|

exampleSite/content/docs/configuration/index.md

@@ -169,6 +169,7 @@ Many of the article defaults here can be overridden on a per article basis by sp
 |`sitemap.excludedKinds`|`["taxonomy", "term"]`|Kinds of content that should be excluded from the generated `/sitemap.xml` file. Refer to the [Hugo docs](https://gohugo.io/templates/section-templates/#page-kinds) for acceptable values.|
 |`taxonomy.showTermCount`|`true`|Whether or not the number of articles within a taxonomy term is displayed on the taxonomy listing.|
 |`fathomAnalytics.site`|_Not set_|The site code generated by Fathom Analytics for the website. Refer to the [Analytics docs]({{< ref "partials#analytics" >}}) for more details.|
+|`fathomAnalytics.domain`|_Not set_|If using a custom domain with Fathom Analytics, provide it here to serve `script.js` from the custom domain.|
 |`plausibleAnalytics.domain`|_Not set_|Enter the domain of the website you want to track. Refer to the [Analytics docs]({{< ref "partials#analytics" >}}) for more details.|
 |`plausibleAnalytics.event`|_Not set_|Plausible api event proxied URL. Refer to the [Analytics docs]({{< ref "partials#analytics" >}}) for more details.|
 |`plausibleAnalytics.script`|_Not set_|Plausible analysis script proxied URL. Refer to the [Analytics docs]({{< ref "partials#analytics" >}}) for more details.|

exampleSite/content/docs/partials/index.md

@@ -10,21 +10,18 @@ tags: ["partials", "analytics", "privacy", "comments", "favicons", "icon", "docs
 
 ## Analytics
 
-Congo provides support for various analytics providers out of the box, as well as the ability to include custom code for any provider of your choice. If you don't currently have an analytics provider, check out Fathom Analytics.
+Congo provides built-in support for Fathom Analytics and Google Analytics. Fathom is a paid alternative to Google Analytics that respects user privacy. If you're interested you can use this affiliate link to [receive $10 credit](https://usefathom.com/ref/RLAJSV) and try the service.
 
 ### Fathom Analytics
 
-Fathom Analytics is a privacy-first service that is a great alternative to Google Analytics. It allows you to get all the visitor information you need, without spying on them. As a Congo user, you can use this affiliate link to [receive $10 credit](https://usefathom.com/ref/RLAJSV) and try the service.
-
-[![Fathom Analytics. Website analytics without compromise. Zero cookies, GDPR compliant, and privacy-first. Start a free trial.](fathom-analytics.jpg)](https://usefathom.com/ref/RLAJSV)
-
-To enable Fathom Analytics support, simply provide your Fathom site code in the `config/_default/params.toml` file. The script will load in your site directly from the Fathom Analytics CDN.
+To enable Fathom Analytics support, simply provide your Fathom site code in the `config/_default/params.toml` file. If you also use the custom domain feature of Fathom and would like to serve their script from your domain, you can also additionally provide the `domain` configuration value. If you don't provide a `domain` value, the script will load directly from Fathom DNS.
 
 ```toml
 # config/_default/params.toml
 
 [fathomAnalytics]
   site = "ABC12345"
+  domain = "llama.yoursite.com"
 ```
 
 ### Plausible Analytics

layouts/_default/_markup/render-link.html

@@ -2,16 +2,10 @@
 {{- $isRemote := strings.HasPrefix $link "http" -}}
 {{- if not $isRemote }}
   {{ $url := urls.Parse .Destination }}
-  {{- if $url.Path }}
+  {{ if $url.Path }}
     {{ $fragment := "" }}
     {{- with $url.Fragment }}{{ $fragment = printf "#%s" . }}{{ end -}}
-    {{- with .Page.GetPage $url.Path }}
-      {{ $link = printf "%s%s" .RelPermalink $fragment }}
-    {{ else }}
-      {{- if hasSuffix $url.Path ".md" }}
-        {{ warnf "[CONGO] Can't resolve: %s" .Destination }}
-      {{ end -}}
-    {{ end -}}
-  {{ end -}}
+    {{- with .Page.GetPage $url.Path }}{{ $link = printf "%s%s" .RelPermalink $fragment }}{{ end -}}
+  {{ end }}
 {{ end -}}
 <a href="{{ $link | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{- .Text | safeHTML -}}</a>

layouts/partials/analytics.html

@@ -1,6 +1,10 @@
 {{ if hugo.IsProduction }}
   {{ with .Site.Params.fathomAnalytics.site }}
-    <script defer src="https://cdn.usefathom.com/script.js" data-site="{{ . }}"></script>
+    {{ 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 }}
   {{ with site.Params.plausibleAnalytics.domain }}
     <script defer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-congo-theme",
-  "version": "2.7.6",
+  "version": "2.7.5",
   "description": "Congo theme for Hugo",
   "scripts": {
     "preinstall": "rimraf assets/lib",