Skip to content

Commit

Permalink
Merge branch 'master' into fix_path_thumbnail_images
Browse files Browse the repository at this point in the history
  • Loading branch information
chipzoller authored Sep 22, 2024
2 parents dc6812c + 174847b commit 87f97e9
Show file tree
Hide file tree
Showing 21 changed files with 31 additions and 155 deletions.

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/azure-static-web-apps-jolly-flower-06110ad10.yml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/azure-static-web-apps-lively-sky-064a5cc03.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,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

Expand Down Expand Up @@ -709,7 +710,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:

Expand Down
4 changes: 3 additions & 1 deletion assets/sass/_variables.sass
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ html
img
background: none
svg
fill: #fafafa
fill: #fafafa
&:not(svg)
filter: invert(0.87)
.sidebar
&_inner
&::before
Expand Down
2 changes: 1 addition & 1 deletion assets/sass/main.sass
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 2 additions & 0 deletions exampleSite/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
public/
resources/
Empty file removed exampleSite/.hugo_build.lock
Empty file.
2 changes: 1 addition & 1 deletion exampleSite/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""

Expand All @@ -22,3 +22,6 @@ series = "series"

[outputs]
home = ["HTML", "RSS", "JSON"]

[pagination]
pagerSize = 10
8 changes: 4 additions & 4 deletions exampleSite/config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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

Expand All @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion exampleSite/content/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
2 changes: 1 addition & 1 deletion exampleSite/content/about.pt.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
2 changes: 1 addition & 1 deletion layouts/partials/comments.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="post_comments">
{{ if .Site.DisqusShortname }}
{{ if .Site.Config.Services.Disqus.Shortname }}
{{ template "_internal/disqus.html" . }}
{{ end }}
{{ if .Site.Params.utterances }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/func/getDefaultLanguage.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ $defaultLanguage := site.LanguageCode }}
{{ if site.IsMultiLingual}}
{{ if hugo.IsMultilingual }}
{{ $languages := site.Languages }}
{{ $order := slice }}
{{ range $languages }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/func/getStylesBundle.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- styles definition-->
{{ $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 }}
3 changes: 3 additions & 0 deletions layouts/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
{{- end }}
<title>{{ with $title }}{{ . }} {{ $separator }} {{ end }}{{ .Site.Title }}</title>
<meta charset="utf-8">
{{ if .Params.noindex }}
<meta name="robots" content="noindex" />
{{ end }}
{{- with $params.ga_verify }}
<meta name="google-site-verification" content="{{ . }}">
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{{- else }}
{{ partial "nav" (dict "context" . "menu" .Site.Menus.main) }}
{{- end }}
{{ if .Site.IsMultiLingual }}
{{ if hugo.IsMultilingual }}
<div class="nav_parent">
<a href="#" class="nav_item">{{ $params.languageMenuName }}</a>
<div class="nav_sub">
Expand Down
2 changes: 1 addition & 1 deletion theme.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down

0 comments on commit 87f97e9

Please sign in to comment.