diff --git a/assets/css/abstracts/_variables.scss b/assets/css/abstracts/_variables.scss index b773860..2ad4ac5 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, "Courier New", monospace; +$code-font: "Input Mono", "Lucida Console", monaco, monospace; // Breakpoints $breakpoints: ( diff --git a/assets/css/base/_typography.scss b/assets/css/base/_typography.scss index 00ce614..2528e55 100644 --- a/assets/css/base/_typography.scss +++ b/assets/css/base/_typography.scss @@ -56,7 +56,6 @@ 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 deleted file mode 100644 index 1d9509d..0000000 --- a/assets/css/feeds.scss +++ /dev/null @@ -1,39 +0,0 @@ -@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 348c93b..97ed1d3 100644 --- a/assets/css/pages/_organisations-list.scss +++ b/assets/css/pages/_organisations-list.scss @@ -1,8 +1,6 @@ .organisations-table { inline-size: 80% !important; - & thead { - z-index: 1; position: sticky; & th { @@ -12,15 +10,9 @@ } } - &__logo { - max-inline-size: 5em; - max-block-size: 5em; - fill: $dark; - } - &__items-icon { padding: 1em; - font-size: 0.8em; + font-size: 1.4em; 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 5182f60..ba22fa2 100644 --- a/assets/css/pages/_single-organisation.scss +++ b/assets/css/pages/_single-organisation.scss @@ -102,6 +102,13 @@ } } +.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 b788bcf..2882684 100644 --- a/assets/css/pages/_single.scss +++ b/assets/css/pages/_single.scss @@ -62,11 +62,6 @@ 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 0f9c2eb..e1c2d59 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -115,12 +115,6 @@ 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 401d5e6..871e41d 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -11,13 +11,11 @@ {{- $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}} @@ -28,14 +26,12 @@ {{- end -}} {{ range $pages }} - {{ .Title }} + {{ .Title | plainify }} {{ .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 | htmlEscape | plainify }} - {{ printf "" .Content | safeHTML }} + {{ .Summary | html }} {{ end }} diff --git a/layouts/blog/section.html b/layouts/blog/section.html index 01c0748..6b8506e 100644 --- a/layouts/blog/section.html +++ b/layouts/blog/section.html @@ -1,6 +1,5 @@ {{ define "title" }} - {{ .Page.Title | plainify }} | - {{ .Site.Title }} + {{ .Page.Title | plainify }} | {{ .Site.Title }} {{ end }} {{ define "main-class" }}--section layouts-blog-section{{ end }} @@ -13,60 +12,38 @@ {{ 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 }} + {{ end }} + {{ else }} + {{ range .AlternativeOutputFormats -}} + + RSS feed + {{ end }} + {{ end }}

{{ .Content }} - - +
@@ -74,10 +51,10 @@ {{ define "main-body" }} {{ if eq .Type "blog" }} - {{ with .GetPage "blog/posts" }} - {{ partial "items-grid.html" . }} - {{ end }} + {{ with .GetPage "blog/posts" }} + {{ partial "items-grid.html" . }} + {{ end }} {{ else }} - {{ partial "items-grid.html" . }} + {{ partial "items-grid.html" . }} {{ end }} {{ end }} diff --git a/layouts/cv/organisations/section.html b/layouts/cv/organisations/section.html index c77b8f3..6222d9d 100644 --- a/layouts/cv/organisations/section.html +++ b/layouts/cv/organisations/section.html @@ -1,40 +1,35 @@ {{ 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 312ff5a..a7176ca 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 -}}