diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html index effc0c9..4c82d45 100644 --- a/layouts/_default/_markup/render-heading.html +++ b/layouts/_default/_markup/render-heading.html @@ -25,6 +25,6 @@ {{ end }} {{end}} -{{ $counter }} {{ .Text | safeHTML }} {{ .Page.Store.Get "level" }} +{{ $counter }} {{ .Text | safeHTML }} {{ .Page.Store.Get "level" }} {{ .Page.Store.Set "previousLevel" .Level }} diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index 789f1ab..f2820a7 100644 --- a/layouts/_default/_markup/render-link.html +++ b/layouts/_default/_markup/render-link.html @@ -1,16 +1,27 @@ {{- $currentPage := .Page -}} -{{- $u := urls.Parse .Destination -}} +{{- $text := .Text -}} +{{- $destination := .Destination -}} + +{{- $u := urls.Parse $destination -}} {{- if not $u.Scheme -}} {{- with site.GetPage .Destination -}} {{- $backlinks := .Store.Get "backlinks" | default slice -}} {{- $backlinks := $backlinks|append $currentPage.RelPermalink -}} {{- .Store.Set "backlinks" ($backlinks|uniq) -}} + {{- if not $text -}} + {{- $text = .LinkTitle -}} + {{- end -}} + {{- .Section -}}⁄{{- $text -}} {{- end -}} + {{- if hasPrefix $destination "/library" -}} + {{- $bib := strings.TrimPrefix "/library/" $destination -}} + {{- $b := index site.Data.books.catalog $bib -}} + {{- if not $text -}} + {{- $text = $b.title|default "" -}} + {{- end -}} + library⁄{{- $text -}} + {{- end -}} +{{- else -}} + www⁄{{- with .Text }}{{ . }}{{- end -}} {{- end -}} - - {{- with .Text }}{{ . }}{{ end -}} - {{- /* chomp trailing newline */ -}} diff --git a/layouts/partials/deferred_page_graph.html b/layouts/partials/deferred_page_graph.html index f95cfe3..fc5f44b 100644 --- a/layouts/partials/deferred_page_graph.html +++ b/layouts/partials/deferred_page_graph.html @@ -1,6 +1,5 @@ {{ $currentPage := . }} {{ $currentPageGraph := $currentPage.Store.Get "graph"}} - {{ $data := (dict "allPages" site.AllPages "currentPage" $currentPage)}} {{- with (templates.Defer (dict "data" $data)) -}} {{ range $page := .allPages }} @@ -19,5 +18,6 @@ {{- end -}} {{- end -}} {{- partial "menu_isin.html" (dict "currentPage" .currentPage "isin" (.currentPage.Store.Get "isin")) -}} - {{- partial "menu_mentioned_in.html" (dict "currentPage" .currentPage "mentioned_in" (.currentPage.Store.Get "mentioned_in")) -}} + {{- $mentionedInAll := union (.currentPage.Store.Get "mentioned_in") (.currentPage.Store.Get "backlinks") -}} + {{- partial "menu_mentioned_in.html" (dict "currentPage" .currentPage "mentioned_in" ($mentionedInAll|uniq)) -}} {{- end -}} diff --git a/static/css/newsite.css b/static/css/newsite.css index a3b42c6..35248e5 100644 --- a/static/css/newsite.css +++ b/static/css/newsite.css @@ -16,7 +16,6 @@ hr { } h1, -h2, h3, h4, h5, @@ -347,6 +346,22 @@ a:hover { cursor: pointer; } +h2 { + font-weight: 500; + font-size: 1.6rem; +} + +blockquote { + border-left: 1px red solid; + margin-left: 1rem; + margin-right: 2rem; + padding-left: 1rem; + padding-right: 2rem; + padding-top: 0.1rem; + padding-bottom: 0.1rem; + background-color: #fff9f9; +} + .header { position: sticky; top: 0; @@ -361,7 +376,8 @@ a:hover { max-width: 720px; padding-top: 0.5rem; - font-size: 1.1rem; + font-size: 1.4rem; + font-style: italic; background-color: white; } @@ -401,7 +417,8 @@ a:hover { cursive; font-size: 0.9em; font-style: normal; - color: rgba(0, 0, 0, 0.8); + /* color: rgba(0, 0, 0, 0.8); */ + color: red; vertical-align: baseline; position: relative; top: -0.3em;