Merge branch 'dev' into feature/picset_caption
# Conflicts: # layouts/partials/pic_set.html
This commit is contained in:
commit
3776130e5c
7 changed files with 377 additions and 323 deletions
|
@ -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)}}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue