From 685ed5d809b945c0a117eb5ad8e0ebe53fc420a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Wed, 11 Nov 2020 13:27:44 +0100 Subject: [PATCH 1/4] Add links to RSS We have been supporting RSS from the beginning, but it wasn't immediately obvious. The RSS we generate stays the same, only links were added. Given the current styling, I had to enforce paginator display even when there is only one page. --- themes/patek/assets/css/main.scss | 4 ++ themes/patek/layouts/partials/blogList.html | 7 ++- themes/patek/layouts/partials/list.html | 7 ++- themes/patek/layouts/partials/menu.html | 1 + .../layouts/partials/paginator-buttons.html | 44 +++++++++---------- themes/patek/layouts/talks/list.html | 1 + 6 files changed, 39 insertions(+), 25 deletions(-) diff --git a/themes/patek/assets/css/main.scss b/themes/patek/assets/css/main.scss index f66bab1..5acf055 100644 --- a/themes/patek/assets/css/main.scss +++ b/themes/patek/assets/css/main.scss @@ -320,6 +320,10 @@ patek-logo { .rel-alternate-buttons { display: flex; flex-direction: row-reverse; + + a { + margin-left: .3rem; + } } // /Custom styles diff --git a/themes/patek/layouts/partials/blogList.html b/themes/patek/layouts/partials/blogList.html index 1490820..a27c5bb 100644 --- a/themes/patek/layouts/partials/blogList.html +++ b/themes/patek/layouts/partials/blogList.html @@ -1,6 +1,11 @@ {{ $baseUrl := .Site.BaseURL }} {{ $paginator := .Paginate (.Pages.ByPublishDate.Reverse) }} -{{ partial "paginator-buttons.html" $paginator }} +
+ {{ partial "paginator-buttons.html" $paginator }} +
+ +
+
{{ range $paginator.Pages }}
diff --git a/themes/patek/layouts/partials/list.html b/themes/patek/layouts/partials/list.html index 2143102..1a077d6 100644 --- a/themes/patek/layouts/partials/list.html +++ b/themes/patek/layouts/partials/list.html @@ -1,6 +1,11 @@ {{ $baseUrl := .Site.BaseURL }} {{ $paginator := .Paginate (.Pages.ByPublishDate.Reverse) }} -{{ partial "paginator-buttons.html" $paginator }} +
+ {{ partial "paginator-buttons.html" $paginator }} +
+ +
+
{{ range $paginator.Pages }}
diff --git a/themes/patek/layouts/partials/menu.html b/themes/patek/layouts/partials/menu.html index e658b50..5d1db90 100644 --- a/themes/patek/layouts/partials/menu.html +++ b/themes/patek/layouts/partials/menu.html @@ -37,6 +37,7 @@ {{ end }}
+ diff --git a/themes/patek/layouts/partials/paginator-buttons.html b/themes/patek/layouts/partials/paginator-buttons.html index fb40c2f..ac33559 100644 --- a/themes/patek/layouts/partials/paginator-buttons.html +++ b/themes/patek/layouts/partials/paginator-buttons.html @@ -1,28 +1,26 @@ {{ $paginator := . }} -{{ if gt $paginator.TotalPages 1 }} -
- +
diff --git a/themes/patek/layouts/talks/list.html b/themes/patek/layouts/talks/list.html index 80ff6b5..a4e5608 100644 --- a/themes/patek/layouts/talks/list.html +++ b/themes/patek/layouts/talks/list.html @@ -10,6 +10,7 @@ {{ partial "paginator-buttons.html" $paginator }}
+
{{ range $paginator.Pages }} From b73729c32acced15b06175c3fccd60ab3cfbc190 Mon Sep 17 00:00:00 2001 From: Greenscreener Date: Mon, 14 Dec 2020 21:14:44 +0100 Subject: [PATCH 2/4] Made a better layout for rel-alternate buttons. --- themes/patek/assets/css/main.scss | 1 - themes/patek/layouts/partials/blogList.html | 16 ++++++++++------ themes/patek/layouts/partials/list.html | 14 +++++++++----- .../layouts/partials/paginator-buttons.html | 4 ++-- themes/patek/layouts/talks/list.html | 18 +++++++++++------- 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/themes/patek/assets/css/main.scss b/themes/patek/assets/css/main.scss index 5acf055..428c419 100644 --- a/themes/patek/assets/css/main.scss +++ b/themes/patek/assets/css/main.scss @@ -320,7 +320,6 @@ patek-logo { .rel-alternate-buttons { display: flex; flex-direction: row-reverse; - a { margin-left: .3rem; } diff --git a/themes/patek/layouts/partials/blogList.html b/themes/patek/layouts/partials/blogList.html index a27c5bb..4609ef8 100644 --- a/themes/patek/layouts/partials/blogList.html +++ b/themes/patek/layouts/partials/blogList.html @@ -1,10 +1,14 @@ {{ $baseUrl := .Site.BaseURL }} {{ $paginator := .Paginate (.Pages.ByPublishDate.Reverse) }} -
- {{ partial "paginator-buttons.html" $paginator }} -
- -
+
+
+ {{ partial "paginator-buttons.html" $paginator }} +
+
+
+ +
+
{{ range $paginator.Pages }}
@@ -14,4 +18,4 @@

{{ .Summary }} {{ T "readmore" }}

{{ end }} -{{ partial "paginator-buttons.html" $paginator }} \ No newline at end of file +{{ partial "paginator-buttons.html" $paginator }} diff --git a/themes/patek/layouts/partials/list.html b/themes/patek/layouts/partials/list.html index 1a077d6..78cd93d 100644 --- a/themes/patek/layouts/partials/list.html +++ b/themes/patek/layouts/partials/list.html @@ -1,10 +1,14 @@ {{ $baseUrl := .Site.BaseURL }} {{ $paginator := .Paginate (.Pages.ByPublishDate.Reverse) }} -
- {{ partial "paginator-buttons.html" $paginator }} -
- -
+
+
+ {{ partial "paginator-buttons.html" $paginator }} +
+
+
+ +
+
{{ range $paginator.Pages }}
diff --git a/themes/patek/layouts/partials/paginator-buttons.html b/themes/patek/layouts/partials/paginator-buttons.html index ac33559..0527acc 100644 --- a/themes/patek/layouts/partials/paginator-buttons.html +++ b/themes/patek/layouts/partials/paginator-buttons.html @@ -1,5 +1,5 @@ {{ $paginator := . }} -
+{{ if gt $paginator.TotalPages 1 }} -
+{{ end }} diff --git a/themes/patek/layouts/talks/list.html b/themes/patek/layouts/talks/list.html index a4e5608..3ca2fc2 100644 --- a/themes/patek/layouts/talks/list.html +++ b/themes/patek/layouts/talks/list.html @@ -6,12 +6,16 @@

{{ T "talks-paginator-heading" }}:

{{ $baseUrl := .Site.BaseURL }} {{ $paginator := .Paginate ((.Pages.ByParam "when").Reverse) }} -
- {{ partial "paginator-buttons.html" $paginator }} -
- - -
+
+
+ {{ partial "paginator-buttons.html" $paginator }} +
+
+
+ + +
+
{{ range $paginator.Pages }}
@@ -22,4 +26,4 @@
{{ end }} {{ partial "paginator-buttons.html" $paginator }} -{{ end }} \ No newline at end of file +{{ end }} From a0bf26b45900beebecd7f62544585cdbdfd790d4 Mon Sep 17 00:00:00 2001 From: Greenscreener Date: Mon, 14 Dec 2020 21:15:22 +0100 Subject: [PATCH 3/4] Enclosed rel-alternate links in buttons. --- themes/patek/assets/css/main.scss | 4 ++++ themes/patek/layouts/partials/blogList.html | 2 +- themes/patek/layouts/partials/list.html | 2 +- themes/patek/layouts/talks/list.html | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/themes/patek/assets/css/main.scss b/themes/patek/assets/css/main.scss index 428c419..aa3461d 100644 --- a/themes/patek/assets/css/main.scss +++ b/themes/patek/assets/css/main.scss @@ -320,9 +320,13 @@ patek-logo { .rel-alternate-buttons { display: flex; flex-direction: row-reverse; + align-items: center; a { margin-left: .3rem; } + i { + font-size: 1.3rem; + } } // /Custom styles diff --git a/themes/patek/layouts/partials/blogList.html b/themes/patek/layouts/partials/blogList.html index 4609ef8..04f72ee 100644 --- a/themes/patek/layouts/partials/blogList.html +++ b/themes/patek/layouts/partials/blogList.html @@ -6,7 +6,7 @@
- +
diff --git a/themes/patek/layouts/partials/list.html b/themes/patek/layouts/partials/list.html index 78cd93d..85665a6 100644 --- a/themes/patek/layouts/partials/list.html +++ b/themes/patek/layouts/partials/list.html @@ -6,7 +6,7 @@
- +
diff --git a/themes/patek/layouts/talks/list.html b/themes/patek/layouts/talks/list.html index 3ca2fc2..46dfeb4 100644 --- a/themes/patek/layouts/talks/list.html +++ b/themes/patek/layouts/talks/list.html @@ -12,8 +12,8 @@
- - + +
From ec974fbe1c709aaa30c2093a0555d5db2211b448 Mon Sep 17 00:00:00 2001 From: Greenscreener Date: Mon, 14 Dec 2020 21:21:09 +0100 Subject: [PATCH 4/4] Replced sqare rss icon with the normal one for buttons. --- themes/patek/layouts/partials/blogList.html | 2 +- themes/patek/layouts/partials/list.html | 2 +- themes/patek/layouts/talks/list.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/patek/layouts/partials/blogList.html b/themes/patek/layouts/partials/blogList.html index 04f72ee..672f415 100644 --- a/themes/patek/layouts/partials/blogList.html +++ b/themes/patek/layouts/partials/blogList.html @@ -6,7 +6,7 @@
- +
diff --git a/themes/patek/layouts/partials/list.html b/themes/patek/layouts/partials/list.html index 85665a6..b758691 100644 --- a/themes/patek/layouts/partials/list.html +++ b/themes/patek/layouts/partials/list.html @@ -6,7 +6,7 @@
- +
diff --git a/themes/patek/layouts/talks/list.html b/themes/patek/layouts/talks/list.html index 46dfeb4..f3d3aef 100644 --- a/themes/patek/layouts/talks/list.html +++ b/themes/patek/layouts/talks/list.html @@ -13,7 +13,7 @@
- +