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" 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 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 a61d750b..c35bbfa6 100644 --- a/README.md +++ b/README.md @@ -298,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 @@ -712,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/_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 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/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/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). 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 = "请输入内容查找" 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/head.html b/layouts/partials/head.html index da8fcb53..ab249774 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 }} 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/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 }}
    • 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 }}
      • 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" } 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 = [