Merge branch 'dev' into feature/picset_caption

# Conflicts:
#	layouts/partials/pic_set.html
This commit is contained in:
FarseaSH 2022-09-04 20:01:42 +08:00
commit 3776130e5c
7 changed files with 377 additions and 323 deletions

View file

@ -1,6 +1,3 @@
<!-- START -->
{{ $caption := .other }}
{{ $num_per_row := 3}}
{{ $max_width := 80}}
{{ if or (eq (len .pic_set) 2) (eq (len .pic_set) 4)}}