From ae4b0d435cf5bcdc365a44f6dbc000d96db4e41d Mon Sep 17 00:00:00 2001 From: teldra Date: Mon, 11 Apr 2022 21:35:30 +0200 Subject: [PATCH] small fixes --- themes/buha/assets/css/article.css | 4 ++++ themes/buha/assets/css/classes.css | 4 ++++ themes/buha/layouts/partials/l1/contact.html | 8 ++------ themes/buha/layouts/partials/layout/article.html | 6 ++++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/themes/buha/assets/css/article.css b/themes/buha/assets/css/article.css index e0c083dc..f6aa0f5b 100644 --- a/themes/buha/assets/css/article.css +++ b/themes/buha/assets/css/article.css @@ -70,6 +70,10 @@ article #readmore { flex: 0 1 72%; } +.multiple_medium { + flex: 0 1 50%; +} + .solo { flex: 0 0 100%; } diff --git a/themes/buha/assets/css/classes.css b/themes/buha/assets/css/classes.css index 6b1a10ca..baa6d3ff 100644 --- a/themes/buha/assets/css/classes.css +++ b/themes/buha/assets/css/classes.css @@ -35,6 +35,10 @@ margin-left: 1rem; } +.margin_right_1rem { + margin-right: 1rem; +} + .margin_top_1rem { margin-top: 1.1rem; } diff --git a/themes/buha/layouts/partials/l1/contact.html b/themes/buha/layouts/partials/l1/contact.html index 8a1fa367..11477e0b 100644 --- a/themes/buha/layouts/partials/l1/contact.html +++ b/themes/buha/layouts/partials/l1/contact.html @@ -10,18 +10,14 @@ {{- if .context.Resources.ByType "image" -}} {{- $img = index (.context.Resources.ByType "image") 0 -}} {{- $thumb = $img.Resize "1024x" }} - {{ if .content }} - {{- $thumb = $img.Resize "500x" }} - {{ end }} {{ end }}
- {{ if and (ne $img "") (eq .pic true)}} -
+ {{ if (ne $img "") }} +
{{ if and (ne .type "list") (.context.Resources.ByType "image") }}{{ end }} {{ if ne .type "list" }}{{ end }} - {{ if eq .type "article" }}{{ end }}
{{ end }}
diff --git a/themes/buha/layouts/partials/layout/article.html b/themes/buha/layouts/partials/layout/article.html index f16fdab5..5df6aac2 100644 --- a/themes/buha/layouts/partials/layout/article.html +++ b/themes/buha/layouts/partials/layout/article.html @@ -10,6 +10,8 @@ {{- if and (.context.Resources.ByType "image") (.context.Content) -}} {{ $pic = "multiple_small" }} {{ $text = "multiple_big" }} +{{ else if and (.context.Resources.ByType "image") (not (.context.Content)) }} + {{ $pic = "multiple_medium" }} {{ end }} {{ partial "snippets/article_metadata" $metas }} @@ -19,9 +21,9 @@ {{- $img := index (.context.Resources.ByType "image") 0 -}} {{- $thumb := index (.context.Resources.ByType "image") 0 -}} {{ if ne .context.Content "" }} - {{- $thumb = $img.Resize "2048x" }} + {{- $resize = "2048x" }} {{ else if eq .type "list" }} - {{- $thumb = $img.Resize "500x" }} + {{- $resize = "500x" }} {{ end }} {{- $thumb = $img.Resize $resize }}