From afe0a15b580379116a072c62eecc797b67afd677 Mon Sep 17 00:00:00 2001 From: teldra Date: Mon, 4 Apr 2022 12:44:19 +0200 Subject: [PATCH] small fixes --- config.toml | 3 +-- themes/buha/assets/css/layout.css | 10 +++++++++- themes/buha/layouts/_default/archive.html | 2 +- themes/buha/layouts/_default/taxonomy.html | 4 ++-- themes/buha/layouts/index.html | 6 +++--- themes/buha/layouts/partials/orga/generator.html | 2 +- .../orga/generator/partials/categories_and_tags.html | 2 +- themes/buha/layouts/partials/orga/generator/tags.html | 2 +- themes/buha/layouts/partials/structure/header.html | 8 +------- themes/buha/layouts/partials/structure/paginator.html | 2 +- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/config.toml b/config.toml index 3d89ab6c..3b9144f3 100644 --- a/config.toml +++ b/config.toml @@ -11,7 +11,6 @@ copyright = "bunteshaus.de" [taxonomies] category = 'categories' tag = 'tags' -news = 'news' events = 'events' about = 'about' featured = 'featured' @@ -29,8 +28,8 @@ featured = 'featured' # do you want an imprint? imprint = true - mainSections = ['about','news','events'] mainMenu = ['about'] + searchSections = ['news'] # data for your imprint and contact page [params.imprintdata] diff --git a/themes/buha/assets/css/layout.css b/themes/buha/assets/css/layout.css index 62245e21..533a5d5e 100644 --- a/themes/buha/assets/css/layout.css +++ b/themes/buha/assets/css/layout.css @@ -232,6 +232,11 @@ input, textarea { border-radius: 15px; } +.minmax { + width: auto; + max-width: auto; +} + /* Extra small devices (phones, 600px and down) */ @media only screen and (max-width: 600px) {...} @@ -294,7 +299,10 @@ input, textarea { #article_footer { margin-left: 2rem; } - + .minmax { + width: calc(100vw - 5rem); + max-width: 800px; + } } /* Medium devices (landscape tablets, 768px and up) */ diff --git a/themes/buha/layouts/_default/archive.html b/themes/buha/layouts/_default/archive.html index e7f171e5..04d1e694 100644 --- a/themes/buha/layouts/_default/archive.html +++ b/themes/buha/layouts/_default/archive.html @@ -9,7 +9,7 @@ {{ define "main" }}
{{ $prev := 3000}} -{{range where .Site.RegularPages "Type" "in" site.Params.mainSections }} +{{range where .Site.RegularPages "Type" "in" site.Params.searchSections }} {{ $date := .Date }} {{ if gt $prev ($date.Format "2006") }}

{{ $date.Format "2006" }}

diff --git a/themes/buha/layouts/_default/taxonomy.html b/themes/buha/layouts/_default/taxonomy.html index 76760172..2e113989 100644 --- a/themes/buha/layouts/_default/taxonomy.html +++ b/themes/buha/layouts/_default/taxonomy.html @@ -17,9 +17,9 @@ {{- $paginator := slice -}} {{ $what := printf ".Params.%s" $title }} {{ if or (eq $title "about") (eq $title "featured") }} - {{- $paginator = .Paginate (where (where .Site.RegularPages "Type" "in" site.Params.mainSections) $what "eq" true) -}} + {{- $paginator = .Paginate (where (where .Site.RegularPages "Type" "in" site.Params.searchSections) $what "eq" true) -}} {{ else if eq $title "events" }} - {{- $paginator = .Paginate (where (where .Site.RegularPages "Type" "in" site.Params.mainSections) ".Params.when" "ne" nil) -}} + {{- $paginator = .Paginate (where (where .Site.RegularPages "Type" "in" site.Params.searchSections) ".Params.when" "ne" nil) -}} {{ else if eq $title "news" }} {{- $paginator = .Paginate .Site.RegularPages -}} {{ else }} diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html index b47f267a..036bad52 100644 --- a/themes/buha/layouts/index.html +++ b/themes/buha/layouts/index.html @@ -8,7 +8,7 @@ {{ $s := .Site.Params }} {{ $meta := false }} - {{- $posts := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" $s.mainSections }} + {{- $posts := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" $s.searchSections }} {{- $paginator := slice -}} {{- $paginator = .Paginate $posts.ByDate.Reverse -}} @@ -18,7 +18,7 @@ {{ .Content }}
{{ end }} - {{ range first 3 (where (where .Site.RegularPages "Type" "in" site.Params.mainSections) ".Params.featured" "=" true) }} + {{ range first 3 (where (where .Site.RegularPages "Type" "in" site.Params.searchSections) ".Params.featured" "=" true) }} {{ $article_age := sub now.Unix (int .Date.Unix) }} {{ if lt $article_age "1209600" }} {{ partial "structure/list_article.html" . }} @@ -31,7 +31,7 @@ {{ partial "structure/list_article.html" . }} {{ end }} {{- end }} -
+
{{ partial "structure/paginator" (dict "paginator" $paginator) }}
diff --git a/themes/buha/layouts/partials/orga/generator.html b/themes/buha/layouts/partials/orga/generator.html index 01dc4f4b..9dfd6c60 100644 --- a/themes/buha/layouts/partials/orga/generator.html +++ b/themes/buha/layouts/partials/orga/generator.html @@ -2,7 +2,7 @@ {{ end }}

Artikelgenerator

-
+
{{ .Content }}
diff --git a/themes/buha/layouts/partials/orga/generator/partials/categories_and_tags.html b/themes/buha/layouts/partials/orga/generator/partials/categories_and_tags.html index 5bceba2a..e48f42c7 100644 --- a/themes/buha/layouts/partials/orga/generator/partials/categories_and_tags.html +++ b/themes/buha/layouts/partials/orga/generator/partials/categories_and_tags.html @@ -9,7 +9,7 @@ {{ $openname := printf "open%s" $in0 }} {{- $finale := slice -}} -{{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} +{{ $pages := where site.RegularPages "Type" "in" site.Params.searchSections }} {{ if eq .name "tags" }} {{ range $pages }} {{- if .Params.tags -}} diff --git a/themes/buha/layouts/partials/orga/generator/tags.html b/themes/buha/layouts/partials/orga/generator/tags.html index 524ffad2..e9af4adf 100644 --- a/themes/buha/layouts/partials/orga/generator/tags.html +++ b/themes/buha/layouts/partials/orga/generator/tags.html @@ -1,4 +1,4 @@ -{{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} +{{ $pages := where site.RegularPages "Type" "in" site.Params.searchSections }} {{- $tags := slice -}} {{ range $pages }} {{- if .Params.tags -}} diff --git a/themes/buha/layouts/partials/structure/header.html b/themes/buha/layouts/partials/structure/header.html index 5e978f3a..ac608a4d 100644 --- a/themes/buha/layouts/partials/structure/header.html +++ b/themes/buha/layouts/partials/structure/header.html @@ -3,18 +3,12 @@ SVG mit img laden diff --git a/themes/buha/layouts/partials/structure/paginator.html b/themes/buha/layouts/partials/structure/paginator.html index bfb5bbd4..71895c3b 100644 --- a/themes/buha/layouts/partials/structure/paginator.html +++ b/themes/buha/layouts/partials/structure/paginator.html @@ -1,5 +1,5 @@ {{ $paginator := .paginator}} -
+