Skip to content

Commit eea6896

Browse files
chipzollerchipzoller
authored
Merge branch 'master' into make_lastmod_visible_in_post
2 parents a1e3cb0 + 174847b commit eea6896

27 files changed

+89
-165
lines changed

‎.github/workflows/azure-static-web-apps-agreeable-wave-04f2b6c03.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎.github/workflows/azure-static-web-apps-jolly-flower-06110ad10.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎.github/workflows/azure-static-web-apps-lively-sky-064a5cc03.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
matrix:
1010
hugo-version:
1111
- 'latest'
12-
- '0.95.0'
12+
- '0.128.0'
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515

1616
- name: Setup Hugo
17-
uses: peaceiris/actions-hugo@v2
17+
uses: peaceiris/actions-hugo@v3
1818
with:
1919
hugo-version: ${{ matrix.hugo-version }}
2020
extended: true

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ and are **greatly appreciated**!
1010

1111
When contributing, especially for the first time, consider starting by
1212
[creating an issue](https://github.com/chipzoller/hugo-clarity/issues/new/choose)
13-
so you can get feedback from the maintainers and avoid unncessary work.
13+
so you can get feedback from the maintainers and avoid unnecessary work.
1414

1515
**Note:** Hugo Clarity has a [code of conduct](CODE_OF_CONDUCT.md).
1616
Please follow it in all your interactions with the project.

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ These options can be set from a page [frontmatter](https://gohugo.io/content-man
298298
| sidebar | boolean | N/A |
299299
| singleColumn | boolean | N/A |
300300
| showRelatedInArticle | boolean | N/A |
301+
| noindex | boolean | N/A |
301302

302303
### Modify Menus
303304

@@ -712,7 +713,7 @@ customJS = ["js/custom.js"] # Include custom JS files
712713

713714
### Notices
714715

715-
This theme includes functionality to display some "hightlight blocks" - called "notices" using a shortcode.
716+
This theme includes functionality to display some "highlight blocks" - called "notices" using a shortcode.
716717

717718
For example, see the shortcode markup below will render as a notice:
718719

‎assets/sass/_variables.sass

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ html
110110
img
111111
background: none
112112
svg
113-
fill: #fafafa
113+
fill: #fafafa
114+
&:not(svg)
115+
filter: invert(0.87)
114116
.sidebar
115117
&_inner
116118
&::before

‎assets/sass/main.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $imagesPath: '{{ printf "../%s" (default "images/" .Site.Params.imagesDir) }}'
44
$iconsPath: '{{ printf "../%s" (default "icons/" .Site.Params.iconsDir) }}'
55
@import 'variables'
66
@import 'override'
7-
// include static fonts only when they're not overriden
7+
// include static fonts only when they're not overridden
88
{{- if ne .Site.Params.customFonts true }}
99
@import 'fonts'
1010
{{- end }}

‎exampleSite/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
public/
2+
resources/

‎exampleSite/.hugo_build.lock

Whitespace-only changes.

‎exampleSite/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ hugo server -t YOURTHEME
1919
- A section called `/post/` with sample markdown content
2020
- 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)
2121
- An `about.md` that is intended to provide the `/about/` page for a theme demo
22-
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
22+
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
2323

‎exampleSite/config/_default/config.toml renamed to ‎exampleSite/config/_default/hugo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ baseurl = "https://example.com/" # Include trailing slash
44
# title = "Clarity" # Edit directly from config/_default/languages.toml # alternatively, uncomment this and remove `title` entry from the aforemention file.
55
copyright = "Copyright © 2008–2018, Steve Francia and the Hugo Authors; all rights reserved."
66
# canonifyurls = true
7-
paginate = 10
7+
88
theme = "hugo-clarity"
99
disqusShortname = ""
1010

@@ -22,3 +22,6 @@ series = "series"
2222

2323
[outputs]
2424
home = ["HTML", "RSS", "JSON"]
25+
26+
[pagination]
27+
pagerSize = 10

‎exampleSite/config/_default/params.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ mobileNavigation = "left" # if you prefer right change to 'right'
7979

8080
# 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.
8181

82-
# 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
82+
# 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
8383

8484
# please also not that mode toggle UI will remain in place. That way, if a user prefers darkmode, they can have their way.
8585

@@ -125,7 +125,7 @@ languageMenuName = "🌐"
125125
# dateFormat = "2006-01-02" # Default to "Jan 2, 2006".
126126
# customFonts = false # toggle to true if you want to use custom fonts only.
127127

128-
# The year when ths website was created, this value is used in the copyright
128+
# The year when this website was created, this value is used in the copyright
129129
# notice of the footer.
130130
# since = 2016
131131

@@ -141,8 +141,8 @@ name = "Jane Doe"
141141
[plausible_analytics]
142142
enable = false # to enable plausible analytics set to true.
143143
websiteDomain = "example.com" # domain name of your website, most cases same as your base url
144-
# plausibleDomain = "plausible.io" # default is set to plausible.io, only required if plausible is selfhosted
145-
# scritpName = "plausible" # default is set to plausible, only required if using a custome name for script
144+
# plausibleDomain = "plausible.io" # default is set to plausible.io, only required if plausible is self hosted
145+
# scriptName = "plausible" # default is set to plausible, only required if using a custom name for script
146146

147147
[matomo_analytics]
148148
enable = false # To enable matomo analytics change to `true`.

‎exampleSite/content/about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ Hugo is ideal for blogs, corporate websites, creative portfolios, online magazin
2020

2121
Hugo is for people who want to hand code their own website without worrying about setting up complicated runtimes, dependencies and databases.
2222

23-
Websites built with Hugo are extremelly fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider.
23+
Websites built with Hugo are extremely fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider.
2424

2525
Learn more and contribute on [GitHub](https://github.com/gohugoio).

‎exampleSite/content/about.pt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ Hugo is ideal for blogs, corporate websites, creative portfolios, online magazin
2323

2424
Hugo is for people who want to hand code their own website without worrying about setting up complicated runtimes, dependencies and databases.
2525

26-
Websites built with Hugo are extremelly fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider.
26+
Websites built with Hugo are extremely fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider.
2727

2828
Learn more and contribute on [GitHub](https://github.com/gohugoio).

‎i18n/zh-CN.toml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,23 @@ other = "所有专栏"
5050
other = "文章目录"
5151

5252
[reading_time]
53-
other = "{{ .ReadingTime }} min read"
53+
other = "{{ .ReadingTime }} 分钟阅读"
5454

5555
[series_posts]
56-
other = "Posts in this series"
56+
other = "相关系列文章"
57+
58+
# search
59+
[quick_links]
60+
other = "搜索到的结果"
61+
[no_matches]
62+
other = "未找到结果"
63+
[search_field_placeholder]
64+
other = "搜索知识库"
65+
[blog_search_field_placeholder]
66+
other = "搜索内容..."
67+
[search_results_label]
68+
other = "搜索到的结果"
69+
[short_search_query]
70+
other = "搜索字符太短"
71+
[type_to_search]
72+
other = "请输入内容查找"

‎i18n/zh-TW.toml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,23 @@ other = "所有專欄"
5050
other = "文章目錄"
5151

5252
[reading_time]
53-
other = "{{ .ReadingTime }} 分鐘長"
53+
other = "{{ .ReadingTime }} 分鐘閱讀"
5454

5555
[series_posts]
56-
other = "此系列文章"
56+
other = "相關係列文章"
57+
58+
# search
59+
[quick_links]
60+
other = "搜尋到的結果"
61+
[no_matches]
62+
other = "未找到結果"
63+
[search_field_placeholder]
64+
other = "搜尋知識庫"
65+
[blog_search_field_placeholder]
66+
other = "搜尋內容..."
67+
[search_results_label]
68+
other = "搜尋到的結果"
69+
[short_search_query]
70+
other = "搜尋字元太短"
71+
[type_to_search]
72+
other = "請輸入內容尋找"

‎i18n/zh.toml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,23 @@ other = "所有专栏"
5050
other = "文章目录"
5151

5252
[reading_time]
53-
other = "{{ .ReadingTime }} min read"
53+
other = "{{ .ReadingTime }} 分钟阅读"
5454

5555
[series_posts]
56-
other = "Posts in this series"
56+
other = "相关系列文章"
57+
58+
# search
59+
[quick_links]
60+
other = "搜索到的结果"
61+
[no_matches]
62+
other = "未找到结果"
63+
[search_field_placeholder]
64+
other = "搜索知识库"
65+
[blog_search_field_placeholder]
66+
other = "搜索内容..."
67+
[search_results_label]
68+
other = "搜索到的结果"
69+
[short_search_query]
70+
other = "搜索字符太短"
71+
[type_to_search]
72+
other = "请输入内容查找"

‎layouts/partials/comments.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="post_comments">
2-
{{ if .Site.DisqusShortname }}
2+
{{ if .Site.Config.Services.Disqus.Shortname }}
33
{{ template "_internal/disqus.html" . }}
44
{{ end }}
55
{{ if .Site.Params.utterances }}

‎layouts/partials/func/getDefaultLanguage.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ $defaultLanguage := site.LanguageCode }}
2-
{{ if site.IsMultiLingual}}
2+
{{ if hugo.IsMultilingual }}
33
{{ $languages := site.Languages }}
44
{{ $order := slice }}
55
{{ range $languages }}

‎layouts/partials/func/getStylesBundle.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- styles definition-->
22
{{ $options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed" "enableSourceMap" "true") }}
33
{{ $mainSassFile := "sass/main.sass" }}
4-
{{ $styles := resources.Get $mainSassFile | resources.ExecuteAsTemplate $mainSassFile . | resources.ToCSS $options | resources.Fingerprint "sha512" }}
4+
{{ $styles := resources.Get $mainSassFile | resources.ExecuteAsTemplate $mainSassFile . | css.Sass $options | resources.Fingerprint "sha512" }}
55

66
{{ return $styles }}

‎layouts/partials/head.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
{{- end }}
1111
<title>{{ with $title }}{{ . }} {{ $separator }} {{ end }}{{ .Site.Title }}</title>
1212
<meta charset="utf-8">
13+
{{ if .Params.noindex }}
14+
<meta name="robots" content="noindex" />
15+
{{ end }}
1316
{{- with $params.ga_verify }}
1417
<meta name="google-site-verification" content="{{ . }}">
1518
{{- end }}

‎layouts/partials/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{{- else }}
1717
{{ partial "nav" (dict "context" . "menu" .Site.Menus.main) }}
1818
{{- end }}
19-
{{ if .Site.IsMultiLingual }}
19+
{{ if hugo.IsMultilingual }}
2020
<div class="nav_parent">
2121
<a href="#" class="nav_item">{{ $params.languageMenuName }}</a>
2222
<div class="nav_sub">

0 commit comments

Comments
 (0)