diff --git a/assets/css/base/_typography.scss b/assets/css/base/_typography.scss index 3b08501..cbe2a88 100644 --- a/assets/css/base/_typography.scss +++ b/assets/css/base/_typography.scss @@ -44,7 +44,7 @@ html { color: $dark; background-color: $light; font-family: $default-font; - font-variant-numeric: oldstyle-nums slashed-zero; + font-variant-numeric: 'oldstyle-nums slashed-zero'; writing-mode: horizontal-tb; } @@ -305,9 +305,7 @@ kbd { font-family: Arial, Helvetica, sans-serif; background-color: #f7f7f7; color: #333; - box-shadow: - 0 1px 0 rgba(0, 0, 0, 0.2), - 0 0 0 2px white inset; + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; border-radius: 3px; display: inline-block; margin-block: 0; @@ -352,8 +350,3 @@ kbd { dfn { font-variant: small-caps; } - -sub, -sup { - line-height: 0; -} diff --git a/assets/css/components/_chart.scss b/assets/css/components/_chart.scss index fa49bd0..2137a19 100644 --- a/assets/css/components/_chart.scss +++ b/assets/css/components/_chart.scss @@ -1,17 +1,20 @@ .chart-container { position: relative; - inline-size: 100%; - min-block-size: 50vh; + margin-inline: auto; + block-size: 100vh; + inline-size: 95vw; display: flex; justify-content: center; @media (orientation: landscape) { block-size: 75vh; + inline-size: 95vw; } @include mq("large") { block-size: auto; max-block-size: 80vh; + inline-size: 50vw; } & + .chart-container { diff --git a/assets/css/components/_figure.scss b/assets/css/components/_figure.scss index 5a2d69d..c8bc1a1 100644 --- a/assets/css/components/_figure.scss +++ b/assets/css/components/_figure.scss @@ -2,11 +2,6 @@ inline-size: fit-content; margin: 16px auto; - &--chart { - margin: 0; - width: 100%; - } - &__caption { block-size: auto; margin: auto; diff --git a/assets/css/pages/_single.scss b/assets/css/pages/_single.scss index 0f48be6..f957ac7 100644 --- a/assets/css/pages/_single.scss +++ b/assets/css/pages/_single.scss @@ -2,6 +2,7 @@ display: grid; column-gap: 2em; grid-template-columns: 0.4fr 0.6fr; + grid-template-rows: auto auto auto auto 60px; @include mq("large") { grid-template-rows: auto auto auto auto; @@ -14,7 +15,6 @@ grid-column-end: 3; background-color: $light; filter: brightness(80%); - padding-block-start: 2em; @include mq("large") { border: 2px solid $dark; @@ -52,6 +52,10 @@ } &__featured-image { + display: grid; + grid-template-columns: 15% 1fr 15%; + grid-template-rows: 20% 1fr 20%; + grid-template-areas: ". . ." ". post-header-details ." ". . ."; background-position: center center; background-repeat: no-repeat; background-size: cover; @@ -59,21 +63,18 @@ min-block-size: 380px; inline-size: 100%; border: 2px solid $dark; - align-content: center; - position: relative; & .attr { - position: absolute; background-color: $dark; font-size: 0.7em; color: $light; inline-size: fit-content; + position: fixed; padding-block: 0.2em; padding-inline: 0.5em; opacity: 0.8; margin-block: 0; margin-inline: auto; - top: 0; & a { color: $light; @@ -93,15 +94,17 @@ } &__title-wrapper { - display: flex; - flex-direction: column; + display: grid; + grid-area: post-header-details; background-color: $dark; opacity: 0.8; text-align: center; + grid-template-columns: 1fr; padding: 20px; - margin: auto; - width: 80%; - margin-block: auto; + grid-template-rows: 1fr auto auto 1fr; + justify-items: center; + align-items: center; + grid-template-areas: "." "post-title" "post-subtitle" "."; &--no-title { visibility: hidden; @@ -113,12 +116,17 @@ } & .article-header__title { + grid-area: post-title; font-weight: bold; &--long { font-size: 1.5em; } } + + & .article-header__subtitle { + grid-area: post-subtitle; + } } &__word-count, diff --git a/layouts/locations/list.html b/layouts/locations/list.html index fc5d1ec..7bb3625 100644 --- a/layouts/locations/list.html +++ b/layouts/locations/list.html @@ -1,53 +1,45 @@ {{ define "title" }} - Locations | - {{ .Site.Title }} + Locations | {{ .Site.Title }} {{ end }} {{ define "main-class" }}--section location-map{{ end }} {{ define "header-scripts" }} - - - + + + {{ end }} {{ define "footer-scripts" }} - - + + - - + + - - + + - {{- partial "cv/locations/heatmap.js" ( dict "all_pages" $.Site.AllPages "locations" $.Site.Data.locations ) -}} + {{ end }} {{ define "main-header" }} -
-

{{ .Title | safeHTML }}.

- {{ .Content }} -
+
+

{{ .Title | safeHTML }}.

+ {{ .Content }} +
{{ end }} {{ define "main-body" }} -
-
+
+
{{- with ( partial "util/render_recursive_list.html" ( dict "sc" $ "pc" . "items" $.Site.Data.locations "schemaType" "Place" ) ) -}} -
+
{{- . -}} -
+
{{- end -}} -
+
{{ end }} diff --git a/layouts/partials/cite.html b/layouts/partials/cite.html index fb2d928..58b9cb9 100644 --- a/layouts/partials/cite.html +++ b/layouts/partials/cite.html @@ -13,8 +13,8 @@ -{{- $cite := trim ( default .Params.cite ( .Scratch.Get "cite" ) | .Page.RenderString ) "\r\n" -}} -{{- $title := trim ( default .Params.title ( .Scratch.Get "title" ) | .Page.RenderString ) "\r\n" -}} +{{- $cite := default .Params.cite ( .Scratch.Get "cite" ) -}} +{{- $title := default .Params.title ( .Scratch.Get "title" ) -}} {{- $titleLang := default .Params.titleLang ( .Scratch.Get "titleLang" ) -}} {{- $titleTr := default .Params.titleTr ( .Scratch.Get "titleTr" ) -}} {{- $schemaType := default .Params.schemaType ( .Scratch.Get "schemaType" ) -}} @@ -49,7 +49,7 @@ {{- $itemType := default "CreativeWork" $schemaType -}} {{- if ( or ( in $.Site.Data.itemtypes $itemType ) ( eq .Params.suppress "true" ) ) -}} {{- with .Params.href -}} - + {{- end -}} {{- with $cite -}} - + {{- end -}} {{- if $titleLang -}} diff --git a/layouts/partials/cv/locations/heatmap.js b/layouts/partials/cv/locations/heatmap.js index 6427bdb..1465b5a 100644 --- a/layouts/partials/cv/locations/heatmap.js +++ b/layouts/partials/cv/locations/heatmap.js @@ -1,50 +1,47 @@ -{{/* +/* Recursively render an ordered or unordered list from a set of arbitrarily- deeply-nested items. @params all_pages All site pages - @params locations All locations +*/ + +var map = L.map('map', { + fullscreenControl: true +}).setView([55, -3], 3); + +L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { + maxZoom: 19, + attribution: '© OpenStreetMap' +}).addTo(map); + +{{- $locations := partialCached "util/get_location_leaf_nodes.html" $.Site.Data.locations -}} + +{{/* +{{- range .Site.AllPages -}} + {{- with .Params.locations -}} + {{- range . -}} + {{- with ( index $locations ( replaceRE `, [A-Z]+` "" . ) ) -}} + L.marker([{{ .lat }}, {{ .lon }}]).addTo(map); + {{- end -}} + {{- end -}} + {{- end -}} +{{- end -}} */}} - + {{- end -}} + ], + { + minOpacity: 0.5, + gradient: {0.1: 'blue', 0.3: 'lime', 0.8: 'orange', 1: 'red'} + } +).addTo(map); diff --git a/layouts/partials/header/site-header.html b/layouts/partials/header/site-header.html index 607d37c..024dd25 100644 --- a/layouts/partials/header/site-header.html +++ b/layouts/partials/header/site-header.html @@ -1,62 +1,12 @@ -
+
{{ block "header" . }} -

