From 87215650a9c6433aee61ab1aa1478bcb97578555 Mon Sep 17 00:00:00 2001 From: Ben Goldsworthy Date: Sun, 2 Mar 2025 22:39:44 +0100 Subject: [PATCH 1/5] style: feed styling --- assets/css/abstracts/_variables.scss | 2 +- assets/css/base/_typography.scss | 1 + assets/css/feeds.scss | 39 ++++++++++++++++++++++ assets/css/pages/_organisations-list.scss | 10 +++++- assets/css/pages/_single-organisation.scss | 7 ---- assets/css/pages/_single.scss | 5 +++ layouts/_default/baseof.html | 6 ++++ layouts/_default/rss.xml | 10 ++++-- 8 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 assets/css/feeds.scss diff --git a/assets/css/abstracts/_variables.scss b/assets/css/abstracts/_variables.scss index 2ad4ac5..b773860 100644 --- a/assets/css/abstracts/_variables.scss +++ b/assets/css/abstracts/_variables.scss @@ -5,7 +5,7 @@ $light: #fffff0; // Fonts $default-font: "Domitian", "Palatino Linotype", "Book Antiqua", palatino, garamond, serif; -$code-font: "Input Mono", "Lucida Console", monaco, monospace; +$code-font: "Input Mono", "Lucida Console", monaco, "Courier New", monospace; // Breakpoints $breakpoints: ( diff --git a/assets/css/base/_typography.scss b/assets/css/base/_typography.scss index 2528e55..00ce614 100644 --- a/assets/css/base/_typography.scss +++ b/assets/css/base/_typography.scss @@ -56,6 +56,7 @@ h5, h6 { font-weight: normal; margin: 0; + font-variant-numeric: slashed-zero; } a { diff --git a/assets/css/feeds.scss b/assets/css/feeds.scss new file mode 100644 index 0000000..1d9509d --- /dev/null +++ b/assets/css/feeds.scss @@ -0,0 +1,39 @@ +@import "abstracts/variables"; +@import "abstracts/mixins"; + +@import "base/typography"; + +.feed { + padding: 10px 20px; + background-color: $light; + color: $dark; + margin: 0 auto; + max-width: 800px; + font-weight: normal; + text-align: center; + gap: 2em; + display: flex; + flex-direction: column; +} + +.nav__notice { + display: block; + border: 2px solid $dark; + padding: 20px; + width: 80%; + margin-inline: auto; +} + +.summary { + font-style: italic; +} + +.feed__header { + padding-block-end: 1em; + margin-block-end: 1em; + border-block-end: 1px solid $dark; +} + +.feed__item { + margin-block: 1em; +} diff --git a/assets/css/pages/_organisations-list.scss b/assets/css/pages/_organisations-list.scss index 97ed1d3..348c93b 100644 --- a/assets/css/pages/_organisations-list.scss +++ b/assets/css/pages/_organisations-list.scss @@ -1,6 +1,8 @@ .organisations-table { inline-size: 80% !important; + & thead { + z-index: 1; position: sticky; & th { @@ -10,9 +12,15 @@ } } + &__logo { + max-inline-size: 5em; + max-block-size: 5em; + fill: $dark; + } + &__items-icon { padding: 1em; - font-size: 1.4em; + font-size: 0.8em; text-align: center; float: inline-start; padding-inline-end: 1em; diff --git a/assets/css/pages/_single-organisation.scss b/assets/css/pages/_single-organisation.scss index ba22fa2..5182f60 100644 --- a/assets/css/pages/_single-organisation.scss +++ b/assets/css/pages/_single-organisation.scss @@ -102,13 +102,6 @@ } } -.organisation-table { - &__logo { - max-inline-size: 5em; - max-block-size: 5em; - } -} - .timeline__legend { inline-size: fit-content; display: flex; diff --git a/assets/css/pages/_single.scss b/assets/css/pages/_single.scss index 2882684..b788bcf 100644 --- a/assets/css/pages/_single.scss +++ b/assets/css/pages/_single.scss @@ -62,6 +62,11 @@ align-content: center; position: relative; + &--fit { + background-size: contain; + padding: 1em; + } + & .attr { position: absolute; background-color: $dark; diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index e1c2d59..0f9c2eb 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -115,6 +115,12 @@ href="{{ $printStylesheet.Permalink }}" integrity="{{ $printStylesheet.Data.Integrity | html }}" /> + {{- $feedsStylesheet := resources.Get "css/feeds.scss" }} + {{- $feedsStylesheet := $feedsStylesheet | css.Sass }} + {{- if .Param "math" -}} {{- partialCached "math.html" . -}} diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 871e41d..401d5e6 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -11,11 +11,13 @@ {{- $pages = $pages | first $limit -}} {{- end -}} {{- printf "" | safeHTML }} - +{{- printf "" | safeHTML }} + {{ if eq .Title .Site.Title }}{{ .Site.Title | plainify }}{{ else }}{{ with .Title }}{{ . | plainify }} on {{ end }}{{ .Site.Title | plainify }}{{ end }} {{ .Permalink }} Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }} + {{ .FirstSection.Title }} {{ with .Site.LanguageCode }}{{.}}{{end}} {{ with .Site.Params.Author.email }}{{.}}{{ with $.Site.Params.Author.name }} ({{.}}){{end}}{{end}} {{ with .Site.Params.Author.email }}{{.}}{{ with $.Site.Params.Author.name }} ({{.}}){{end}}{{end}} @@ -26,12 +28,14 @@ {{- end -}} {{ range $pages }} - {{ .Title | plainify }} + {{ .Title }} {{ .Permalink }} + {{ range .GetTerms "categories" }}{{ .Title }}{{ end }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} {{ with .Site.Params.Author.email }}{{.}}{{ with $.Site.Params.Author.name }} ({{.}}){{end}}{{end}} {{ .Permalink }} - {{ .Summary | html }} + {{ .Summary | htmlEscape | plainify }} + {{ printf "" .Content | safeHTML }} {{ end }} From ee740bad7a95fd4910042b1fd0fa4fb26f838e85 Mon Sep 17 00:00:00 2001 From: Ben Goldsworthy Date: Sun, 2 Mar 2025 22:40:04 +0100 Subject: [PATCH 2/5] update permissions --- static/css/leaflet/leaflet.css | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 static/css/leaflet/leaflet.css diff --git a/static/css/leaflet/leaflet.css b/static/css/leaflet/leaflet.css old mode 100644 new mode 100755 From 4cd64207fe9af09701a8d6b5124aca2cde40c970 Mon Sep 17 00:00:00 2001 From: Ben Goldsworthy Date: Sun, 2 Mar 2025 22:40:45 +0100 Subject: [PATCH 3/5] fix: authors --- layouts/partials/single/main-header/authors.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/layouts/partials/single/main-header/authors.html b/layouts/partials/single/main-header/authors.html index 3c0d9b6..d4512a2 100644 --- a/layouts/partials/single/main-header/authors.html +++ b/layouts/partials/single/main-header/authors.html @@ -5,7 +5,8 @@ @params sc The site context. */ -}} -

