From dc4332a252d043da6c6e4421210e80c8626b9d62 Mon Sep 17 00:00:00 2001 From: Klemens Dickbauer Date: Mon, 2 Oct 2023 01:18:24 +0200 Subject: [PATCH 01/24] added lastmode date after slash in the post header if available. Signed-off-by: kdi --- layouts/partials/post-meta.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/layouts/partials/post-meta.html b/layouts/partials/post-meta.html index e46eb0e8..2500f688 100644 --- a/layouts/partials/post-meta.html +++ b/layouts/partials/post-meta.html @@ -11,6 +11,10 @@ {{ partial "sprite" (dict "icon" "calendar") }} {{ .Date.Format (default "Jan 2, 2006" $.Site.Params.dateFormat) -}} + {{ if ne .Date .Lastmod }} + / + {{ end }} {{- $scratch.Set "writeSeparator" true }} {{- end }} From 46ba1ae0afae24d1cad3bd39e7c55ef4a64bfda6 Mon Sep 17 00:00:00 2001 From: Klemens Dickbauer Date: Mon, 2 Oct 2023 01:28:37 +0200 Subject: [PATCH 02/24] Update README.md for lastmod attribute Signed-off-by: kdi --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 29d84f7e..9a27fb46 100644 --- a/README.md +++ b/README.md @@ -267,6 +267,7 @@ These options can be set from a page [frontmatter](https://gohugo.io/content-man |:-------------------- | ------------------ | ---------------- | | title | string | N/A | | date | date | N/A | +| lastmod | date | N/A | | description | string | N/A | | keywords | array of strings | yes | | introDescription | string | yes | From 8790399fa282118b2b58a9e221441f82701f0178 Mon Sep 17 00:00:00 2001 From: Klemens Dickbauer Date: Tue, 3 Oct 2023 00:59:07 +0200 Subject: [PATCH 03/24] added parameters for last modified rendering Signed-off-by: kdi --- layouts/partials/post-meta.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/layouts/partials/post-meta.html b/layouts/partials/post-meta.html index 2500f688..386ae114 100644 --- a/layouts/partials/post-meta.html +++ b/layouts/partials/post-meta.html @@ -1,5 +1,7 @@ {{- $showShare := ne (.Param "showshare") false }} {{- $showDate := ne (.Param "showdate") false }} +{{- $showLastmod := default false (.Param "showLastmod") }} +{{- $lastmodSeparator := default "/" (.Param "lastmodSeparator") }} {{- $showReadTime := ne (.Param "showreadtime") false }} {{- $showPostMeta := or ($showShare) ($showDate) ($showReadTime) (isset .Params "tags") }} {{- $scratch := newScratch }} @@ -11,8 +13,8 @@ {{ partial "sprite" (dict "icon" "calendar") }} {{ .Date.Format (default "Jan 2, 2006" $.Site.Params.dateFormat) -}} - {{ if ne .Date .Lastmod }} - / From 27652180482cd281d5cb87b82853aae2496ed252 Mon Sep 17 00:00:00 2001 From: Klemens Dickbauer Date: Tue, 3 Oct 2023 01:01:47 +0200 Subject: [PATCH 04/24] added the showLastmod and lastmodSeparator params Signed-off-by: kdi --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9a27fb46..a61d750b 100644 --- a/README.md +++ b/README.md @@ -291,6 +291,8 @@ These options can be set from a page [frontmatter](https://gohugo.io/content-man | comments | boolean | yes | | enableMathNotation | boolean | yes | | showDate | boolean | N/A | +| showLastmod | boolean | N/A | +| lastmodSeparator | string | N/A | | showShare | boolean | N/A | | showReadTime | boolean | N/A | | sidebar | boolean | N/A | From 28f11089005efa8a6cb591039b01873a262e2f81 Mon Sep 17 00:00:00 2001 From: Luke Hong Date: Tue, 19 Dec 2023 16:28:00 +0800 Subject: [PATCH 05/24] Fix unexpected posts in recent posts list issue Signed-off-by: Luke Hong Signed-off-by: kdi --- layouts/partials/sidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 17b18b24..d649615b 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -72,7 +72,7 @@

{{ T "featured_posts" }}

{{ T "recent_posts" }}

    {{- $recent := default 8 $s.numberOfRecentPosts }} - {{- range first $recent $posts | symdiff $featuredPosts }} + {{- range first $recent ($posts | symdiff $featuredPosts) }}
  • {{ .Title | markdownify }}
    • From 043ddf147ef5ecb6f0c83a3a4125393ce2037ff5 Mon Sep 17 00:00:00 2001 From: Jokey Li Date: Sat, 2 Mar 2024 18:08:06 +0800 Subject: [PATCH 06/24] Improve Chinese translator text Signed-off-by: Jokey Li Signed-off-by: kdi --- i18n/zh-CN.toml | 20 ++++++++++++++++++-- i18n/zh-TW.toml | 20 ++++++++++++++++++-- i18n/zh.toml | 20 ++++++++++++++++++-- 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/i18n/zh-CN.toml b/i18n/zh-CN.toml index b53c86d6..bcfd27ed 100644 --- a/i18n/zh-CN.toml +++ b/i18n/zh-CN.toml @@ -50,7 +50,23 @@ other = "所有专栏" other = "文章目录" [reading_time] -other = "{{ .ReadingTime }} min read" +other = "{{ .ReadingTime }} 分钟阅读" [series_posts] -other = "Posts in this series" +other = "相关系列文章" + +# search +[quick_links] + other = "搜索到的结果" +[no_matches] + other = "未找到结果" +[search_field_placeholder] + other = "搜索知识库" +[blog_search_field_placeholder] + other = "搜索内容..." +[search_results_label] + other = "搜索到的结果" +[short_search_query] + other = "搜索字符太短" +[type_to_search] + other = "请输入内容查找" \ No newline at end of file diff --git a/i18n/zh-TW.toml b/i18n/zh-TW.toml index 06b5c698..d6b9fd21 100644 --- a/i18n/zh-TW.toml +++ b/i18n/zh-TW.toml @@ -50,7 +50,23 @@ other = "所有專欄" other = "文章目錄" [reading_time] -other = "{{ .ReadingTime }} 分鐘長" +other = "{{ .ReadingTime }} 分鐘閱讀" [series_posts] -other = "此系列文章" +other = "相關係列文章" + +# search +[quick_links] + other = "搜尋到的結果" +[no_matches] + other = "未找到結果" +[search_field_placeholder] + other = "搜尋知識庫" +[blog_search_field_placeholder] + other = "搜尋內容..." +[search_results_label] + other = "搜尋到的結果" +[short_search_query] + other = "搜尋字元太短" +[type_to_search] + other = "請輸入內容尋找" \ No newline at end of file diff --git a/i18n/zh.toml b/i18n/zh.toml index b53c86d6..f6979a7f 100644 --- a/i18n/zh.toml +++ b/i18n/zh.toml @@ -50,7 +50,23 @@ other = "所有专栏" other = "文章目录" [reading_time] -other = "{{ .ReadingTime }} min read" +other = "{{ .ReadingTime }} 分钟阅读" [series_posts] -other = "Posts in this series" +other = "相关系列文章" + +# search +[quick_links] + other = "搜索到的结果" +[no_matches] + other = "未找到结果" +[search_field_placeholder] + other = "搜索知识库" +[blog_search_field_placeholder] + other = "搜索内容..." +[search_results_label] + other = "搜索到的结果" +[short_search_query] + other = "搜索字符太短" +[type_to_search] + other = "请输入内容查找" From 3be813c1244e99aa2c43a355a45e38a05d580650 Mon Sep 17 00:00:00 2001 From: Jokey Li Date: Sat, 2 Mar 2024 17:39:41 +0800 Subject: [PATCH 07/24] fix series_posts hard code display Signed-off-by: Jokey Li Signed-off-by: kdi --- layouts/partials/related.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/related.html b/layouts/partials/related.html index 757bcb54..123fd6da 100644 --- a/layouts/partials/related.html +++ b/layouts/partials/related.html @@ -1,6 +1,6 @@ {{ if isset .Params "series" }} {{$related := where .Site.RegularPages ".Params.series" "eq" .Params.series }} -

    Posts in this Series

    +

    {{ T "series_posts" }}

      {{ range $related }}
    • {{ .Title }}
      • From f18a267000e04a350d9d3616401a772851ce646a Mon Sep 17 00:00:00 2001 From: Jack Hughes Date: Tue, 30 Jan 2024 14:55:08 +0000 Subject: [PATCH 08/24] Fix icons/src property so that it does not 404 Signed-off-by: digitalbricklayer Signed-off-by: kdi --- static/icons/site.webmanifest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/icons/site.webmanifest b/static/icons/site.webmanifest index de65106f..6d25c20e 100644 --- a/static/icons/site.webmanifest +++ b/static/icons/site.webmanifest @@ -3,12 +3,12 @@ "short_name": "", "icons": [ { - "src": "/android-chrome-192x192.png", + "src": "android-chrome-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/android-chrome-256x256.png", + "src": "android-chrome-256x256.png", "sizes": "256x256", "type": "image/png" } From 72f6392cc856e8ac0a32b79b4cb25f1d26b24385 Mon Sep 17 00:00:00 2001 From: Christian Stankowic Date: Fri, 29 Mar 2024 08:45:29 +0100 Subject: [PATCH 09/24] add noindex parameter Signed-off-by: Christian Stankowic Signed-off-by: kdi --- layouts/partials/head.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index da8fcb53..7c562af5 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -10,6 +10,9 @@ {{- end }} {{ with $title }}{{ . }} {{ $separator }} {{ end }}{{ .Site.Title }} +{{ if .Params.noindex }} + +{{ end }} {{- with $params.ga_verify }} {{- end }} From 9c1d6acbc4ab601ac61ecd842629e7974c8b8155 Mon Sep 17 00:00:00 2001 From: Christian Stankowic Date: Fri, 29 Mar 2024 08:48:15 +0100 Subject: [PATCH 10/24] fix spacing Signed-off-by: Christian Stankowic Signed-off-by: kdi --- layouts/partials/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 7c562af5..ab249774 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -11,7 +11,7 @@ {{ with $title }}{{ . }} {{ $separator }} {{ end }}{{ .Site.Title }} {{ if .Params.noindex }} - + {{ end }} {{- with $params.ga_verify }} From cf6f528755eb3d9220c53e49d4b7ea6d0a2fb925 Mon Sep 17 00:00:00 2001 From: Christian Stankowic Date: Fri, 29 Mar 2024 08:58:26 +0100 Subject: [PATCH 11/24] update documentation Signed-off-by: Christian Stankowic Signed-off-by: kdi --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a61d750b..b8a76692 100644 --- a/README.md +++ b/README.md @@ -258,6 +258,7 @@ These options set global values that some pages or all pages in the site use by | showRelatedInSidebar | boolean | no | | footerLogo | string | N/A | | enableSearch | boolean | N/A | +| noindex | boolean | N/A | ### Page Parameters From ef43b45a75219d553a141ca97227a502704d8c65 Mon Sep 17 00:00:00 2001 From: Christian Stankowic Date: Sun, 28 Apr 2024 20:59:45 +0200 Subject: [PATCH 12/24] move parameter to proper documentation section Signed-off-by: Christian Stankowic Signed-off-by: kdi --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b8a76692..6b0a386b 100644 --- a/README.md +++ b/README.md @@ -258,7 +258,6 @@ These options set global values that some pages or all pages in the site use by | showRelatedInSidebar | boolean | no | | footerLogo | string | N/A | | enableSearch | boolean | N/A | -| noindex | boolean | N/A | ### Page Parameters @@ -299,6 +298,7 @@ These options can be set from a page [frontmatter](https://gohugo.io/content-man | sidebar | boolean | N/A | | singleColumn | boolean | N/A | | showRelatedInArticle | boolean | N/A | +| noindex | boolean | N/A | ### Modify Menus From 3ba622ee2f6a3afe9763f8137aca5ade617641c0 Mon Sep 17 00:00:00 2001 From: barefootstache Date: Sat, 14 Sep 2024 21:15:35 +0200 Subject: [PATCH 13/24] fix: onhover link icon color in dark mode Signed-off-by: barefootstache Signed-off-by: kdi --- assets/sass/_variables.sass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/sass/_variables.sass b/assets/sass/_variables.sass index afabd693..c79b982f 100644 --- a/assets/sass/_variables.sass +++ b/assets/sass/_variables.sass @@ -110,7 +110,9 @@ html img background: none svg - fill: #fafafa + fill: #fafafa + &:not(svg) + filter: invert(0.87) .sidebar &_inner &::before From d574dbc743bbdb03b022cf614705bdd8113c6918 Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Fri, 13 Sep 2024 22:05:49 +0200 Subject: [PATCH 14/24] Fix errors and warnings Signed-off-by: Andreas Deininger Signed-off-by: kdi --- exampleSite/config/_default/{config.toml => hugo.toml} | 5 ++++- layouts/partials/comments.html | 2 +- layouts/partials/func/getDefaultLanguage.html | 2 +- layouts/partials/func/getStylesBundle.html | 2 +- layouts/partials/header.html | 2 +- theme.toml | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) rename exampleSite/config/_default/{config.toml => hugo.toml} (95%) diff --git a/exampleSite/config/_default/config.toml b/exampleSite/config/_default/hugo.toml similarity index 95% rename from exampleSite/config/_default/config.toml rename to exampleSite/config/_default/hugo.toml index b1dbfb87..387c99fd 100644 --- a/exampleSite/config/_default/config.toml +++ b/exampleSite/config/_default/hugo.toml @@ -4,7 +4,7 @@ baseurl = "https://example.com/" # Include trailing slash # title = "Clarity" # Edit directly from config/_default/languages.toml # alternatively, uncomment this and remove `title` entry from the aforemention file. copyright = "Copyright © 2008–2018, Steve Francia and the Hugo Authors; all rights reserved." # canonifyurls = true -paginate = 10 + theme = "hugo-clarity" disqusShortname = "" @@ -22,3 +22,6 @@ series = "series" [outputs] home = ["HTML", "RSS", "JSON"] + +[pagination] + pagerSize = 10 diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html index eb141351..311788ff 100644 --- a/layouts/partials/comments.html +++ b/layouts/partials/comments.html @@ -1,5 +1,5 @@
      - {{ if .Site.DisqusShortname }} + {{ if .Site.Config.Services.Disqus.Shortname }} {{ template "_internal/disqus.html" . }} {{ end }} {{ if .Site.Params.utterances }} diff --git a/layouts/partials/func/getDefaultLanguage.html b/layouts/partials/func/getDefaultLanguage.html index e8f55717..45911d36 100644 --- a/layouts/partials/func/getDefaultLanguage.html +++ b/layouts/partials/func/getDefaultLanguage.html @@ -1,5 +1,5 @@ {{ $defaultLanguage := site.LanguageCode }} -{{ if site.IsMultiLingual}} +{{ if hugo.IsMultilingual }} {{ $languages := site.Languages }} {{ $order := slice }} {{ range $languages }} diff --git a/layouts/partials/func/getStylesBundle.html b/layouts/partials/func/getStylesBundle.html index e35c4a5d..09dede67 100644 --- a/layouts/partials/func/getStylesBundle.html +++ b/layouts/partials/func/getStylesBundle.html @@ -1,6 +1,6 @@ {{ $options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed" "enableSourceMap" "true") }} {{ $mainSassFile := "sass/main.sass" }} -{{ $styles := resources.Get $mainSassFile | resources.ExecuteAsTemplate $mainSassFile . | resources.ToCSS $options | resources.Fingerprint "sha512" }} +{{ $styles := resources.Get $mainSassFile | resources.ExecuteAsTemplate $mainSassFile . | css.Sass $options | resources.Fingerprint "sha512" }} {{ return $styles }} \ No newline at end of file diff --git a/layouts/partials/header.html b/layouts/partials/header.html index a348b6ee..8008bf14 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -16,7 +16,7 @@ {{- else }} {{ partial "nav" (dict "context" . "menu" .Site.Menus.main) }} {{- end }} - {{ if .Site.IsMultiLingual }} + {{ if hugo.IsMultilingual }}
      {{ $params.languageMenuName }}
      diff --git a/theme.toml b/theme.toml index d5fa81bb..551ea808 100644 --- a/theme.toml +++ b/theme.toml @@ -6,7 +6,7 @@ homepage = "https://github.com/chipzoller/hugo-clarity" demosite = "https://neonmirrors.net/" tags = ["blog", "technical", "simple", "dark", "syntax highlighting"] features = ["blog", "technical", "simple", "dark", "syntax highlighting"] -min_version = "0.91.0" +min_version = "0.128.0" # If the theme has multiple authors authors = [ From 94868be78242324eb459e5c6b4f740fd75ae8f35 Mon Sep 17 00:00:00 2001 From: chipzoller Date: Fri, 13 Sep 2024 17:40:02 -0400 Subject: [PATCH 15/24] bumps in CI test Signed-off-by: chipzoller Signed-off-by: kdi --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6012b942..dd655748 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,12 +9,12 @@ jobs: matrix: hugo-version: - 'latest' - - '0.95.0' + - '0.128.0' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Hugo - uses: peaceiris/actions-hugo@v2 + uses: peaceiris/actions-hugo@v3 with: hugo-version: ${{ matrix.hugo-version }} extended: true From 8713230c43b23ddc0cd569dc5965bc433f757492 Mon Sep 17 00:00:00 2001 From: chipzoller Date: Fri, 13 Sep 2024 17:44:16 -0400 Subject: [PATCH 16/24] remove unused CI files Signed-off-by: chipzoller Signed-off-by: kdi --- ...atic-web-apps-agreeable-wave-04f2b6c03.yml | 45 ------------------- ...static-web-apps-jolly-flower-06110ad10.yml | 45 ------------------- ...e-static-web-apps-lively-sky-064a5cc03.yml | 45 ------------------- 3 files changed, 135 deletions(-) delete mode 100644 .github/workflows/azure-static-web-apps-agreeable-wave-04f2b6c03.yml delete mode 100644 .github/workflows/azure-static-web-apps-jolly-flower-06110ad10.yml delete mode 100644 .github/workflows/azure-static-web-apps-lively-sky-064a5cc03.yml diff --git a/.github/workflows/azure-static-web-apps-agreeable-wave-04f2b6c03.yml b/.github/workflows/azure-static-web-apps-agreeable-wave-04f2b6c03.yml deleted file mode 100644 index 71b6fedd..00000000 --- a/.github/workflows/azure-static-web-apps-agreeable-wave-04f2b6c03.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Azure Static Web Apps CI/CD - -on: - push: - branches: - - Clarity - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - Clarity - -jobs: - build_and_deploy_job: - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') - runs-on: ubuntu-latest - name: Build and Deploy Job - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Build And Deploy - id: builddeploy - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_WAVE_04F2B6C03 }} - repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) - action: "upload" - ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### - # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/" # App source code path - api_location: "" # Api source code path - optional - output_location: "public" # Built app content directory - optional - ###### End of Repository/Build Configurations ###### - - close_pull_request_job: - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close Pull Request Job - steps: - - name: Close Pull Request - id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_WAVE_04F2B6C03 }} - action: "close" diff --git a/.github/workflows/azure-static-web-apps-jolly-flower-06110ad10.yml b/.github/workflows/azure-static-web-apps-jolly-flower-06110ad10.yml deleted file mode 100644 index 50e7ee5e..00000000 --- a/.github/workflows/azure-static-web-apps-jolly-flower-06110ad10.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Azure Static Web Apps CI/CD - -on: - push: - branches: - - Clarity - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - Clarity - -jobs: - build_and_deploy_job: - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') - runs-on: ubuntu-latest - name: Build and Deploy Job - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Build And Deploy - id: builddeploy - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_FLOWER_06110AD10 }} - repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) - action: "upload" - ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### - # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/" # App source code path - api_location: "" # Api source code path - optional - output_location: "public" # Built app content directory - optional - ###### End of Repository/Build Configurations ###### - - close_pull_request_job: - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close Pull Request Job - steps: - - name: Close Pull Request - id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_FLOWER_06110AD10 }} - action: "close" diff --git a/.github/workflows/azure-static-web-apps-lively-sky-064a5cc03.yml b/.github/workflows/azure-static-web-apps-lively-sky-064a5cc03.yml deleted file mode 100644 index 24e33c65..00000000 --- a/.github/workflows/azure-static-web-apps-lively-sky-064a5cc03.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Azure Static Web Apps CI/CD - -on: - push: - branches: - - Clarity - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - Clarity - -jobs: - build_and_deploy_job: - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') - runs-on: ubuntu-latest - name: Build and Deploy Job - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Build And Deploy - id: builddeploy - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_SKY_064A5CC03 }} - repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) - action: "upload" - ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### - # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/exampleSite" # App source code path - api_location: "" # Api source code path - optional - output_location: "public" # Built app content directory - optional - ###### End of Repository/Build Configurations ###### - - close_pull_request_job: - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close Pull Request Job - steps: - - name: Close Pull Request - id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_SKY_064A5CC03 }} - action: "close" From c8373248269caf816e5e05deb27a0aeea9be3ac9 Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Fri, 13 Sep 2024 21:37:27 +0200 Subject: [PATCH 17/24] Fix typos Signed-off-by: Andreas Deininger Signed-off-by: kdi --- CONTRIBUTING.md | 2 +- README.md | 2 +- assets/sass/main.sass | 2 +- exampleSite/.gitignore | 2 ++ exampleSite/.hugo_build.lock | 0 exampleSite/README.md | 2 +- exampleSite/config/_default/params.toml | 8 ++++---- exampleSite/content/about.md | 2 +- exampleSite/content/about.pt.md | 2 +- 9 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 exampleSite/.gitignore delete mode 100644 exampleSite/.hugo_build.lock diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 885456fd..2bae09d1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ and are **greatly appreciated**! When contributing, especially for the first time, consider starting by [creating an issue](https://github.com/chipzoller/hugo-clarity/issues/new/choose) -so you can get feedback from the maintainers and avoid unncessary work. +so you can get feedback from the maintainers and avoid unnecessary work. **Note:** Hugo Clarity has a [code of conduct](CODE_OF_CONDUCT.md). Please follow it in all your interactions with the project. diff --git a/README.md b/README.md index 6b0a386b..c35bbfa6 100644 --- a/README.md +++ b/README.md @@ -713,7 +713,7 @@ customJS = ["js/custom.js"] # Include custom JS files ### Notices -This theme includes functionality to display some "hightlight blocks" - called "notices" using a shortcode. +This theme includes functionality to display some "highlight blocks" - called "notices" using a shortcode. For example, see the shortcode markup below will render as a notice: diff --git a/assets/sass/main.sass b/assets/sass/main.sass index cd7db726..50546f1b 100644 --- a/assets/sass/main.sass +++ b/assets/sass/main.sass @@ -4,7 +4,7 @@ $imagesPath: '{{ printf "../%s" (default "images/" .Site.Params.imagesDir) }}' $iconsPath: '{{ printf "../%s" (default "icons/" .Site.Params.iconsDir) }}' @import 'variables' @import 'override' -// include static fonts only when they're not overriden +// include static fonts only when they're not overridden {{- if ne .Site.Params.customFonts true }} @import 'fonts' {{- end }} diff --git a/exampleSite/.gitignore b/exampleSite/.gitignore new file mode 100644 index 00000000..132a0908 --- /dev/null +++ b/exampleSite/.gitignore @@ -0,0 +1,2 @@ +public/ +resources/ \ No newline at end of file diff --git a/exampleSite/.hugo_build.lock b/exampleSite/.hugo_build.lock deleted file mode 100644 index e69de29b..00000000 diff --git a/exampleSite/README.md b/exampleSite/README.md index 712626b2..63076eb7 100644 --- a/exampleSite/README.md +++ b/exampleSite/README.md @@ -19,5 +19,5 @@ hugo server -t YOURTHEME - A section called `/post/` with sample markdown content - A headless bundle called `homepage` that you may want to use for single page applications. You can find instructions about headless bundles over [here](https://gohugo.io/content-management/page-bundles/#headless-bundle) - An `about.md` that is intended to provide the `/about/` page for a theme demo -6. If you intend to build a theme that does not fit in the content structure provided in this repository, then you are still more than welcome to submit it for review at the [Hugo Themes](https://github.com/gohugoio/hugoThemes/issues) respository +6. If you intend to build a theme that does not fit in the content structure provided in this repository, then you are still more than welcome to submit it for review at the [Hugo Themes](https://github.com/gohugoio/hugoThemes/issues) repository diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index 65574536..6831fa2f 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -79,7 +79,7 @@ mobileNavigation = "left" # if you prefer right change to 'right' # some site owners want to decide how they would like their sites to be introduced users. These settings give you as a site owner to decide how the user will view your site for the first time. -# please note that you cannot enforce both modes at the same time. i.e by enforcing one mode, you priotise it over the other (by setting it to true). enforceDarkMode will be commented out +# please note that you cannot enforce both modes at the same time. i.e by enforcing one mode, you prioritise it over the other (by setting it to true). enforceDarkMode will be commented out # please also not that mode toggle UI will remain in place. That way, if a user prefers darkmode, they can have their way. @@ -125,7 +125,7 @@ languageMenuName = "🌐" # dateFormat = "2006-01-02" # Default to "Jan 2, 2006". # customFonts = false # toggle to true if you want to use custom fonts only. -# The year when ths website was created, this value is used in the copyright +# The year when this website was created, this value is used in the copyright # notice of the footer. # since = 2016 @@ -141,8 +141,8 @@ name = "Jane Doe" [plausible_analytics] enable = false # to enable plausible analytics set to true. websiteDomain = "example.com" # domain name of your website, most cases same as your base url -# plausibleDomain = "plausible.io" # default is set to plausible.io, only required if plausible is selfhosted -# scritpName = "plausible" # default is set to plausible, only required if using a custome name for script +# plausibleDomain = "plausible.io" # default is set to plausible.io, only required if plausible is self hosted +# scriptName = "plausible" # default is set to plausible, only required if using a custom name for script [matomo_analytics] enable = false # To enable matomo analytics change to `true`. diff --git a/exampleSite/content/about.md b/exampleSite/content/about.md index f49aec5c..b31bf1da 100644 --- a/exampleSite/content/about.md +++ b/exampleSite/content/about.md @@ -20,6 +20,6 @@ Hugo is ideal for blogs, corporate websites, creative portfolios, online magazin Hugo is for people who want to hand code their own website without worrying about setting up complicated runtimes, dependencies and databases. -Websites built with Hugo are extremelly fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider. +Websites built with Hugo are extremely fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider. Learn more and contribute on [GitHub](https://github.com/gohugoio). diff --git a/exampleSite/content/about.pt.md b/exampleSite/content/about.pt.md index 4b8ee159..c07454b3 100644 --- a/exampleSite/content/about.pt.md +++ b/exampleSite/content/about.pt.md @@ -23,6 +23,6 @@ Hugo is ideal for blogs, corporate websites, creative portfolios, online magazin Hugo is for people who want to hand code their own website without worrying about setting up complicated runtimes, dependencies and databases. -Websites built with Hugo are extremelly fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider. +Websites built with Hugo are extremely fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider. Learn more and contribute on [GitHub](https://github.com/gohugoio). From 7c8d84329541548b5968448e5fc0bcbef46a90ef Mon Sep 17 00:00:00 2001 From: Robert Terakedis <26422950+rterakedis@users.noreply.github.com> Date: Sun, 22 Sep 2024 00:49:28 -0400 Subject: [PATCH 18/24] Adding Giscus Support Adding giscus.app support (similar to utterances) Signed-off-by: Robert Terakedis <26422950+rterakedis@users.noreply.github.com> Signed-off-by: kdi --- README.md | 11 +++++++++++ exampleSite/config/_default/params.toml | 12 ++++++++++++ layouts/partials/comments.html | 3 +++ layouts/partials/giscus.html | 18 ++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 layouts/partials/giscus.html diff --git a/README.md b/README.md index c35bbfa6..b96c7d1e 100644 --- a/README.md +++ b/README.md @@ -828,7 +828,18 @@ If you wish use [Utterances](https://github.com/utterance/utterances) comments o Utterances is loaded in the `comments.html` partial by referring to the `utterances.html` partial. Since `single.html` layout loads comments if comments are enabled, you must ensure *both* the `comments` and `utterances` parameters are configured. +#### Giscus Commenting Support +If you wish use [giscus](https://giscus.app/) comments on your site, you'll need to perform the following: + + * Ensure your repository is [public](https://docs.github.com/en/github/administering-a-repository/managing-repository-settings/setting-repository-visibility#making-a-repository-public), otherwise visitors will not be able to view the discussion. + * The [giscus app](https://github.com/apps/giscus) is installed, otherwise visitors will not be able to comment and react. + * The Discussions feature is turned on by [enabling it for your repository](https://docs.github.com/en/github/administering-a-repository/managing-repository-settings/enabling-or-disabling-github-discussions-for-a-repository). + * Comment out the line for `disqusShortname = ""` in the `/config/_default/config.toml` file. + * Set `comments = true` in the `/config/_default/params.toml` file. + * Configure the giscus parameters in the `/config/_default/params.toml` file. + +Giscus is loaded in the `comments.html` partial by referring to the `giscus.html` partial. Since `single.html` layout loads comments if comments are enabled, you must ensure *both* the `comments` and `giscus` parameters are configured. ### Math notation diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index 6831fa2f..8976eeb3 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -109,6 +109,18 @@ languageMenuName = "🌐" # utterancesTheme = "github-light" # Default: github-dark # utterancesIssueTerm = "pathname" # Default: pathname +# Enable or disable Giscus comments globally. Default to false. +# giscus = true +# giscusRepo = "GHUsername/Repository.Name" # Giscus is enabled when this param is set +# giscusRepoId = "RepositoryID" # Required for Giscus to work +# giscusCategory = "Blog" +# giscusCategoryId = "CategoryID" # Required for Giscus to work +# giscusMapping = "pathname" # Default: pathname +# giscusReactionsEnabled = "1" # Default: 1 = true +# giscusTheme = "dark_protanopia" # Default: dark_dimmed +# giscusLang = "en" # Default: en + + # Maximum number of recent posts. (default: 8) # numberOfRecentPosts = 8 diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html index 311788ff..5efcf691 100644 --- a/layouts/partials/comments.html +++ b/layouts/partials/comments.html @@ -5,5 +5,8 @@ {{ if .Site.Params.utterances }} {{ template "partials/utterances.html" . }} {{ end }} + {{ if .Site.Params.giscus }} + {{ template "partials/giscus.html" . }} + {{ end }}
      diff --git a/layouts/partials/giscus.html b/layouts/partials/giscus.html new file mode 100644 index 00000000..88089a67 --- /dev/null +++ b/layouts/partials/giscus.html @@ -0,0 +1,18 @@ +{{ if .Site.Params.giscus }} + + {{ end }} \ No newline at end of file From 44bd57e8e4d8c7583bb610c33fe8065747bb1f17 Mon Sep 17 00:00:00 2001 From: Chip Zoller Date: Sun, 22 Sep 2024 08:07:04 -0400 Subject: [PATCH 19/24] Update README.md Signed-off-by: kdi --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b96c7d1e..d7d084ff 100644 --- a/README.md +++ b/README.md @@ -830,7 +830,7 @@ Utterances is loaded in the `comments.html` partial by referring to the `utteran #### Giscus Commenting Support -If you wish use [giscus](https://giscus.app/) comments on your site, you'll need to perform the following: +If you wish to use [giscus](https://giscus.app/) comments on your site, you'll need to perform the following: * Ensure your repository is [public](https://docs.github.com/en/github/administering-a-repository/managing-repository-settings/setting-repository-visibility#making-a-repository-public), otherwise visitors will not be able to view the discussion. * The [giscus app](https://github.com/apps/giscus) is installed, otherwise visitors will not be able to comment and react. From da8d150544f49080fac48f5b01b759816923bc77 Mon Sep 17 00:00:00 2001 From: kartnico Date: Wed, 27 Mar 2024 17:58:37 +0100 Subject: [PATCH 20/24] fix path to thumbnail images incorrect on second and higher page Signed-off-by: kartnico Signed-off-by: kdi --- layouts/partials/figure.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/partials/figure.html b/layouts/partials/figure.html index e5b7afc0..28203afb 100644 --- a/layouts/partials/figure.html +++ b/layouts/partials/figure.html @@ -54,10 +54,10 @@ class="{{ $classes }} image_processed" width="{{ .Width }}" height="{{ .Height }}" - src="{{ .RelPermalink }}" + src="{{ .RelPermalink | absURL }}" {{ else }} class="{{ $classes }} image_unprocessed" - src="{{ $fileWeb }}" + src="{{ $fileWeb | absURL }}" {{ end }} {{ with $cap }} title="{{ safeHTML $cap }}" From afef3aaa050add99bc7c3e7af06ffa5f0f693ad6 Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Mon, 16 Sep 2024 22:48:21 +0200 Subject: [PATCH 21/24] Bump KaTeX to latest version 0.16.11 Signed-off-by: Andreas Deininger Signed-off-by: kdi --- README.md | 8 ++++---- exampleSite/.gitignore | 3 ++- exampleSite/content/post/math-typesetting.md | 15 +++++++-------- exampleSite/layouts/.gitkeep | 0 exampleSite/layouts/partials/hooks/head-end.html | 3 +++ layouts/partials/math.html | 6 +++--- 6 files changed, 19 insertions(+), 16 deletions(-) delete mode 100644 exampleSite/layouts/.gitkeep create mode 100644 exampleSite/layouts/partials/hooks/head-end.html diff --git a/README.md b/README.md index d7d084ff..437c3218 100644 --- a/README.md +++ b/README.md @@ -858,13 +858,13 @@ mkdir -p layouts/partials && cp themes/clarity/layouts/partials/math.html layout Then add the corresponding line as its [README](https://github.com/KaTeX/KaTeX/tree/master/contrib/mhchem) suggested (without the `+` sign): ```diff - + - + -+ ++ - ``` diff --git a/exampleSite/.gitignore b/exampleSite/.gitignore index 132a0908..e4b8c67d 100644 --- a/exampleSite/.gitignore +++ b/exampleSite/.gitignore @@ -1,2 +1,3 @@ public/ -resources/ \ No newline at end of file +resources/ +.hugo_build.lock \ No newline at end of file diff --git a/exampleSite/content/post/math-typesetting.md b/exampleSite/content/post/math-typesetting.md index 48fdc79f..242a3721 100644 --- a/exampleSite/content/post/math-typesetting.md +++ b/exampleSite/content/post/math-typesetting.md @@ -11,9 +11,8 @@ Mathematical notation in a Hugo project can be enabled by using third party Java In this example we will be using [KaTeX](https://katex.org/) -- Create a partial under `/layouts/partials/math.html` -- Within this partial reference the [Auto-render Extension](https://katex.org/docs/autorender.html) or host these scripts locally. -- Include the partial in your templates like so: +- Create a partial under `/layouts/partials/hooks/head-end.html` +- Add these lines to the newly created partial: ```bash {{ if or .Params.math .Site.Params.math }} @@ -21,17 +20,17 @@ In this example we will be using [KaTeX](https://katex.org/) {{ end }} ``` -- To enable KaTex globally set the parameter `math` to `true` in a project's configuration -- To enable KaTex on a per page basis include the parameter `math: true` in content files +- To enable KaTeX globally set the parameter `math` to `true` in a project's configuration +- To enable KaTeX on a per page basis include the parameter `math: true` in content files **Note:** Use the online reference of [Supported TeX Functions](https://katex.org/docs/supported.html) {{< math.inline >}} {{ if or .Page.Params.math .Site.Params.math }} - - - + + + {{ end }} {{}} diff --git a/exampleSite/layouts/.gitkeep b/exampleSite/layouts/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/exampleSite/layouts/partials/hooks/head-end.html b/exampleSite/layouts/partials/hooks/head-end.html new file mode 100644 index 00000000..6af03480 --- /dev/null +++ b/exampleSite/layouts/partials/hooks/head-end.html @@ -0,0 +1,3 @@ +{{ if or .Params.math .Site.Params.math }} +{{ partial "math.html" . }} +{{ end }} \ No newline at end of file diff --git a/layouts/partials/math.html b/layouts/partials/math.html index 999766e8..427d25f8 100644 --- a/layouts/partials/math.html +++ b/layouts/partials/math.html @@ -1,3 +1,3 @@ - - - \ No newline at end of file + + + \ No newline at end of file From d57516eb441bc5036d88b7f4b4f3e1799d3d421a Mon Sep 17 00:00:00 2001 From: barefootstache Date: Mon, 9 Sep 2024 15:56:35 +0200 Subject: [PATCH 22/24] feat: initiate `blogDir` setting Signed-off-by: barefootstache Signed-off-by: kdi --- exampleSite/config/_default/params.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index 8976eeb3..4fc2c746 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -102,6 +102,9 @@ languageMenuName = "🌐" # Enable or disable comments globally. Default to true. # comments = false +# Activate meta ld+json for blog +blogDir = "post" + # Enable or disable Utterances (https://github.com/utterance/utterances) Github Issue-Based Commenting # utterances = true # Run the utterances script in the single.html layout to load https://utteranc.es comments # utterancesRepo = "GHUsername/Repository.Name" # Utterances is enabled when this param is set From 4237532a86cd9bf399cfd4222e0ba53a3535cd1c Mon Sep 17 00:00:00 2001 From: barefootstache Date: Mon, 9 Sep 2024 15:59:54 +0200 Subject: [PATCH 23/24] feat: extend with keywords and categories Signed-off-by: barefootstache Signed-off-by: kdi --- layouts/partials/opengraph.html | 40 ++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/layouts/partials/opengraph.html b/layouts/partials/opengraph.html index cfc2aca2..b535d1ac 100644 --- a/layouts/partials/opengraph.html +++ b/layouts/partials/opengraph.html @@ -59,20 +59,46 @@ -{{- $keywords := "" }} +{{- $mergedKeywords := slice }} {{- with $s.keywords }} - {{- $keywords = delimit $s.keywords "," }} + {{- range . }} + {{- $mergedKeywords = $mergedKeywords | append . }} + {{- end }} {{- end }} {{- with $p.keywords }} - {{- $keywords = delimit . "," }} + {{- range . }} + {{- $mergedKeywords = $mergedKeywords | append . }} + {{- end }} +{{- end }} +{{- with $s.tags }} + {{- range . }} + {{- $mergedKeywords = $mergedKeywords | append . }} + {{- end }} {{- end }} -{{- with $keywords }} - +{{- with $p.tags }} + {{- range . }} + {{- $mergedKeywords = $mergedKeywords | append . }} + {{- end }} +{{- end }} +{{- $mergedKeywordsString := delimit $mergedKeywords "," }} +{{- with $mergedKeywordsString }} + {{- end }} {{- if eq .Section $s.blogDir -}} {{- $date := ( .Date.Format "2006-02-01") -}} {{- $date := (time .Date) }} {{- $lastMod := (time .Lastmod) }} + {{- $categories := slice }} + {{- with $s.categories }} + {{- range . }} + {{- $categories = $categories | append . }} + {{- end }} + {{- end }} + {{- with $p.categories }} + {{- range . }} + {{- $categories = $categories | append . }} + {{- end }} + {{- end }}