From ac8d277899bcd1fa8ed20abb030ff090fdfd2267 Mon Sep 17 00:00:00 2001
From: mdn <1stdragon@gmail.com>
Date: Mon, 28 Nov 2022 19:45:15 +0100
Subject: [PATCH] Sticky-Position verallgemeinert

---
 assets/_own/css/style.css    | 10 +++++++++-
 layouts/_default/list.html   |  2 +-
 layouts/_default/single.html |  2 +-
 layouts/blog/list.html       | 14 ++++++++------
 layouts/blog/single.html     |  3 +--
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/assets/_own/css/style.css b/assets/_own/css/style.css
index a296e0b..82b49d2 100644
--- a/assets/_own/css/style.css
+++ b/assets/_own/css/style.css
@@ -54,6 +54,14 @@ footer p {
   fill_: currentColor;
 }
 
+/*
+ * Sidebar
+ */
+.position-sticky {
+  top: .5rem;
+  margin-bottom: .5rem!important;
+}
+
 
 /*
  * Blog posts
@@ -128,4 +136,4 @@ footer p {
 }
 .avatar {
   padding-top: 8vh;
-}
\ No newline at end of file
+}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 0cd7f85..9f7001f 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -10,7 +10,7 @@
 {{ end }}
 
 {{ define "sidebar" }}
-  <div class="position-sticky" style="top: 0.5rem;">
+  <div class="position-sticky">
     {{- partial "widget/header.html" (dict "title" "About Me") -}}
     {{- partial "widget/aboutme.html" (dict "avatar" .Site.Params.Avatar "description" .Site.Params.Description) -}}
 
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 0319b0f..50fa018 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -4,7 +4,7 @@
 {{ end }}
 
 {{ define "sidebar" }}
-  <div class="position-sticky" style="top: 0.5rem;">
+  <div class="position-sticky">
     {{- partial "widget/header.html" (dict "title" "About Me") -}}
     {{- partial "widget/aboutme.html" (dict "avatar" .Site.Params.Avatar "description" .Site.Params.Description) -}}
 
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 7c25294..83b06b5 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -1,13 +1,15 @@
 {{ define "head" }}
   {{ if eq .Type "blog" }}
     {{ $latestEntry := index (where (where .Site.RegularPages "Type" "blog") "Params.featured" true).ByPublishDate.Reverse 0 }}
+    {{ with $latestEntry }}
     <div class="p-4 m-2 rounded text-bg-dark">
       <div class="col-md6 px-0">
-        <h1 class="display-4 fst-italic">{{ $latestEntry.Title }}</h1>
-        <p class="lead my-3">{{ $latestEntry.Summary | safeHTML }}</p>
-        <p class="lead mb-0"><a href="{{ $latestEntry.Permalink }}" class="text-white fw-bold">Weiter lesen...</a></p>
+        <h1 class="display-4 fst-italic">{{ .Title }}</h1>
+        <p class="lead my-3">{{ .Summary | safeHTML }}</p>
+        <p class="lead mb-0"><a href="{{ .RelPermalink }}" class="text-white fw-bold">Weiter lesen...</a></p>
       </div>
     </div>
+    {{ end }}
   {{ end }}
 {{ end }}
 
@@ -17,8 +19,8 @@
     {{/* Der 1te Weg soll alle Blog-Einträge finden*/}}
     {{ $pag := .Paginate (where .Site.RegularPages "Type" "blog").ByPublishDate.Reverse }}
   {{ else }}
-    {{/* Der 2te Weg ist über die Archive-Gruppierung, und dort wird nicht paginiert */}}
-    {{ $pag := .Paginate .Pages.ByPublishDate.Reverse 9999 }}
+    {{/* Der 2te Weg ist über die Archive-Gruppierung */}}
+    {{ $pag := .Paginate .Pages.ByPublishDate.Reverse }}
   {{ end }}
   {{/* Der Paginator wurde in den If-Blöcken zwar erstellt, aber die Variable ist auserhalb nicht sichtbar, daher hier explizit holen. 
     Dieser kann nach dem ersten erstellen auch nicht mehr verändert werden */}}
@@ -35,7 +37,7 @@
 {{ end }}
 
 {{ define "sidebar" }}
-  <div class="position-sticky" style="top: 0.5rem;">
+  <div class="position-sticky">
     {{ $catIdent := .Site.Params.Blog.Categories | default "categories" }}
     {{ $cats := (index $.Site.Taxonomies $catIdent)}}
     {{ if $cats }}
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index d6a192a..6878184 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -15,9 +15,8 @@
   </section>
 {{ end }}
 
-
 {{ define "sidebar" }}
-  <aside class="position-sticky" style="top: 0.5rem;">
+  <aside class="position-sticky">
     {{- partial "widget/header.html" (dict "title" "Inhaltsverzeichnis")}}
     <div>
       {{ .TableOfContents  }}