diff --git a/config.toml b/config.toml index 04252d24..4a157531 100644 --- a/config.toml +++ b/config.toml @@ -2,4 +2,4 @@ [module.hugoVersion] extended = true min = "0.87.0" -max = "0.126.2" +max = "0.126.3" diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index 2831a098..325917e7 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -100,8 +100,8 @@ smartTOCHideUnfocusedChildren = false showHero = true heroStyle = "background" # valid options: basic, big, background, thumbAndBackground showBreadcrumbs = false - showViews = true - showLikes = true + showViews = false + showLikes = false showTableOfContents = true cardView = false @@ -109,8 +109,8 @@ smartTOCHideUnfocusedChildren = false showHero = true heroStyle = "background" # valid options: basic, big, background, thumbAndBackground showBreadcrumbs = false - showViews = true - showLikes = true + showViews = false + showLikes = false showTableOfContents = true groupByYear = false cardView = true diff --git a/exampleSite/content/docs/shortcodes/index.it.md b/exampleSite/content/docs/shortcodes/index.it.md index 14ab2b35..2222eb96 100644 --- a/exampleSite/content/docs/shortcodes/index.it.md +++ b/exampleSite/content/docs/shortcodes/index.it.md @@ -496,7 +496,7 @@ When life gives you lemons, make lemonade. | `value` | The value that will need to match the parameter defined in `where` for the query of articles e.g. for `where` == `Type` a valid value could be `sample` | {{< alert >}} -The `where` and `value` values are used in the following query `where .Site.RegularPages $where $value` in the code of the shortcode. Check [Hugo docs](https://gohugo.io/variables/page/) to learn more about which parameters are available to use. +The `where` and `value` values are used in the following query `where .Site.RegularPages $where $value` in the code of the shortcode. Check [Hugo docs](https://gohugo.io/methods/page/) to learn more about which parameters are available to use. {{}} @@ -512,7 +512,7 @@ The `where` and `value` values are used in the following query `where .Site.Regu **Example #2:** ```md -{{}} +{{}} ``` {{< list title="Samples" cardView=true limit=6 where="Type" value="sample">}} diff --git a/exampleSite/content/docs/shortcodes/index.ja.md b/exampleSite/content/docs/shortcodes/index.ja.md index 14ab2b35..2222eb96 100644 --- a/exampleSite/content/docs/shortcodes/index.ja.md +++ b/exampleSite/content/docs/shortcodes/index.ja.md @@ -496,7 +496,7 @@ When life gives you lemons, make lemonade. | `value` | The value that will need to match the parameter defined in `where` for the query of articles e.g. for `where` == `Type` a valid value could be `sample` | {{< alert >}} -The `where` and `value` values are used in the following query `where .Site.RegularPages $where $value` in the code of the shortcode. Check [Hugo docs](https://gohugo.io/variables/page/) to learn more about which parameters are available to use. +The `where` and `value` values are used in the following query `where .Site.RegularPages $where $value` in the code of the shortcode. Check [Hugo docs](https://gohugo.io/methods/page/) to learn more about which parameters are available to use. {{}} @@ -512,7 +512,7 @@ The `where` and `value` values are used in the following query `where .Site.Regu **Example #2:** ```md -{{}} +{{}} ``` {{< list title="Samples" cardView=true limit=6 where="Type" value="sample">}} diff --git a/exampleSite/content/docs/shortcodes/index.md b/exampleSite/content/docs/shortcodes/index.md index 14ab2b35..d99718d8 100644 --- a/exampleSite/content/docs/shortcodes/index.md +++ b/exampleSite/content/docs/shortcodes/index.md @@ -18,7 +18,7 @@ In addition to all the [default Hugo shortcodes](https://gohugo.io/content-manag | Parameter | Description | | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `icon` | **Optional.** the icon to display on the left side.
**Default:** `exclaimation triangle icon` (Check out the [icon shortcode](#icon) for more details on using icons.) | +| `icon` | **Optional.** the icon to display on the left side.
**Default:** `triangle-exclamation` (Check out the [icon shortcode](#icon) for more details on using icons.) | | `iconColor` | **Optional.** the color for the icon in basic CSS style.
Can be either hex values (`#FFFFFF`) or color names (`white`)
By default chosen based on the current color theme . | | `cardColor` | **Optional.** the color for the card background in basic CSS style.
Can be either hex values (`#FFFFFF`) or color names (`white`)
By default chosen based on the current color theme . | | `textColor` | **Optional.** the color for the text in basic CSS style.
Can be either hex values (`#FFFFFF`) or color names (`white`)
By default chosen based on the current color theme . | @@ -496,7 +496,7 @@ When life gives you lemons, make lemonade. | `value` | The value that will need to match the parameter defined in `where` for the query of articles e.g. for `where` == `Type` a valid value could be `sample` | {{< alert >}} -The `where` and `value` values are used in the following query `where .Site.RegularPages $where $value` in the code of the shortcode. Check [Hugo docs](https://gohugo.io/variables/page/) to learn more about which parameters are available to use. +The `where` and `value` values are used in the following query `where .Site.RegularPages $where $value` in the code of the shortcode. Check [Hugo docs](https://gohugo.io/methods/page/) to learn more about which parameters are available to use. {{}} @@ -512,7 +512,7 @@ The `where` and `value` values are used in the following query `where .Site.Regu **Example #2:** ```md -{{}} +{{}} ``` {{< list title="Samples" cardView=true limit=6 where="Type" value="sample">}} diff --git a/exampleSite/content/docs/shortcodes/index.zh-cn.md b/exampleSite/content/docs/shortcodes/index.zh-cn.md index 01ef4dec..c2ca4f11 100644 --- a/exampleSite/content/docs/shortcodes/index.zh-cn.md +++ b/exampleSite/content/docs/shortcodes/index.zh-cn.md @@ -497,7 +497,7 @@ When life gives you lemons, make lemonade. | `value` | 需要与 `where` 中定义的参数匹配的值，以进行文章查询，例如对于 `where` == `Type`，可以找到文章 `sample` | {{< alert >}} -`where` 和 `value` 值用于简码中进行以下格式的查询 `where .Site.RegularPages $where $value` 。检查 [Hugo 文档](https://gohugo.io/variables/page/) 以了解有关可用参数的更多信息。 +`where` 和 `value` 值用于简码中进行以下格式的查询 `where .Site.RegularPages $where $value` 。检查 [Hugo 文档](https://gohugo.io/methods/page/) 以了解有关可用参数的更多信息。 {{}} @@ -513,7 +513,7 @@ When life gives you lemons, make lemonade. **例 2:** ```md -{{}} +{{}} ``` {{< list title="Samples" cardView=true limit=6 where="Type" value="sample">}} diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html index db9ebd2f..3e5fdce8 100644 --- a/layouts/_default/_markup/render-image.html +++ b/layouts/_default/_markup/render-image.html @@ -1,29 +1,29 @@ -{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} -{{ $url := urls.Parse .Destination }} -{{ $altText := .Text }} -{{ $caption := .Title }} -{{ if findRE "^https?" $url.Scheme }} +{{- $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} +{{- $url := urls.Parse .Destination }} +{{- $altText := .Text }} +{{- $caption := .Title }} +{{- if findRE "^https?" $url.Scheme }}
{{ $altText }} {{ with $caption }}
{{ . | markdownify }}
{{ end }}
-{{ else }} - {{ $resource := "" }} - {{ if $.Page.Resources.GetMatch ($url.String) }} - {{ $resource = $.Page.Resources.GetMatch ($url.String) }} - {{ else if resources.GetMatch ($url.String) }} - {{ $resource = resources.Get ($url.String) }} - {{ end }} - {{ with $resource }} +{{- else }} + {{- $resource := "" }} + {{- if $.Page.Resources.GetMatch ($url.String) }} + {{- $resource = $.Page.Resources.GetMatch ($url.String) }} + {{- else if resources.GetMatch ($url.String) }} + {{- $resource = resources.Get ($url.String) }} + {{- end }} + {{- with $resource }}
- {{ if $disableImageOptimization }} + {{- if or $disableImageOptimization (eq .MediaType.SubType "svg")}} {{ $altText }} - {{ else }} + {{- else }} {{ $altText }} - {{ end }} + {{- end }} {{ with $caption }}
{{ . | markdownify }}
{{ end }}
- {{ else }} + {{- else }}
{{ $altText }} {{ with $caption }}
{{ . | markdownify }}
{{ end }}
- {{ end }} -{{ end }} + {{- end }} +{{- end }} diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index 83361695..b6028bf5 100644 --- a/layouts/_default/_markup/render-link.html +++ b/layouts/_default/_markup/render-link.html @@ -1,2 +1,7 @@ - - {{ .Text | safeHTML }} \ No newline at end of file + + {{- .Text | safeHTML -}} + \ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index b5c1d919..d31cecd1 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -27,7 +27,7 @@ {{ if .Site.Params.footer.showCopyright | default true }}

{{- with replace .Site.Params.copyright "{ year }" now.Year }} - {{ . | emojify }} + {{ . | markdownify }} {{- else }} © {{ now.Format "2006" }} diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html index cd881a31..fb7293c8 100644 --- a/layouts/shortcodes/figure.html +++ b/layouts/shortcodes/figure.html @@ -2,49 +2,49 @@ {{ if .Get "default" }} {{ template "_internal/shortcodes/figure.html" . }} {{ else }} - {{ $url := urls.Parse (.Get "src") }} - {{ $altText := .Get "alt" }} - {{ $caption := .Get "caption" }} - {{ $href := .Get "href" }} - {{ $class := .Get "class" }} - {{ $target := .Get "target" | default "_blank" }} - {{ $nozoom := .Get "nozoom" | default false }} + {{- $url := urls.Parse (.Get "src") }} + {{- $altText := .Get "alt" }} + {{- $caption := .Get "caption" }} + {{- $href := .Get "href" }} + {{- $class := .Get "class" }} + {{- $target := .Get "target" | default "_blank" }} + {{- $nozoom := .Get "nozoom" | default false -}}

- {{ with $href }}{{ end }} - {{ if findRE "^https?" $url.Scheme }} - {{ $altText }} - {{ else }} - {{ $resource := "" }} - {{ if $.Page.Resources.GetMatch ($url.String) }} - {{ $resource = $.Page.Resources.GetMatch ($url.String) }} - {{ else if resources.GetMatch ($url.String) }} - {{ $resource = resources.Get ($url.String) }} - {{ end }} - {{ with $resource }} - {{ if $disableImageOptimization }} - {{ $altText }} - {{ else }} - {{ $altText }} - {{ end }} - {{ else }} - {{ $altText }} - {{ end }} - {{ end }} + {{- with $href }}{{ end -}} + {{- if findRE "^https?" $url.Scheme }} + {{ $altText }} + {{- else }} + {{- $resource := "" }} + {{- if $.Page.Resources.GetMatch ($url.String) }} + {{- $resource = $.Page.Resources.GetMatch ($url.String) }} + {{- else if resources.GetMatch ($url.String) }} + {{- $resource = resources.Get ($url.String) }} + {{- end }} + {{- with $resource }} + {{- if or $disableImageOptimization (eq .MediaType.SubType "svg")}} + {{ $altText }} + {{- else }} + {{ $altText }} + {{- end }} + {{- else }} + {{ $altText }} + {{- end }} + {{- end }} {{ with $caption }}
{{ . | markdownify }}
{{ end }} {{ if $href }}{{ end }}
-{{ end }} +{{- end -}} diff --git a/layouts/shortcodes/timeline.html b/layouts/shortcodes/timeline.html index efaf922c..c97673d1 100644 --- a/layouts/shortcodes/timeline.html +++ b/layouts/shortcodes/timeline.html @@ -1,3 +1,3 @@ -
    +
      {{- .Inner -}}
    \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index edf1491e..bf194df9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "hugo-blowfish-theme", - "version": "2.69.0", + "version": "2.70.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "hugo-blowfish-theme", - "version": "2.69.0", + "version": "2.70.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 2be67194..b318803b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "hugo-blowfish-theme", - "version": "2.69.0", - "description": "Blowfish theme for Hugo", + "version": "2.70.0", + "description": "Blowfish theme for Hugo.", "scripts": { "postinstall": "vendor-copy", "assets": "rimraf assets/vendor && vendor-copy", diff --git a/release-versions/hugo-latest.txt b/release-versions/hugo-latest.txt index 9ce944e7..928f13de 100644 --- a/release-versions/hugo-latest.txt +++ b/release-versions/hugo-latest.txt @@ -1 +1 @@ -v0.126.2 +v0.126.3