Author{{ with .authors }}s{{ end }}:  + +

Author{{ with .authors }}s{{ end }}:  {{- with .authors -}}

    @@ -19,5 +20,6 @@
{{- else -}} +

{{- end -}} -

+ From 0a24223fe84fed8f54d95679f1ce057fd3414ce4 Mon Sep 17 00:00:00 2001 From: Ben Goldsworthy Date: Sun, 2 Mar 2025 22:41:10 +0100 Subject: [PATCH 4/5] improve renderings --- layouts/blog/section.html | 69 +++++++---- layouts/cv/organisations/section.html | 51 ++++---- layouts/cv/section.html | 10 +- .../cv/organisations/organisations-table.html | 10 +- .../cv/organisations/recursive-children.html | 30 +++-- layouts/partials/item-tile.html | 110 ++++++++++++------ .../single/main-header/item-tile.html | 6 +- .../single/post-meta/organisations.html | 2 +- 8 files changed, 175 insertions(+), 113 deletions(-) diff --git a/layouts/blog/section.html b/layouts/blog/section.html index 6b8506e..01c0748 100644 --- a/layouts/blog/section.html +++ b/layouts/blog/section.html @@ -1,5 +1,6 @@ {{ define "title" }} - {{ .Page.Title | plainify }} | {{ .Site.Title }} + {{ .Page.Title | plainify }} | + {{ .Site.Title }} {{ end }} {{ define "main-class" }}--section layouts-blog-section{{ end }} @@ -12,38 +13,60 @@ {{ define "main-header" }}
-