- {{ .Site.Title }} -

-

- Views my own. Discussion ≠ endorsement. Do try this at home. -

-

- ~ - ✉️ - ~ - 🧑‍💻 - ~ - 🔐 - ~ - RSS feed - ~ -

+

{{ .Site.Title }}

+

Views my own. Discussion ≠ endorsement. Do try this at home.

+

~ ✉️ ~ 🧑‍💻 ~ 🔐 ~ RSS feed ~

diff --git a/layouts/partials/images/get-image.html b/layouts/partials/images/get-image.html index 758530b..efc0ca9 100644 --- a/layouts/partials/images/get-image.html +++ b/layouts/partials/images/get-image.html @@ -15,9 +15,9 @@ -{{- $isResizable := not ( in ( slice "avif" "svg" "gif" ) .img.MediaType.SubType ) -}} +{{- $isResizable := in ( slice "avif" "svg" "gif" ) .MediaType.SubType -}} {{- if $isResizable -}} - {{- with .img.Resize "1200x webp" -}} + {{- with .Resize "1200x webp" -}} {{- .RelPermalink -}} {{- end -}} {{- else }} diff --git a/layouts/partials/single/main-header/item-tile.html b/layouts/partials/single/main-header/item-tile.html index 1f91270..529c870 100644 --- a/layouts/partials/single/main-header/item-tile.html +++ b/layouts/partials/single/main-header/item-tile.html @@ -31,7 +31,7 @@