From 8a245122149e4fc828e6077e1b127fd2f779b002 Mon Sep 17 00:00:00 2001 From: teldra Date: Mon, 11 Apr 2022 21:04:28 +0200 Subject: [PATCH] small fixes --- themes/buha/assets/css/classes.css | 1 + .../buha/layouts/partials/snippets/menu.html | 48 +++++++++++-------- .../layouts/partials/structure/contact.html | 6 --- .../layouts/partials/structure/empty.html | 0 .../buha/layouts/partials/structure/head.html | 34 ------------- .../layouts/partials/structure/header.html | 15 ------ .../layouts/partials/structure/langs.html | 10 ---- .../layouts/partials/structure/sidebar.html | 2 - .../layouts/partials/structure/submenu.html | 6 --- 9 files changed, 29 insertions(+), 93 deletions(-) delete mode 100644 themes/buha/layouts/partials/structure/contact.html delete mode 100644 themes/buha/layouts/partials/structure/empty.html delete mode 100644 themes/buha/layouts/partials/structure/head.html delete mode 100644 themes/buha/layouts/partials/structure/header.html delete mode 100644 themes/buha/layouts/partials/structure/langs.html delete mode 100644 themes/buha/layouts/partials/structure/sidebar.html delete mode 100644 themes/buha/layouts/partials/structure/submenu.html diff --git a/themes/buha/assets/css/classes.css b/themes/buha/assets/css/classes.css index 74aa0ac9..6b1a10ca 100644 --- a/themes/buha/assets/css/classes.css +++ b/themes/buha/assets/css/classes.css @@ -46,6 +46,7 @@ .align_menu { list-style: none; text-align: right; + margin-bottom: .3rem; } .notgrow { diff --git a/themes/buha/layouts/partials/snippets/menu.html b/themes/buha/layouts/partials/snippets/menu.html index d78098e6..5a679e75 100644 --- a/themes/buha/layouts/partials/snippets/menu.html +++ b/themes/buha/layouts/partials/snippets/menu.html @@ -1,26 +1,34 @@ {{ if gt .Site.Taxonomies.categories 0 }} -

{{ if i18n "news" }}{{ i18n "news" }}{{ else }}{{ "News" }}{{ end }}

- {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.categories }} - {{ $orig := $taxonomyname }} - {{ if ne (i18n $taxonomyname) "" }} - {{ $taxonomyname = i18n $taxonomyname }} - {{ else }} - {{ $taxonomyname = $taxonomyname | humanize }} - {{ end }} -
{{ $taxonomyname }}
- {{ end }} +
+

{{ if i18n "news" }}{{ i18n "news" }}{{ else }}{{ "News" }}{{ end }}

+ {{ if eq .Section "news" }} + {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.categories }} + {{ $orig := $taxonomyname }} + {{ if ne (i18n $taxonomyname) "" }} + {{ $taxonomyname = i18n $taxonomyname }} + {{ else }} + {{ $taxonomyname = $taxonomyname | humanize }} + {{ end }} + + {{ end }} + {{ end }} +
{{ end }} {{ if gt .Site.Taxonomies.events 0 }} -

{{ if i18n "events" }}{{ i18n "events" }}{{ else }}{{ "Events" }}{{ end }}

- {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.events }} - {{ $orig := $taxonomyname }} - {{ if ne (i18n $taxonomyname) "" }} - {{ $taxonomyname = i18n $taxonomyname }} - {{ else }} - {{ $taxonomyname = $taxonomyname | humanize }} - {{ end }} -
{{ $taxonomyname }}
- {{ end }} +
+

{{ if i18n "events" }}{{ i18n "events" }}{{ else }}{{ "Events" }}{{ end }}

