Compare commits

..

3 Commits

Author SHA1 Message Date
stereobooster 955e44e6d6
Merge a6fde7cba9 into 1373cfd3e4 2023-11-25 12:23:48 +01:00
stereobooster a6fde7cba9 integrate in single.html 2023-10-31 18:14:03 +01:00
stereobooster fade430e88 Example of integration of picture partial 2023-10-31 17:53:15 +01:00
9 changed files with 31 additions and 83 deletions

View File

@ -6,12 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased] ## [Unreleased]
## [2.7.6] - 2023-11-26
### Fixed
- Some Mermaid diagram elements not styled correctly in dark mode ([#706](https://github.com/jpanther/congo/issues/706))
## [2.7.5] - 2023-11-25 ## [2.7.5] - 2023-11-25
### Added ### Added
@ -803,8 +797,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Advanced customisation using simple Tailwind colour definitions and styles - Advanced customisation using simple Tailwind colour definitions and styles
- Fully documented - Fully documented
[Unreleased]: https://github.com/jpanther/congo/compare/v2.7.6...HEAD [Unreleased]: https://github.com/jpanther/congo/compare/v2.7.5...HEAD
[2.7.6]: https://github.com/jpanther/congo/compare/v2.7.5...v2.7.6
[2.7.5]: https://github.com/jpanther/congo/compare/v2.7.4...v2.7.5 [2.7.5]: https://github.com/jpanther/congo/compare/v2.7.4...v2.7.5
[2.7.4]: https://github.com/jpanther/congo/compare/v2.7.3...v2.7.4 [2.7.4]: https://github.com/jpanther/congo/compare/v2.7.3...v2.7.4
[2.7.3]: https://github.com/jpanther/congo/compare/v2.7.2...v2.7.3 [2.7.3]: https://github.com/jpanther/congo/compare/v2.7.2...v2.7.3

View File

@ -1,4 +1,4 @@
/*! Congo v2.7.6 | MIT License | https://github.com/jpanther/congo */ /*! Congo v2.7.5 | MIT License | https://github.com/jpanther/congo */
/*! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com */ /*! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com */

View File

@ -1,4 +1,4 @@
/*! Congo v2.7.6 | MIT License | https://github.com/jpanther/congo */ /*! Congo v2.7.5 | MIT License | https://github.com/jpanther/congo */
@tailwind base; @tailwind base;
@tailwind components; @tailwind components;

View File

@ -2,29 +2,19 @@ function css(name) {
return "rgb(" + getComputedStyle(document.documentElement).getPropertyValue(name) + ")"; return "rgb(" + getComputedStyle(document.documentElement).getPropertyValue(name) + ")";
} }
let isDark = document.documentElement.classList.contains("dark");
mermaid.initialize({ mermaid.initialize({
theme: "base", theme: "base",
themeVariables: { themeVariables: {
background: css("--color-neutral"), background: css("--color-neutral"),
primaryTextColor: isDark ? css("--color-neutral-200") : css("--color-neutral-700"), primaryColor: css("--color-primary-200"),
primaryColor: isDark ? css("--color-primary-700") : css("--color-primary-200"), secondaryColor: css("--color-secondary-200"),
secondaryColor: isDark ? css("--color-secondary-700") : css("--color-secondary-200"), tertiaryColor: css("--color-neutral-100"),
tertiaryColor: isDark ? css("--color-neutral-700") : css("--color-neutral-100"), primaryBorderColor: css("--color-primary-400"),
primaryBorderColor: isDark ? css("--color-primary-500") : css("--color-primary-400"),
secondaryBorderColor: css("--color-secondary-400"), secondaryBorderColor: css("--color-secondary-400"),
tertiaryBorderColor: isDark ? css("--color-neutral-300") : css("--color-neutral-400"), tertiaryBorderColor: css("--color-neutral-400"),
lineColor: isDark ? css("--color-neutral-300") : css("--color-neutral-600"), lineColor: css("--color-neutral-600"),
fontFamily: fontFamily:
"ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif", "ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif",
fontSize: "16px", fontSize: "16px",
pieTitleTextSize: "19px",
pieSectionTextSize: "16px",
pieLegendTextSize: "16px",
pieStrokeWidth: "1px",
pieOuterStrokeWidth: "0.5px",
pieStrokeColor: isDark ? css("--color-neutral-300") : css("--color-neutral-400"),
pieOpacity: "1",
}, },
}); });

View File

@ -10,17 +10,9 @@
{{ $img = resources.Get $path }} {{ $img = resources.Get $path }}
{{ end -}} {{ end -}}
{{/* https://github.com/gohugoio/hugo/pull/10666/files */}}
{{- $params := $url.Query -}}
{{- $x2Param := $params.Get "x2" -}}
{{- $x2 := false -}}
{{- if eq $x2Param "true" -}}
{{- $x2 = true -}}
{{- end -}}
<figure> <figure>
{{- with $img -}} {{- with $img -}}
{{ partial "pictureDefaults.html" (dict "img" . "alt" $altText "class" $class "x2" $x2) }} {{ partial "pictureDefaults.html" (dict "img" . "alt" $altText "class" $class) }}
{{- else -}} {{- else -}}
<img src="{{ .Destination | safeURL }}" alt="{{ $altText }}" class="{{ $class }}"/> <img src="{{ .Destination | safeURL }}" alt="{{ $altText }}" class="{{ $class }}"/>
{{- end -}} {{- end -}}

View File

@ -4,7 +4,6 @@
{{ $lazy := .lazy }} {{ $lazy := .lazy }}
{{ $webp := .webp }} {{ $webp := .webp }}
{{ $lqip := .lqip }} {{ $lqip := .lqip }}
{{ $x2 := .x2 | default false }}
{{ with $img }} {{ with $img }}
{{ if (eq .MediaType.SubType "svg") }} {{ if (eq .MediaType.SubType "svg") }}
@ -46,12 +45,6 @@
style="background-image:url(data:image/webp;base64,{{ $bg }});background-size:cover" style="background-image:url(data:image/webp;base64,{{ $bg }});background-size:cover"
{{ end }} {{ end }}
> >
{{ $width := .Width }}
{{ $height := .Height }}
{{ if $x2 }}
{{ $width = div .Width 2 }}
{{ $height = div .Height 2 }}
{{ end }}
{{ if $webp }} {{ if $webp }}
<source <source
{{ if lt .Width 660 }} {{ if lt .Width 660 }}
@ -61,21 +54,9 @@
{{ else }} {{ else }}
srcset=" srcset="
{{- (.Resize "330x webp").RelPermalink }} 330w, {{- (.Resize "330x webp").RelPermalink }} 330w,
{{- (.Resize "660x webp").RelPermalink }} 660w {{- (.Resize "660x webp").RelPermalink }} 660w,
{{ if gt .Width 1024 }} {{- (.Resize "1024x webp").RelPermalink }} 1024w,
,{{ (.Resize "1024x webp").RelPermalink }} 1024w {{- (.Resize "1320x webp").RelPermalink }} 2x"
{{ 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 }}" src="{{ (.Resize "660x webp").RelPermalink }}"
{{ end }} {{ end }}
type="image/webp" type="image/webp"
@ -83,8 +64,8 @@
{{ end }} {{ end }}
<img <img
src="{{ .RelPermalink }}" src="{{ .RelPermalink }}"
width="{{ $width }}" width="{{ .Width }}"
height="{{ $height }}" height="{{ .Height }}"
{{ with $class }} class="{{ . }}" {{ end }} {{ with $class }} class="{{ . }}" {{ end }}
{{ with $alt }} alt="{{ . }}" {{ end }} {{ with $alt }} alt="{{ . }}" {{ end }}
{{ with $lazy }} loading="lazy" decoding="async" {{ end }} {{ with $lazy }} loading="lazy" decoding="async" {{ end }}
@ -93,17 +74,9 @@
{{ else }} {{ else }}
srcset=" srcset="
{{- (.Resize "330x").RelPermalink }} 330w, {{- (.Resize "330x").RelPermalink }} 330w,
{{- (.Resize "660x").RelPermalink }} 660w {{- (.Resize "660x").RelPermalink }} 660w,
{{ if gt .Width 1024 }} {{- (.Resize "1024x").RelPermalink }} 1024w,
,{{ (.Resize "1024x").RelPermalink }} 1024w {{- (.Resize "1320x").RelPermalink }} 2x"
{{ else }}
,{{ .RelPermalink }} {{ .Width }}w
{{ end }}
{{ if gt .Width 1320 }}
,{{ (.Resize "1320x").RelPermalink }} 2x
{{ else }}
,{{ .RelPermalink }} {{ .Width }}w
{{ end }}"
src="{{ (.Resize "660x").RelPermalink }}" src="{{ (.Resize "660x").RelPermalink }}"
{{ end }} {{ end }}
> >

View File

@ -4,5 +4,4 @@
{{ $lazy := $.Page.Site.Params.enableImageLazyLoading | default true }} {{ $lazy := $.Page.Site.Params.enableImageLazyLoading | default true }}
{{ $webp := $.Page.Site.Params.enableImageWebp | default true }} {{ $webp := $.Page.Site.Params.enableImageWebp | default true }}
{{ $lqip := false }} {{ $lqip := false }}
{{ $x2 := .x2 }} {{ partial "picture.html" (dict "img" $img "alt" $alt "class" $class "lazy" $lazy "webp" $webp "lqip" $lqip) }}
{{ partial "picture.html" (dict "img" $img "alt" $alt "class" $class "lazy" $lazy "webp" $webp "lqip" $lqip "x2" $x2) }}

View File

@ -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 "pictureDefaults.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>

View File

@ -1,6 +1,6 @@
{ {
"name": "hugo-congo-theme", "name": "hugo-congo-theme",
"version": "2.7.6", "version": "2.7.5",
"description": "Congo theme for Hugo", "description": "Congo theme for Hugo",
"scripts": { "scripts": {
"preinstall": "rimraf assets/lib", "preinstall": "rimraf assets/lib",