From 9b6557bb0cc7d04af12788237b8d0bd9c7ce44e3 Mon Sep 17 00:00:00 2001 From: Hoernschen Date: Mon, 11 Aug 2025 15:40:17 +0200 Subject: [PATCH 1/2] CHANGE command in build script (previous is deprecated) --- assets/build/convImages.sh | 8 ++++---- assets/build/genIco.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/build/convImages.sh b/assets/build/convImages.sh index 9689030..dcafafb 100755 --- a/assets/build/convImages.sh +++ b/assets/build/convImages.sh @@ -20,12 +20,12 @@ for FILE in public/**/*.@(jpg|jpeg|tif|tiff|png|gif); do NAME=$(basename "$FILE" | cut -d. -f1) EXTENSION=$(basename "$FILE" | cut -d. -f2) for size in ${sizes[@]}; do - convert "$FILE" -resize ${size}x${size}\> "${DIR}/${NAME}-${size}.${EXTENSION}" + magick convert "$FILE" -resize ${size}x${size}\> "${DIR}/${NAME}-${size}.${EXTENSION}" done done # Web Optimized Formats for FILE in public/**/*.@(jpg|jpeg|tif|tiff|png|gif); do - convert $PARAMS "$FILE" "${FILE}".webp; - convert $PARAMS "$FILE" "${FILE}".avif; -done \ No newline at end of file + magick convert $PARAMS "$FILE" "${FILE}".webp; + magick convert $PARAMS "$FILE" "${FILE}".avif; +done diff --git a/assets/build/genIco.sh b/assets/build/genIco.sh index e3e9fb0..c5feb8f 100644 --- a/assets/build/genIco.sh +++ b/assets/build/genIco.sh @@ -6,4 +6,4 @@ # 1. The path of the source file # 2. The output path (with .ico extension) -convert -density 300 -define icon:auto-resize=96,64,48,32,16 -background none $1 $2 +magick convert -density 300 -define icon:auto-resize=96,64,48,32,16 -background none $1 $2 From e21c1e21826d4c90b7c49d848471ccc0918a3744 Mon Sep 17 00:00:00 2001 From: Hoernschen Date: Mon, 11 Aug 2025 15:41:21 +0200 Subject: [PATCH 2/2] CHANGE team list: Make number of team members on front page configurable --- assets/scss/index.scss | 37 +++++++++++++++++++++---------------- layouts/partials/team.html | 10 +++++++--- layouts/team/list.html | 8 ++++---- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/assets/scss/index.scss b/assets/scss/index.scss index c1538c5..ec015fe 100644 --- a/assets/scss/index.scss +++ b/assets/scss/index.scss @@ -207,25 +207,30 @@ img { .team { align-items: center; text-align: center; -} - -.team-list { - display: flex; - flex-direction: row; - flex-wrap: wrap; - a { - color: inherit; - margin: 0 auto; + .list { + display: flex; + flex-direction: row; + flex-wrap: wrap; + gap: 2rem; + justify-content: center; + a { + color: inherit; + margin: 0 auto; + .member { + display: inline-block; + align-items: center; + text-align: center; + padding: 1rem; + .title { + font-size: x-large; + padding-bottom: 0.1rem; + text-align: center; + } + } + } } } -.teammember { - display: inline-block; - align-items: center; - text-align: center; - padding: 1rem; -} - .avatar { width: 15rem; height: 15rem; diff --git a/layouts/partials/team.html b/layouts/partials/team.html index 402f557..758b3c9 100644 --- a/layouts/partials/team.html +++ b/layouts/partials/team.html @@ -8,11 +8,13 @@ {{else if .id}} {{- $id = .id }} {{end}} +{{- $members := where $pages "Params.leaveDate" "==" nil}} +{{- $first := $team.first | default 4}}
{{ partial "components/title.html" $team.title }}
- {{- range first 4 ((where $pages "Params.leaveDate" "==" nil).ByParam "startDate") }} + {{- range first $first ($members.ByParam "startDate") }} - {{ partial "components/button.html" (dict "type" "text block" "url" $team.id "text" ($team.more | default "More")) }} + {{ if gt $members.Len $first }} + {{ partial "components/button.html" (dict "type" "text block" "url" $team.id "text" ($team.more | default "More")) }} + {{ end }}
diff --git a/layouts/team/list.html b/layouts/team/list.html index 27c0ad1..f72389c 100644 --- a/layouts/team/list.html +++ b/layouts/team/list.html @@ -1,19 +1,19 @@ {{ define "main" }} -