mirror of https://github.com/jpanther/congo.git
Compare commits
1 Commits
1e3241997d
...
410e41dbd2
Author | SHA1 | Date |
---|---|---|
stereobooster | 410e41dbd2 |
|
@ -22,7 +22,6 @@ jobs:
|
||||||
uses: peaceiris/actions-hugo@v2
|
uses: peaceiris/actions-hugo@v2
|
||||||
with:
|
with:
|
||||||
hugo-version: "latest"
|
hugo-version: "latest"
|
||||||
extended: true
|
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
working-directory: ./exampleSite
|
working-directory: ./exampleSite
|
||||||
|
|
|
@ -19,7 +19,6 @@ jobs:
|
||||||
uses: peaceiris/actions-hugo@v2
|
uses: peaceiris/actions-hugo@v2
|
||||||
with:
|
with:
|
||||||
hugo-version: "latest"
|
hugo-version: "latest"
|
||||||
extended: true
|
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
working-directory: ./exampleSite
|
working-directory: ./exampleSite
|
||||||
|
|
|
@ -8,13 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Automatic support for WebP images ([#693](https://github.com/jpanther/congo/pull/693))
|
- Warning when building if links to markdown files cannot be resolved ([#691](https://github.com/jpanther/congo/pull/691))
|
||||||
- Warning when building if links to Markdown files cannot be resolved ([#691](https://github.com/jpanther/congo/pull/691))
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- ⚠️ Hugo extended version is now required when building sites
|
|
||||||
- Refactored image logic into a new `picture.html` partial ([#693](https://github.com/jpanther/congo/pull/693))
|
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
[hugoVersion]
|
[hugoVersion]
|
||||||
extended = true
|
extended = false
|
||||||
min = "0.87.0"
|
min = "0.87.0"
|
||||||
|
|
|
@ -12,7 +12,6 @@ autoSwitchAppearance = true
|
||||||
enableSearch = false
|
enableSearch = false
|
||||||
enableCodeCopy = false
|
enableCodeCopy = false
|
||||||
enableImageLazyLoading = true
|
enableImageLazyLoading = true
|
||||||
enableImageWebp = true
|
|
||||||
|
|
||||||
# robots = ""
|
# robots = ""
|
||||||
fingerprintAlgorithm = "sha256"
|
fingerprintAlgorithm = "sha256"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
[hugoVersion]
|
[hugoVersion]
|
||||||
extended = true
|
extended = false
|
||||||
min = "0.87.0"
|
min = "0.86.1"
|
||||||
|
|
|
@ -12,7 +12,6 @@ autoSwitchAppearance = true
|
||||||
enableSearch = true
|
enableSearch = true
|
||||||
enableCodeCopy = true
|
enableCodeCopy = true
|
||||||
enableImageLazyLoading = true
|
enableImageLazyLoading = true
|
||||||
enableImageWebp = true
|
|
||||||
enableQuicklink = true
|
enableQuicklink = true
|
||||||
|
|
||||||
# robots = ""
|
# robots = ""
|
||||||
|
|
|
@ -60,7 +60,6 @@ jobs:
|
||||||
uses: peaceiris/actions-hugo@v2
|
uses: peaceiris/actions-hugo@v2
|
||||||
with:
|
with:
|
||||||
hugo-version: "latest"
|
hugo-version: "latest"
|
||||||
extended: true
|
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: hugo --minify
|
run: hugo --minify
|
||||||
|
|
|
@ -21,7 +21,7 @@ These instructions will get you up and running using Hugo and Congo from a compl
|
||||||
If you haven't used Hugo before, you will need to [install it onto your local machine](https://gohugo.io/getting-started/installing). You can check if it's already installed by running the command `hugo version`.
|
If you haven't used Hugo before, you will need to [install it onto your local machine](https://gohugo.io/getting-started/installing). You can check if it's already installed by running the command `hugo version`.
|
||||||
|
|
||||||
{{< alert >}}
|
{{< alert >}}
|
||||||
Make sure you are using **Hugo extended version 0.87.0** or later as the theme takes advantage of some of the latest Hugo features.
|
Make sure you are using **Hugo version 0.87.0** or later as the theme takes advantage of some of the latest Hugo features.
|
||||||
{{< /alert >}}
|
{{< /alert >}}
|
||||||
|
|
||||||
You can find detailed installation instructions for your platform in the [Hugo docs](https://gohugo.io/getting-started/installing).
|
You can find detailed installation instructions for your platform in the [Hugo docs](https://gohugo.io/getting-started/installing).
|
||||||
|
|
|
@ -1,28 +1,64 @@
|
||||||
{{ $url := urls.Parse .Destination }}
|
{{ $url := urls.Parse .Destination }}
|
||||||
{{ $altText := .Text }}
|
{{ $altText := .Text }}
|
||||||
{{ $caption := .Title }}
|
{{ $caption := .Title }}
|
||||||
{{ $class := "mx-auto my-0 rounded-md" }}
|
{{ $lazyLoad := $.Page.Site.Params.enableImageLazyLoading | default true }}
|
||||||
|
{{ if findRE "^https?" $url.Scheme }}
|
||||||
{{ $file := $url.Path }}
|
|
||||||
{{ $img := .Page.Resources.GetMatch $file }}
|
|
||||||
{{- if and (not $img) .Page.File }}
|
|
||||||
{{ $path := path.Join .Page.File.Dir $file }}
|
|
||||||
{{ $img = resources.Get $path }}
|
|
||||||
{{ end -}}
|
|
||||||
|
|
||||||
{{/* https://github.com/gohugoio/hugo/pull/10666 */}}
|
|
||||||
{{- $params := $url.Query -}}
|
|
||||||
{{- $x2Param := $params.Get "2x" -}}
|
|
||||||
{{- $x2 := false -}}
|
|
||||||
{{- if eq $x2Param "true" -}}
|
|
||||||
{{- $x2 = true -}}
|
|
||||||
{{- end -}}
|
|
||||||
|
|
||||||
<figure>
|
<figure>
|
||||||
{{- with $img -}}
|
<img
|
||||||
{{ partial "picture.html" (dict "img" . "alt" $altText "class" $class "x2" $x2) }}
|
class="mx-auto my-0 rounded-md"
|
||||||
{{- else -}}
|
src="{{ $url.String }}"
|
||||||
<img src="{{ .Destination | safeURL }}" alt="{{ $altText }}" class="{{ $class }}"/>
|
alt="{{ $altText }}"
|
||||||
{{- end -}}
|
{{ if $lazyLoad }}
|
||||||
|
loading="lazy"
|
||||||
|
{{ end }}
|
||||||
|
/>
|
||||||
{{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
|
{{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
|
||||||
</figure>
|
</figure>
|
||||||
|
{{ 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 }}
|
||||||
|
<figure>
|
||||||
|
<img
|
||||||
|
class="mx-auto my-0 rounded-md"
|
||||||
|
{{ if eq .MediaType.SubType "svg" }}
|
||||||
|
src="{{ .RelPermalink }}"
|
||||||
|
{{ else }}
|
||||||
|
width="{{ .Width }}"
|
||||||
|
height="{{ .Height }}"
|
||||||
|
{{ if lt .Width 660 }}
|
||||||
|
src="{{ .RelPermalink }}"
|
||||||
|
{{ else }}
|
||||||
|
srcset="
|
||||||
|
{{- (.Resize "330x").RelPermalink }} 330w,
|
||||||
|
{{- (.Resize "660x").RelPermalink }} 660w,
|
||||||
|
{{- (.Resize "1024x").RelPermalink }} 1024w,
|
||||||
|
{{- (.Resize "1320x").RelPermalink }} 2x"
|
||||||
|
src="{{ (.Resize "660x").RelPermalink }}"
|
||||||
|
{{ end }}
|
||||||
|
{{ end }}
|
||||||
|
alt="{{ $altText }}"
|
||||||
|
{{ if $lazyLoad }}
|
||||||
|
loading="lazy"
|
||||||
|
{{ end }}
|
||||||
|
/>
|
||||||
|
{{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
|
||||||
|
</figure>
|
||||||
|
{{ else }}
|
||||||
|
<figure>
|
||||||
|
<img
|
||||||
|
class="mx-auto my-0 rounded-md"
|
||||||
|
src="{{ $url.String }}"
|
||||||
|
alt="{{ $altText }}"
|
||||||
|
{{ if $lazyLoad }}
|
||||||
|
loading="lazy"
|
||||||
|
{{ end }}
|
||||||
|
/>
|
||||||
|
{{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
|
||||||
|
</figure>
|
||||||
|
{{ end }}
|
||||||
|
{{ end }}
|
|
@ -15,9 +15,25 @@
|
||||||
</div>
|
</div>
|
||||||
{{ with $feature }}
|
{{ with $feature }}
|
||||||
<div class="prose">
|
<div class="prose">
|
||||||
{{ $altText := $.Params.featureAlt | default $.Params.coverAlt | default "" }}
|
<img
|
||||||
{{ $class := "mb-6 -mt-4 rounded-md" }}
|
class="mb-6 -mt-4 rounded-md"
|
||||||
{{ partial "picture.html" (dict "img" . "alt" $altText "class" $class "lazy" false) }}
|
{{ if eq .MediaType.SubType "svg" }}
|
||||||
|
src="{{ .RelPermalink }}"
|
||||||
|
{{ else }}
|
||||||
|
width="{{ .Width }}"
|
||||||
|
height="{{ .Height }}"
|
||||||
|
{{ if lt .Width 660 }}
|
||||||
|
src="{{ .RelPermalink }}"
|
||||||
|
{{ else }}
|
||||||
|
srcset="
|
||||||
|
{{- (.Resize "330x").RelPermalink }} 330w,
|
||||||
|
{{- (.Resize "660x").RelPermalink }} 660w,
|
||||||
|
{{- (.Resize "1024x").RelPermalink }} 1024w,
|
||||||
|
{{- (.Resize "1320x").RelPermalink }} 2x"
|
||||||
|
{{ end }}
|
||||||
|
{{ end }}
|
||||||
|
alt="{{ $.Params.featureAlt | default $.Params.coverAlt | default "" }}"
|
||||||
|
/>
|
||||||
{{ with $.Params.coverCaption }}
|
{{ with $.Params.coverCaption }}
|
||||||
<figcaption class="mb-6 -mt-3 text-center">{{ . | markdownify }}</figcaption>
|
<figcaption class="mb-6 -mt-3 text-center">{{ . | markdownify }}</figcaption>
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
|
@ -1,112 +0,0 @@
|
||||||
{{ $img := .img }}
|
|
||||||
{{ $alt := .alt }}
|
|
||||||
{{ $class := .class }}
|
|
||||||
{{ $lazy := .lazy | default $.Page.Site.Params.enableImageLazyLoading | default true }}
|
|
||||||
{{ $webp := .webp | default $.Page.Site.Params.enableImageWebp | default true }}
|
|
||||||
{{ $lqip := .lqip | default false }}
|
|
||||||
{{ $x2 := .x2 | default false }}
|
|
||||||
|
|
||||||
{{ with $img }}
|
|
||||||
{{ if (eq .MediaType.SubType "svg") }}
|
|
||||||
{{ $width := ""}}
|
|
||||||
{{ $height := ""}}
|
|
||||||
{{ $svgContent := .Content }}
|
|
||||||
{{ range (findRESubmatch `<svg[^>]*width=["']([.0-9]*)["'a-zA-Z]` $svgContent 1) }}
|
|
||||||
{{ $width = index . 1 }}
|
|
||||||
{{ end }}
|
|
||||||
{{ range (findRESubmatch `<svg[^>]*height=["']([.0-9]*)["'a-zA-Z]` $svgContent 1) }}
|
|
||||||
{{ $height = index . 1 }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if (eq "" $width $height) }}
|
|
||||||
{{ range (findRESubmatch `<svg[^>]*viewBox=["']?([.0-9]*) ([.0-9]*) ([.0-9]*) ([.0-9]*)` $svgContent 1) }}
|
|
||||||
{{ $width = index . 3 }}
|
|
||||||
{{ $height = index . 4 }}
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if (eq "" $width $height) }}
|
|
||||||
{{ warnf "Can't detect width and height for SVG %s" .RelPermalink }}
|
|
||||||
{{/* do not use lazy without dimensions */}}
|
|
||||||
{{ $lazy = false }}
|
|
||||||
{{ end }}
|
|
||||||
<picture {{ with $class }} class="{{ . }}" {{ end }}>
|
|
||||||
<img
|
|
||||||
src="{{ .RelPermalink }}"
|
|
||||||
{{ with $width }} width="{{ . }}" {{ end }}
|
|
||||||
{{ with $height }} height="{{ . }}" {{ end }}
|
|
||||||
{{ with $class }} class="{{ . }}" {{ end }}
|
|
||||||
{{ with $alt }} alt="{{ . }}" {{ end }}
|
|
||||||
{{ with $lazy }} loading="lazy" decoding="async" {{ end }}
|
|
||||||
>
|
|
||||||
</picture>
|
|
||||||
{{ else }}
|
|
||||||
<picture
|
|
||||||
{{ with $class }} class="{{ . }}" {{ end }}
|
|
||||||
{{ if $lqip }}
|
|
||||||
{{ $bg := (.Resize "20x webp q20").Content | base64Encode }}
|
|
||||||
style="background-image:url(data:image/webp;base64,{{ $bg }});background-size:cover"
|
|
||||||
{{ end }}
|
|
||||||
>
|
|
||||||
{{ $width := .Width }}
|
|
||||||
{{ $height := .Height }}
|
|
||||||
{{ if $x2 }}
|
|
||||||
{{ $width = div .Width 2 }}
|
|
||||||
{{ $height = div .Height 2 }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if $webp }}
|
|
||||||
<source
|
|
||||||
{{ if lt .Width 660 }}
|
|
||||||
{{ with .Resize (printf "%dx%d webp" .Width .Height) }}
|
|
||||||
src="{{ .RelPermalink }}"
|
|
||||||
{{ end }}
|
|
||||||
{{ else }}
|
|
||||||
srcset="
|
|
||||||
{{- (.Resize "330x webp").RelPermalink }} 330w,
|
|
||||||
{{- (.Resize "660x webp").RelPermalink }} 660w
|
|
||||||
{{ if gt .Width 1024 }}
|
|
||||||
,{{ (.Resize "1024x webp").RelPermalink }} 1024w
|
|
||||||
{{ else }}
|
|
||||||
{{ with .Resize (printf "%dx%d webp" .Width .Height) }}
|
|
||||||
,{{ .RelPermalink }} {{ .Width }}w
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ if gt .Width 1320 }}
|
|
||||||
,{{ (.Resize "1320x webp").RelPermalink }} 2x
|
|
||||||
{{ else }}
|
|
||||||
{{ with .Resize (printf "%dx%d webp" .Width .Height) }}
|
|
||||||
,{{ .RelPermalink }} {{ .Width }}w
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}"
|
|
||||||
src="{{ (.Resize "660x webp").RelPermalink }}"
|
|
||||||
{{ end }}
|
|
||||||
type="image/webp"
|
|
||||||
/>
|
|
||||||
{{ end }}
|
|
||||||
<img
|
|
||||||
src="{{ .RelPermalink }}"
|
|
||||||
width="{{ $width }}"
|
|
||||||
height="{{ $height }}"
|
|
||||||
{{ with $class }} class="{{ . }}" {{ end }}
|
|
||||||
{{ with $alt }} alt="{{ . }}" {{ end }}
|
|
||||||
{{ with $lazy }} loading="lazy" decoding="async" {{ end }}
|
|
||||||
{{ if lt .Width 660 }}
|
|
||||||
src="{{ .RelPermalink }}"
|
|
||||||
{{ else }}
|
|
||||||
srcset="
|
|
||||||
{{- (.Resize "330x").RelPermalink }} 330w,
|
|
||||||
{{- (.Resize "660x").RelPermalink }} 660w
|
|
||||||
{{ if gt .Width 1024 }}
|
|
||||||
,{{ (.Resize "1024x").RelPermalink }} 1024w
|
|
||||||
{{ else }}
|
|
||||||
,{{ .RelPermalink }} {{ .Width }}w
|
|
||||||
{{ end }}
|
|
||||||
{{ if gt .Width 1320 }}
|
|
||||||
,{{ (.Resize "1320x").RelPermalink }} 2x
|
|
||||||
{{ else }}
|
|
||||||
,{{ .RelPermalink }} {{ .Width }}w
|
|
||||||
{{ end }}"
|
|
||||||
src="{{ (.Resize "660x").RelPermalink }}"
|
|
||||||
{{ end }}
|
|
||||||
>
|
|
||||||
</picture>
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
|
@ -6,23 +6,45 @@
|
||||||
{{ $caption := .Get "caption" }}
|
{{ $caption := .Get "caption" }}
|
||||||
{{ $href := .Get "href" }}
|
{{ $href := .Get "href" }}
|
||||||
{{ $class := .Get "class" }}
|
{{ $class := .Get "class" }}
|
||||||
|
|
||||||
{{ $file := $url.Path }}
|
|
||||||
{{ $img := .Page.Resources.GetMatch $file }}
|
|
||||||
{{- if and (not $img) .Page.File }}
|
|
||||||
{{ $path := path.Join .Page.File.Dir $file }}
|
|
||||||
{{ $img = resources.Get $path }}
|
|
||||||
{{ end -}}
|
|
||||||
|
|
||||||
<figure{{ with $class }} class="{{ . }}"{{ end }}>
|
<figure{{ with $class }} class="{{ . }}"{{ end }}>
|
||||||
{{ with $href }}<a href="{{ . }}">{{ end }}
|
{{ with $href }}<a href="{{ . }}">{{ end }}
|
||||||
|
<img
|
||||||
{{- with $img -}}
|
class="mx-auto my-0 rounded-md"
|
||||||
{{ partial "picture.html" (dict "img" . "alt" $altText "class" $class) }}
|
alt="{{ $altText }}"
|
||||||
{{- else -}}
|
{{ if .Site.Params.enableImageLazyLoading | default true }}
|
||||||
<img src="{{ $url.String }}" alt="{{ $altText }}" class="{{ $class }}"/>
|
loading="lazy"
|
||||||
{{- end -}}
|
{{ end }}
|
||||||
|
{{ if findRE "^https?" $url.Scheme }}
|
||||||
|
src="{{ $url.String }}"
|
||||||
|
{{ 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 eq .MediaType.SubType "svg" }}
|
||||||
|
src="{{ .RelPermalink }}"
|
||||||
|
{{ else }}
|
||||||
|
width="{{ .Width }}"
|
||||||
|
height="{{ .Height }}"
|
||||||
|
{{ if lt .Width 660 }}
|
||||||
|
src="{{ .RelPermalink }}"
|
||||||
|
{{ else }}
|
||||||
|
srcset="
|
||||||
|
{{- (.Resize "330x").RelPermalink }} 330w,
|
||||||
|
{{- (.Resize "660x").RelPermalink }} 660w,
|
||||||
|
{{- (.Resize "1024x").RelPermalink }} 1024w,
|
||||||
|
{{- (.Resize "1320x").RelPermalink }} 2x"
|
||||||
|
src="{{ (.Resize "660x").RelPermalink }}"
|
||||||
|
{{ end }}
|
||||||
|
{{ end }}
|
||||||
|
{{ else }}
|
||||||
|
src="{{ $url.String }}"
|
||||||
|
{{ end }}
|
||||||
|
{{ end }}
|
||||||
|
/>
|
||||||
{{ with $href }}</a>{{ end }}
|
{{ with $href }}</a>{{ end }}
|
||||||
{{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
|
{{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
|
||||||
</figure>
|
</figure>
|
||||||
|
|
|
@ -4,16 +4,17 @@
|
||||||
{{- if .Get "href" -}}
|
{{- if .Get "href" -}}
|
||||||
<a href="{{ .Get "href" }}">
|
<a href="{{ .Get "href" }}">
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
<img src="{{ $image.RelPermalink }}"
|
||||||
{{ $altText := "" }}
|
{{- if or (.Get "alt") (.Get "caption") }}
|
||||||
{{ with .Get "alt" }}
|
alt="{{ with .Get "alt" }}{{ . }}{{ else }}{{ .Get "caption" | markdownify | plainify }}{{ end }}"
|
||||||
{{ $altText = . }}
|
{{- end -}}
|
||||||
{{ else }}
|
{{ if .Site.Params.enableImageLazyLoading | default true }}
|
||||||
{{ $altText = (.Get "caption") | markdownify | plainify }}
|
loading="lazy"
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
width="100%"
|
||||||
{{ partial "picture.html" (dict "img" $image "alt" $altText "x2" true) }}
|
height="auto"
|
||||||
|
style="max-width:{{ div $image.Width 2 }}px; max-height:{{ div $image.Height 2 }}px;"
|
||||||
|
/>
|
||||||
{{- if .Get "href" }}</a>{{ end -}}
|
{{- if .Get "href" }}</a>{{ end -}}
|
||||||
{{- if .Get "caption" -}}
|
{{- if .Get "caption" -}}
|
||||||
<figcaption>
|
<figcaption>
|
||||||
|
|
Loading…
Reference in New Issue