diff --git a/template/templates/views/bookmark_entries.html b/template/templates/views/bookmark_entries.html index 6d055031..7bce694d 100644 --- a/template/templates/views/bookmark_entries.html +++ b/template/templates/views/bookmark_entries.html @@ -8,6 +8,9 @@ {{ if not .entries }}

{{ t "alert.no_bookmark" }}

{{ else }} +
+ {{ template "pagination" .pagination }} +
{{ range .entries }}
@@ -24,7 +27,9 @@
{{ end }}
- {{ template "pagination" .pagination }} +
+ {{ template "pagination" .pagination }} +
{{ end }} {{ end }} diff --git a/template/templates/views/category_entries.html b/template/templates/views/category_entries.html index c7a7ee14..392a40dc 100644 --- a/template/templates/views/category_entries.html +++ b/template/templates/views/category_entries.html @@ -42,6 +42,9 @@ {{ if not .entries }}

{{ t "alert.no_category_entry" }}

{{ else }} +
+ {{ template "pagination" .pagination }} +
{{ range .entries }}
@@ -73,7 +76,9 @@ {{ end }} - {{ template "pagination" .pagination }} +
+ {{ template "pagination" .pagination }} +
{{ end }} {{ end }} diff --git a/template/templates/views/entry.html b/template/templates/views/entry.html index 106140f9..d650e3fc 100644 --- a/template/templates/views/entry.html +++ b/template/templates/views/entry.html @@ -137,7 +137,7 @@ {{ if gt (len .entry.Content) 120 }} {{ if .user }} -
+
{{ template "entry_pagination" . }}
{{ end }} @@ -189,7 +189,7 @@ {{ if .user }} -
+
{{ template "entry_pagination" . }}
{{ end }} diff --git a/template/templates/views/feed_entries.html b/template/templates/views/feed_entries.html index 9e386a65..f3796e15 100644 --- a/template/templates/views/feed_entries.html +++ b/template/templates/views/feed_entries.html @@ -70,6 +70,9 @@

{{ t "alert.no_feed_entry" }}

{{ end }} {{ else }} +
+ {{ template "pagination" .pagination }} +
{{ range .entries }}
@@ -101,7 +104,9 @@ {{ end }} - {{ template "pagination" .pagination }} +
+ {{ template "pagination" .pagination }} +
{{ end }} {{ end }} diff --git a/template/templates/views/history_entries.html b/template/templates/views/history_entries.html index aa5a1fa2..09f97112 100644 --- a/template/templates/views/history_entries.html +++ b/template/templates/views/history_entries.html @@ -30,6 +30,9 @@ {{ if not .entries }}

{{ t "alert.no_history" }}

{{ else }} +
+ {{ template "pagination" .pagination }} +
{{ range .entries }}
@@ -46,7 +49,9 @@
{{ end }}
- {{ template "pagination" .pagination }} +
+ {{ template "pagination" .pagination }} +
{{ end }} {{ end }} diff --git a/template/templates/views/search_entries.html b/template/templates/views/search_entries.html index 6d4803d3..481b542b 100644 --- a/template/templates/views/search_entries.html +++ b/template/templates/views/search_entries.html @@ -8,6 +8,9 @@ {{ if not .entries }}

{{ t "alert.no_search_result" }}

{{ else }} +
+ {{ template "pagination" .pagination }} +
{{ range .entries }}
@@ -24,7 +27,9 @@
{{ end }}
- {{ template "pagination" .pagination }} +
+ {{ template "pagination" .pagination }} +
{{ end }} {{ end }} diff --git a/template/templates/views/unread_entries.html b/template/templates/views/unread_entries.html index bfb99954..8e00a055 100644 --- a/template/templates/views/unread_entries.html +++ b/template/templates/views/unread_entries.html @@ -31,6 +31,9 @@ {{ if not .entries }}

{{ t "alert.no_unread_entry" }}

{{ else }} +
+ {{ template "pagination" .pagination }} +
{{ range .entries }}
@@ -61,7 +64,9 @@ {{ end }} - {{ template "pagination" .pagination }} +
+ {{ template "pagination" .pagination }} +
{{ end }} {{ end }} diff --git a/ui/static/css/common.css b/ui/static/css/common.css index d7c06f56..21bac999 100644 --- a/ui/static/css/common.css +++ b/ui/static/css/common.css @@ -636,13 +636,25 @@ template { font-size: 1.1em; display: flex; align-items: center; - padding-top: 8px; +} + +.pagination-top { + padding-bottom: 8px; } .pagination-bottom { + padding-top: 8px; +} + +.pagination-entry-top { + padding-top: 8px; +} + +.pagination-entry-bottom { border-top: 1px dotted var(--pagination-border-color); margin-bottom: 15px; margin-top: 50px; + padding-top: 8px; } .pagination > div {