{{ .Title | safeHTML }} - {{ if eq .Type "blog" }} - {{ with .GetPage "blog/posts" }} +

+ {{ .Title | safeHTML }} + {{ if eq .Type "blog" }} + {{ with .GetPage "blog/posts" }} {{ range .AlternativeOutputFormats -}} - - RSS feed + + RSS feed {{ end }} - {{ end }} - {{ else }} - {{ range .AlternativeOutputFormats -}} - - RSS feed - + {{ end }} + {{ else }} + {{ range .AlternativeOutputFormats -}} + + RSS feed + + {{ end }} {{ end }} - {{ end }}

{{ .Content }} - + +
@@ -51,10 +74,10 @@ {{ define "main-body" }} {{ if eq .Type "blog" }} - {{ with .GetPage "blog/posts" }} - {{ partial "items-grid.html" . }} - {{ end }} - {{ else }} + {{ with .GetPage "blog/posts" }} {{ partial "items-grid.html" . }} + {{ end }} + {{ else }} + {{ partial "items-grid.html" . }} {{ end }} {{ end }} diff --git a/layouts/cv/organisations/section.html b/layouts/cv/organisations/section.html index 6222d9d..c77b8f3 100644 --- a/layouts/cv/organisations/section.html +++ b/layouts/cv/organisations/section.html @@ -1,35 +1,40 @@ {{ define "title" }} - {{ .Page.Title | plainify }} | {{ .Site.Title }} + {{ .Page.Title | plainify }} | + {{ .Site.Title }} {{ end }} {{ define "main-class" }}--section layouts-cv-organisations-section{{ end }} {{ define "main-header" }} - {{ if .IsDescendant ( .GetPage "/cv/organisations" ) }} -
-
- -
-
- {{ else }} -
-

{{ .Title | safeHTML }}.

- {{- .Content -}} -
- {{ end }} + {{ if .IsDescendant ( .GetPage "/cv/organisations" ) }} +
+
+ +
+
+ {{ else }} +
+

{{ .Title | safeHTML }}.

+ {{- .Content -}} +
+ {{ end }} {{ end }} {{ define "main-body" }} - {{ with .GetPage "cv/organisations" }} - {{ partial "cv/organisations/organisations-table.html" . }} - {{ end }} + {{ with .GetPage "cv/organisations" }} + {{ partial "cv/organisations/organisations-table.html" . }} + {{ end }} {{ end }} {{ define "main-footer" }} diff --git a/layouts/cv/section.html b/layouts/cv/section.html index a7176ca..312ff5a 100644 --- a/layouts/cv/section.html +++ b/layouts/cv/section.html @@ -118,14 +118,14 @@ {{ define "main-header" }} {{ if .IsDescendant ( .GetPage "/cv/organisations" ) }}
-
{{- with .Params.nka -}}

Now known as: {{ . }}

{{- end -}} @@ -198,8 +198,8 @@ {{ partial "cv/organisations/recursive-parents.html" ( dict "c" . "g" $ ) }} {{- $parents := partial "cv/organisations/reverse-slice.html" ( $.Scratch.Get "parents" ) -}} - {{- range $parents -}}