+ {{ if eq .Section "events" }} + {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.events }} + {{ $orig := $taxonomyname }} + {{ if ne (i18n $taxonomyname) "" }} + {{ $taxonomyname = i18n $taxonomyname }} + {{ else }} + {{ $taxonomyname = $taxonomyname | humanize }} + {{ end }} + + {{ end }} + {{ end }} +
{{ end }} {{ if .IsHome }} {{ partial "snippets/langs" . }} diff --git a/themes/buha/layouts/partials/structure/contact.html b/themes/buha/layouts/partials/structure/contact.html deleted file mode 100644 index d8b273c9..00000000 --- a/themes/buha/layouts/partials/structure/contact.html +++ /dev/null @@ -1,6 +0,0 @@ -{{ site.Title }}
-{{ site.Params.imprintdata.street }}
-{{ if i18n "pobox" }}{{ i18n "pobox" }}{{ else }}{{ "Po.Box" }}{{ end }} {{ site.Params.imprintdata.pobox }}
-{{ site.Params.imprintdata.city }}
-{{ if site.Params.imprintdata.tel }}

{{ if i18n "phone" }}{{ i18n "phone" }}{{ else }}{{ "phone" }}{{ end }}: {{ site.Params.imprintdata.tel }}

{{ end }} -{{ if site.Params.imprintdata.mail }}

{{ if i18n "mail" }}{{ i18n "mail" }}{{ else }}{{ "mail" }}{{ end }}: {{ site.Params.imprintdata.mail | markdownify }}{{ end }}

diff --git a/themes/buha/layouts/partials/structure/empty.html b/themes/buha/layouts/partials/structure/empty.html deleted file mode 100644 index e69de29b..00000000 diff --git a/themes/buha/layouts/partials/structure/head.html b/themes/buha/layouts/partials/structure/head.html deleted file mode 100644 index 6939aafe..00000000 --- a/themes/buha/layouts/partials/structure/head.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - -{{ $water := resources.Get "css/color.css" }} -{{ $header := resources.Get "css/header.css" }} -{{ $main := resources.Get "css/main.css" }} -{{ $article := resources.Get "css/article.css" }} -{{ $paginator := resources.Get "css/paginator.css" }} -{{ $footer := resources.Get "css/footer.css" }} -{{ $classes := resources.Get "css/classes.css" }} -{{ $generator := resources.Get "css/generator.css" }} -{{ $big := resources.Get "css/big.css" }} -{{ $allcss := slice $water $header $main $article $paginator $footer $generator $big $classes | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }} - - -{{ $title := print .Site.Title " | " .Title }} -{{ if .IsHome }}{{ $title = .Site.Title }}{{ end }} -{{ $title }} - - - -{{ range .AlternativeOutputFormats -}} - {{ printf `` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} -{{ end -}} - -{{ if .Site.Params.keywords -}} - -{{- end }} - - - -{{ template "_internal/opengraph.html" . }} - diff --git a/themes/buha/layouts/partials/structure/header.html b/themes/buha/layouts/partials/structure/header.html deleted file mode 100644 index b6fe1c0e..00000000 --- a/themes/buha/layouts/partials/structure/header.html +++ /dev/null @@ -1,15 +0,0 @@ -
- - SVG mit img laden - - -
diff --git a/themes/buha/layouts/partials/structure/langs.html b/themes/buha/layouts/partials/structure/langs.html deleted file mode 100644 index c5921c14..00000000 --- a/themes/buha/layouts/partials/structure/langs.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ if not .IsHome }} - {{ if .Translations }} -
  • {{ "Languages" }}

  • - {{ range .Translations }} - {{ if ne .Lang $.Lang }} -
  • {{- if i18n .Lang -}}{{- i18n .Lang -}}{{- else -}}{{- humanize .Lang -}}{{ end }}
  • - {{ end }} - {{ end }} - {{ end }} -{{ end }} diff --git a/themes/buha/layouts/partials/structure/sidebar.html b/themes/buha/layouts/partials/structure/sidebar.html deleted file mode 100644 index e10fccc1..00000000 --- a/themes/buha/layouts/partials/structure/sidebar.html +++ /dev/null @@ -1,2 +0,0 @@ -{{ partial "snippets/menu" . }} - diff --git a/themes/buha/layouts/partials/structure/submenu.html b/themes/buha/layouts/partials/structure/submenu.html deleted file mode 100644 index d7597f80..00000000 --- a/themes/buha/layouts/partials/structure/submenu.html +++ /dev/null @@ -1,6 +0,0 @@ -
    -
    - Menü ☰ - {{ partial "snippets/menu" . }} -
    -