1 files changed, 29 insertions, 27 deletions
diff --git a/themes/default/layouts/_default/section.feeds.html b/themes/default/layouts/_default/section.feeds.html
index 20566df..e239928 100644
--- a/themes/default/layouts/_default/section.feeds.html
+++ b/themes/default/layouts/_default/section.feeds.html
@@ -1,51 +1,53 @@
-{{ define "styles" }}
+{{- define "styles" -}}
 {{- $author := partial "function-authors-data.html" . -}}
 {{- $author = $author.user -}}
 <style>
-  {{ partial "styles-navigator.html" (dict "Link" "/") | safeCSS }}
+  {{ partial "navigator.css.html" (dict "Link" "/") | safeCSS }}
 
-  tab-bar a[href="{{ .Site.BaseURL }}/{{ $author }}/feeds/"] {
+  tab-bar a[href^="{{ "" | absURL }}/{{ $author }}/feeds"] {
     color: #111;
     color: var(--foreground);
-    display: inherit;
     font-weight: 700;
     text-decoration-color: #014cc6;
     text-decoration-color: var(--link);
     text-decoration: underline;
+    border-bottom: 2px solid var(--background);
   }
 </style>
-{{ end }}
+{{- end -}}
 
-{{ define "middle" }}
-
-  {{ partial "navigator-middle.html"
+{{- define "header" -}}
+  {{- partial "navigator-middle.html"
     (dict
-      "Title"      "Feeds"
-      "Subtitle"   (partial "count-feeds.html" .)
-      "Icon"       "arrow-left"
+      "Context"    .
       "IconLabel"  "Back"
-      "Href"       "/"
       "Id"         "back"
-      "Context"    .
+      "Title"      "Feeds"
+      "Icon"       "arrow-left"
+      "Subtitle"   (print (partial "count-feeds.html" .) " " "Total")
+      "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
-  }}
+  -}}
 
-  {{ partial "profile.html" . }}
+  {{- partial "profile.html" . -}}
+{{- end -}}
 
-  {{ range .Paginator.Pages }}
-    {{ .Render "summary" }}
-  {{ else }}
+{{- define "middle" -}}
+  {{- range .Paginator.Pages -}}
+    {{- partial "render-embed.html" . -}}
+  {{- else -}}
   <footer>
-    <code>No feeds found!</code>
+    <code>No items found!</code>
   </footer>
-  {{ end }}
-
-  {{ partial "pagination.html" . }}
-
-  {{ $writeToFile := partial "function-generate-feeds" . }}
+  {{- end -}}
+  {{- $writeToFile := partial "function-generate-feeds" . -}}
+{{- end -}}
 
-{{ end }}
+{{- define "footer" -}}
+  {{- partial "pagination.html" . -}}
+  {{- partial "footer.html" . -}}
+{{- end -}}
 
-{{ define "right" }}
+{{- define "right" -}}
   {{- partial "navigator-right.html" . -}}
-{{ end }}
+{{- end -}}