diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html index e05ac21..effc0c9 100644 --- a/layouts/_default/_markup/render-heading.html +++ b/layouts/_default/_markup/render-heading.html @@ -1,18 +1,18 @@ {{ $currentLevel := .Level }} {{ $currentHeaderKey := printf "H_%d" $currentLevel }} -{{ if not (.Page.Scratch.Get $currentHeaderKey) }} - {{ .Page.Scratch.Set $currentHeaderKey 1 }} +{{ if not (.Page.Store.Get $currentHeaderKey) }} + {{ .Page.Store.Set $currentHeaderKey 1 }} {{ else }} - {{ .Page.Scratch.Set $currentHeaderKey (add 1 (.Page.Scratch.Get $currentHeaderKey)) }} + {{ .Page.Store.Set $currentHeaderKey (add 1 (.Page.Store.Get $currentHeaderKey)) }} {{ end }} -{{ if .Page.Scratch.Get "previousLevel" }} - {{ $previousLevel := .Page.Scratch.Get "previousLevel" }} +{{ if .Page.Store.Get "previousLevel" }} + {{ $previousLevel := .Page.Store.Get "previousLevel" }} {{ if gt $previousLevel $currentLevel }} {{ range $header := slice 1 2 3 4 5 6 }} {{ if gt $header $currentLevel }} - {{ $.Page.Scratch.Delete (printf "H_%d" $header) }} + {{ $.Page.Store.Delete (printf "H_%d" $header) }} {{ end }} {{ end }} {{ end }} @@ -20,11 +20,11 @@ {{ $counter := "" }} {{ range $header := slice 1 2 3 4 5 6 }} -{{ if gt ($.Page.Scratch.Get (printf "H_%d" $header)) 0 }} - {{ $counter = printf "%s%d." $counter ($.Page.Scratch.Get (printf "H_%d" $header))}} +{{ if gt ($.Page.Store.Get (printf "H_%d" $header)) 0 }} + {{ $counter = printf "%s%d." $counter ($.Page.Store.Get (printf "H_%d" $header))}} {{ end }} {{end}} -{{ $counter }} {{ .Text | safeHTML }} {{ .Page.Scratch.Get "level" }} +{{ $counter }} {{ .Text | safeHTML }} {{ .Page.Store.Get "level" }} -{{ .Page.Scratch.Set "previousLevel" .Level }} +{{ .Page.Store.Set "previousLevel" .Level }} diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index 1c26e82..789f1ab 100644 --- a/layouts/_default/_markup/render-link.html +++ b/layouts/_default/_markup/render-link.html @@ -1 +1,16 @@ -{{- .Page.Scratch.Add "urls" (slice .Destination) -}}{{- $t := .Text -}}{{- $sup := "" -}}{{- if and (strings.HasPrefix .Destination "{") (.Destination | strings.Count "}") -}}{{- range first 1 (split .Destination "}") -}}{{- range $frmt := (split (substr . 1) ",") -}}{{- if eq $frmt "sc" -}}{{- $t -}}{{- end -}}{{- end -}}{{- end -}}{{- else }}{{- if strings.HasPrefix .Destination "http" -}}{{- $sup = "www" -}}{{- end -}}{{- if strings.HasPrefix .Destination "#" -}}{{- $sup = "§" -}}{{- end -}}{{- $sup -}}⁄{{ .Text | safeHTML }}{{- end -}} +{{- $currentPage := .Page -}} +{{- $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) -}} + {{- end -}} +{{- end -}} + + {{- with .Text }}{{ . }}{{ end -}} + +{{- /* chomp trailing newline */ -}} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 78cf8da..0ea6753 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -7,7 +7,6 @@ {{ block "title" . }}{{ site.Title | default "Sandpoints in progress..." }}{{ end }} - {{- block "header" . -}}{{- end -}} {{- block "main" . }}{{- end -}} {{- partialCached "footer.html" . -}} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index eb63ab5..ee90a01 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,31 +1,19 @@ -{{- define "header" -}} -
- - - - - - - -
-{{- end -}} -{{- define "main" -}}{{- partial "single-page-graph.html" . -}} -
-
- - -
-

{{ .Title }}

-

{{ .Content }}

-
+{{- define "main" -}} + {{- partial "single-page-graph.html" . -}} + {{- partial "page-header.html" . -}} +
+
{{ .Section }}⁄{{ .Title }}
+
{{ .Content }}
+
+ + +
+
{{ end }} diff --git a/layouts/partials/GetIsinSections.html b/layouts/partials/GetIsinSections.html deleted file mode 100644 index ea2a623..0000000 --- a/layouts/partials/GetIsinSections.html +++ /dev/null @@ -1,7 +0,0 @@ -{{- $sections := slice -}} -{{- range . -}} - {{- $p := site.GetPage . -}} - {{- $section := trim $p.FirstSection.RelPermalink "//" -}} - {{- $sections = uniq ($sections | append $section) -}} -{{- end -}} -{{- return $sections -}} diff --git a/layouts/partials/GetPluralSectionName.html b/layouts/partials/GetPluralSectionName.html index 29cafb7..a60ddd9 100644 --- a/layouts/partials/GetPluralSectionName.html +++ b/layouts/partials/GetPluralSectionName.html @@ -1,2 +1 @@ -{{- $sectionMap := site.Data.sandpointsnamegraph -}}{{- return index $sectionMap -. -}} +{{- $sectionMap := site.Data.sandpointsnamegraph -}}{{- return index $sectionMap . -}} diff --git a/layouts/partials/GetSectionsWithPagePaths.html b/layouts/partials/GetSectionsWithPagePaths.html new file mode 100644 index 0000000..954e58a --- /dev/null +++ b/layouts/partials/GetSectionsWithPagePaths.html @@ -0,0 +1,13 @@ +{{- $menus := dict -}} +{{- $sections := slice -}} +{{- range $pagePath := . -}} + {{- with site.GetPage $pagePath -}} + {{- $section := .Section -}} + {{- $menu := index $menus $section|default slice -}} + {{- $menu = uniq ($menu | append $pagePath) -}} + {{- $menus = merge $menus (dict $section $menu) -}} + {{- $sections = $sections | append $section -}} + {{- end -}} +{{- end -}} +{{- $menus = merge $menus (dict "sections" ($sections|uniq)) -}} +{{- return $menus -}} diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html deleted file mode 100644 index 3bb99f9..0000000 --- a/layouts/partials/breadcrumbs.html +++ /dev/null @@ -1,25 +0,0 @@ -{{- $home := .Page.GetPage .Site.Params.home -}} - -
- - - -
- - {{ $home.Title }} - - {{- if ne $home.Title .Page.Title -}} - »  - - {{ .Page.Title }} - - {{- end -}} -
-
- -
{{ debug.Dump .Site.Params }}
diff --git a/layouts/partials/deferred_page_graph.html b/layouts/partials/deferred_page_graph.html index 8c483ee..f95cfe3 100644 --- a/layouts/partials/deferred_page_graph.html +++ b/layouts/partials/deferred_page_graph.html @@ -3,17 +3,14 @@ {{ $data := (dict "allPages" site.AllPages "currentPage" $currentPage)}} {{- with (templates.Defer (dict "data" $data)) -}} - {{ range .allPages }} - {{- $page := . -}} + {{ range $page := .allPages }} {{- $pageGraph := $page.Store.Get "graph" -}} - {{- range $child := index $pageGraph "has" -}} {{- $childPage := site.GetPage $child -}} {{- $isinPages := $childPage.Store.Get "isin" | default slice -}} {{- $isinPages = $isinPages | append $page.RelPermalink -}} {{- $childPage.Store.Set "isin" ($isinPages|uniq) -}} {{- end -}} - {{- range $kid := index $pageGraph "no-prefix" -}} {{- $mentionedInPage := site.GetPage $kid -}} {{- $mentionedIn := $mentionedInPage.Store.Get "mentioned_in" | default slice -}} @@ -21,7 +18,6 @@ {{- $mentionedInPage.Store.Set "mentioned_in" ($mentionedIn|uniq) -}} {{- end -}} {{- end -}} - {{- partial "menu_isin.html" (dict "currentPage" .currentPage "isin" (.currentPage.Store.Get "isin")) -}} - {{- partial "mentioned_in.html" (dict "currentPage" .currentPage "mentioned_in" (.currentPage.Store.Get "mentioned_in")) -}} + {{- partial "menu_mentioned_in.html" (dict "currentPage" .currentPage "mentioned_in" (.currentPage.Store.Get "mentioned_in")) -}} {{- end -}} diff --git a/layouts/partials/graph-menu.html b/layouts/partials/graph-menu.html new file mode 100644 index 0000000..11054b0 --- /dev/null +++ b/layouts/partials/graph-menu.html @@ -0,0 +1,20 @@ +{{- $cursiveMenuPrefix := .cursiveMenuPrefix -}} +{{- $menuSection := .menuSection -}} +{{- $pagePaths := .pagePaths -}} +
+
+ {{- with $cursiveMenuPrefix -}}{{- . -}} {{- end -}} + {{- partial "GetPluralSectionName.html" $menuSection -}}⁄ +
+
+ {{- range $pagePaths -}} + {{- $p := site.GetPage . -}} + {{- $pageSection := trim $p.FirstSection.RelPermalink "//" -}} + {{- if eq $pageSection $menuSection -}} +
+ {{- $p.LinkTitle -}} +
+ {{- end -}} + {{- end -}} +
+
diff --git a/layouts/partials/mentioned_in.html b/layouts/partials/mentioned_in.html deleted file mode 100644 index 6962192..0000000 --- a/layouts/partials/mentioned_in.html +++ /dev/null @@ -1,12 +0,0 @@ -
-
mentioned in⁄
-
- {{- $currentPage := .currentPage -}} {{- range .mentioned_in -}}{{- $p := - site.GetPage . -}} -
- {{- $p.LinkTitle -}} -

{{- printf "RELREF: %#v" (relref $currentPage $p.RelPermalink) -}}

-
- {{- end -}} -
-
diff --git a/layouts/partials/menu_isin.html b/layouts/partials/menu_isin.html index fe3d2aa..655564c 100644 --- a/layouts/partials/menu_isin.html +++ b/layouts/partials/menu_isin.html @@ -1,18 +1,6 @@ {{- $currentPage := .currentPage -}} {{- $isin := .isin -}} -
- {{- range (partial "GetIsinSections.html" .isin) -}} - {{- $section := . -}} -
is in {{- partial "GetPluralSectionName.html" $section -}}⁄
-
- {{- range $isin -}} - {{- $p := site.GetPage . -}} - {{- if eq (trim $p.FirstSection.RelPermalink "//") $section -}} -
- {{- $p.LinkTitle -}} -
- {{- end -}} - {{- end -}} -
- {{- end -}} -
+{{- range $menuSection, $pagePaths := partial "GetSectionsWithPagePaths.html" $isin -}} + {{- if eq $menuSection "sections" -}}{{- continue -}}{{- end -}} + {{- partial "graph-menu.html" (dict "cursiveMenuPrefix" "is in" "menuSection" $menuSection "pagePaths" $pagePaths) -}} +{{- end -}} diff --git a/layouts/partials/menu_mentioned_in.html b/layouts/partials/menu_mentioned_in.html new file mode 100644 index 0000000..caafc24 --- /dev/null +++ b/layouts/partials/menu_mentioned_in.html @@ -0,0 +1,6 @@ +{{- $currentPage := .currentPage -}} +{{- $mentioned_in := .mentioned_in -}} +{{- range $menuSection, $pagePaths := partial "GetSectionsWithPagePaths.html" $mentioned_in -}} + {{- if eq $menuSection "sections" -}}{{- continue -}}{{- end -}} + {{- partial "graph-menu.html" (dict "cursiveMenuPrefix" "mentioned in" "menuSection" $menuSection "pagePaths" $pagePaths) -}} +{{- end -}} diff --git a/layouts/partials/menu_verbs.html b/layouts/partials/menu_verbs.html new file mode 100644 index 0000000..cb1124d --- /dev/null +++ b/layouts/partials/menu_verbs.html @@ -0,0 +1,45 @@ +{{- $currentPage := . -}} +{{- $graph := $currentPage.Store.Get "graph" -}} +{{- $allSections := slice -}} +{{- $menuPagePaths := dict -}} +{{ range $menuPrefix, $pagePath := $graph }} + {{- if eq $menuPrefix "no-prefix" -}} + {{- $sectionsWithPagePaths := partial "GetSectionsWithPagePaths.html" $pagePath -}} + {{if index $sectionsWithPagePaths "sections" }} + {{- $allSections = $allSections | append (index $sectionsWithPagePaths "sections") -}} + {{- range $section, $pagePaths := $sectionsWithPagePaths -}} + {{- if ne $section "sections" -}} + {{- $menuPagePaths = merge $menuPagePaths (dict $section (index $sectionsWithPagePaths $section)) -}} + {{- end -}} + {{- end -}} + {{- end -}} + {{- else -}} + {{- $menuPrefix := printf "%s_" $menuPrefix -}} + {{- $allSections = $allSections | append $menuPrefix -}} + {{- $pagePaths := index $menuPagePaths $pagePath|default slice -}} + {{- $pagePaths = $pagePaths|append $pagePath -}} + {{- $menuPagePaths = merge $menuPagePaths (dict $menuPrefix $pagePaths) -}} + {{- end -}} +{{ end }} +{{- $allSections = ($allSections|uniq|sort) -}} + +{{- $orderedSections := slice -}} +{{- range $key := site.Params.Sandpoints.graphMenuOrder -}} + {{- if in $allSections $key -}} + {{- $orderedSections = $orderedSections|append $key -}} + {{- end -}} +{{- end -}} + +{{- $orderedSections := ($orderedSections|append $allSections)|uniq -}} + +{{- range $section := $orderedSections -}} + {{- if strings.HasSuffix $section "_" -}} + {{- $menuPrefix := strings.TrimSuffix "_" $section -}} + {{- range $menuSection, $pagePaths := partial "GetSectionsWithPagePaths.html" (index $menuPagePaths $section) -}} + {{- if eq $menuSection "sections" -}}{{- continue -}}{{- end -}} + {{- partial "graph-menu.html" (dict "cursiveMenuPrefix" $menuPrefix "menuSection" $menuSection "pagePaths" $pagePaths) -}} + {{- end -}} + {{- else -}} + {{- partial "graph-menu.html" (dict "cursiveMenuPrefix" "" "menuSection" $section "pagePaths" (index $menuPagePaths $section)) -}} + {{- end -}} +{{- end -}} diff --git a/layouts/partials/page-header.html b/layouts/partials/page-header.html new file mode 100644 index 0000000..9cb81df --- /dev/null +++ b/layouts/partials/page-header.html @@ -0,0 +1,7 @@ +{{- $home := site.GetPage site.Params.Sandpoints.home -}} +
+ {{ $home.Title }} + + + +
diff --git a/layouts/partials/single-page-graph.html b/layouts/partials/single-page-graph.html index 2bb604b..e661d42 100644 --- a/layouts/partials/single-page-graph.html +++ b/layouts/partials/single-page-graph.html @@ -1,7 +1,5 @@ {{- $currentPage := . -}} - -{{ $currentEntry := dict }} - +{{- $currentEntry := dict -}} {{- $menuPrefix := "" -}} {{- $section := "" -}} {{- range $sectionMaybe, $pagesMaybe := $currentPage.Params -}} @@ -10,7 +8,7 @@ {{- if gt (len $sectionsSlice) 0 -}} {{- $pluralSection := index (last 1 $sectionsSlice) 0 -}} {{- $section = partial "GetSingularSectionName.html" $pluralSection -}} - {{- where site.Pages "Section" $section -}} + {{- with (where site.Pages "Section" $section) -}} {{- $menuPrefix = "no-prefix" -}} {{- if gt (len $sectionsSlice) 1 -}} {{- $menuPrefix = delimit (first (sub (len $sectionsSlice) 1) $sectionsSlice) " " -}} @@ -29,6 +27,7 @@ {{- end -}} {{- end -}} {{- end -}} + {{- end -}} {{- end -}} {{- end -}} {{- end -}} diff --git a/static/css/newsite.css b/static/css/newsite.css index fecc17f..a3b42c6 100644 --- a/static/css/newsite.css +++ b/static/css/newsite.css @@ -81,22 +81,217 @@ th:not([align]) { text-align: left; } -@font-face { - font-family: "Gentium Plus"; - font-style: normal; - src: - url("../fonts/GentiumPlus-R.woff"), - url("../fonts/GentiumPlus-R.woff") format("woff"); -} +/* vollkorn-sc-regular - latin-ext_latin */ @font-face { - font-family: "Gentium Plus"; - font-style: italic; + font-family: "Vollkorn SC"; + font-style: normal; + font-weight: 400; + src: url("../fonts/vollkorn-sc-v4-latin-ext_latin-regular.eot"); + /* IE9 Compat Modes */ src: - url("../fonts/GentiumPlus-I.woff"), - url("../fonts/GentiumPlus-I.woff") format("woff"); + local(""), + url("../fonts/vollkorn-sc-v4-latin-ext_latin-regular.eot?#iefix") + format("embedded-opentype"), + /* IE6-IE8 */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-regular.woff2") + format("woff2"), + /* Super Modern Browsers */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-regular.woff") + format("woff"), + /* Modern Browsers */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-regular.ttf") + format("truetype"), + /* Safari, Android, iOS */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-regular.svg#VollkornSC") + format("svg"); + /* Legacy iOS */ } +/* vollkorn-sc-600 - latin-ext_latin */ + +@font-face { + font-family: "Vollkorn SC"; + font-style: normal; + font-weight: 600; + src: url("../fonts/vollkorn-sc-v4-latin-ext_latin-600.eot"); + /* IE9 Compat Modes */ + src: + local(""), + url("../fonts/vollkorn-sc-v4-latin-ext_latin-600.eot?#iefix") + format("embedded-opentype"), + /* IE6-IE8 */ url("../fonts/vollkorn-sc-v4-latin-ext_latin-600.woff2") + format("woff2"), + /* Super Modern Browsers */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-600.woff") + format("woff"), + /* Modern Browsers */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-600.ttf") + format("truetype"), + /* Safari, Android, iOS */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-600.svg#VollkornSC") + format("svg"); + /* Legacy iOS */ +} + +/* vollkorn-sc-700 - latin-ext_latin */ + +@font-face { + font-family: "Vollkorn SC"; + font-style: normal; + font-weight: 700; + src: url("../fonts/vollkorn-sc-v4-latin-ext_latin-700.eot"); + /* IE9 Compat Modes */ + src: + local(""), + url("../fonts/vollkorn-sc-v4-latin-ext_latin-700.eot?#iefix") + format("embedded-opentype"), + /* IE6-IE8 */ url("../fonts/vollkorn-sc-v4-latin-ext_latin-700.woff2") + format("woff2"), + /* Super Modern Browsers */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-700.woff") + format("woff"), + /* Modern Browsers */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-700.ttf") + format("truetype"), + /* Safari, Android, iOS */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-700.svg#VollkornSC") + format("svg"); + /* Legacy iOS */ +} + +/* vollkorn-sc-900 - latin-ext_latin */ + +@font-face { + font-family: "Vollkorn SC"; + font-style: normal; + font-weight: 900; + src: url("../fonts/vollkorn-sc-v4-latin-ext_latin-900.eot"); + /* IE9 Compat Modes */ + src: + local(""), + url("../fonts/vollkorn-sc-v4-latin-ext_latin-900.eot?#iefix") + format("embedded-opentype"), + /* IE6-IE8 */ url("../fonts/vollkorn-sc-v4-latin-ext_latin-900.woff2") + format("woff2"), + /* Super Modern Browsers */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-900.woff") + format("woff"), + /* Modern Browsers */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-900.ttf") + format("truetype"), + /* Safari, Android, iOS */ + url("../fonts/vollkorn-sc-v4-latin-ext_latin-900.svg#VollkornSC") + format("svg"); + /* Legacy iOS */ +} + +/* vollkorn-500italic - latin-ext_latin */ + +@font-face { + font-family: "Vollkorn"; + font-style: italic; + font-weight: 500; + src: url("../fonts/vollkorn-v12-latin-ext_latin-500italic.eot"); + /* IE9 Compat Modes */ + src: + local(""), + url("../fonts/vollkorn-v12-latin-ext_latin-500italic.eot?#iefix") + format("embedded-opentype"), + /* IE6-IE8 */ + url("../fonts/vollkorn-v12-latin-ext_latin-500italic.woff2") + format("woff2"), + /* Super Modern Browsers */ + url("../fonts/vollkorn-v12-latin-ext_latin-500italic.woff") + format("woff"), + /* Modern Browsers */ + url("../fonts/vollkorn-v12-latin-ext_latin-500italic.ttf") + format("truetype"), + /* Safari, Android, iOS */ + url("../fonts/vollkorn-v12-latin-ext_latin-500italic.svg#Vollkorn") + format("svg"); + /* Legacy iOS */ +} + +/* vollkorn-regular - latin-ext_latin */ + +@font-face { + font-family: "Vollkorn"; + font-style: normal; + font-weight: 400; + src: url("../fonts/vollkorn-v12-latin-ext_latin-regular.eot"); + /* IE9 Compat Modes */ + src: + local(""), + url("../fonts/vollkorn-v12-latin-ext_latin-regular.eot?#iefix") + format("embedded-opentype"), + /* IE6-IE8 */ url("../fonts/vollkorn-v12-latin-ext_latin-regular.woff2") + format("woff2"), + /* Super Modern Browsers */ + url("../fonts/vollkorn-v12-latin-ext_latin-regular.woff") + format("woff"), + /* Modern Browsers */ + url("../fonts/vollkorn-v12-latin-ext_latin-regular.ttf") + format("truetype"), + /* Safari, Android, iOS */ + url("../fonts/vollkorn-v12-latin-ext_latin-regular.svg#Vollkorn") + format("svg"); + /* Legacy iOS */ +} + +/* vollkorn-500 - latin-ext_latin */ + +@font-face { + font-family: "Vollkorn"; + font-style: normal; + font-weight: 500; + src: url("../fonts/vollkorn-v12-latin-ext_latin-500.eot"); + /* IE9 Compat Modes */ + src: + local(""), + url("../fonts/vollkorn-v12-latin-ext_latin-500.eot?#iefix") + format("embedded-opentype"), + /* IE6-IE8 */ url("../fonts/vollkorn-v12-latin-ext_latin-500.woff2") + format("woff2"), + /* Super Modern Browsers */ + url("../fonts/vollkorn-v12-latin-ext_latin-500.woff") format("woff"), + /* Modern Browsers */ + url("../fonts/vollkorn-v12-latin-ext_latin-500.ttf") + format("truetype"), + /* Safari, Android, iOS */ + url("../fonts/vollkorn-v12-latin-ext_latin-500.svg#Vollkorn") + format("svg"); + /* Legacy iOS */ +} + +/* vollkorn-italic - latin-ext_latin */ + +@font-face { + font-family: "Vollkorn"; + font-style: italic; + font-weight: 400; + src: url("../fonts/vollkorn-v12-latin-ext_latin-italic.eot"); + /* IE9 Compat Modes */ + src: + local(""), + url("../fonts/vollkorn-v12-latin-ext_latin-italic.eot?#iefix") + format("embedded-opentype"), + /* IE6-IE8 */ url("../fonts/vollkorn-v12-latin-ext_latin-italic.woff2") + format("woff2"), + /* Super Modern Browsers */ + url("../fonts/vollkorn-v12-latin-ext_latin-italic.woff") + format("woff"), + /* Modern Browsers */ + url("../fonts/vollkorn-v12-latin-ext_latin-italic.ttf") + format("truetype"), + /* Safari, Android, iOS */ + url("../fonts/vollkorn-v12-latin-ext_latin-italic.svg#Vollkorn") + format("svg"); + /* Legacy iOS */ +} + +/* great-vibes-regular - latin-ext_latin */ + @font-face { font-family: "Great Vibes"; font-style: normal; @@ -123,36 +318,14 @@ th:not([align]) { /* Legacy iOS */ } -@font-face { - font-family: "Antinoou"; - font-style: normal; - src: - url("../fonts/Antinoou.ttf"), - url("../fonts/Antinoou.ttf") format("truetype"); - unicode-range: - U+2C80 –U + 2CFF, - U+0370 –U + 03FF, - U+102E0 –U + 102FF; -} - -@font-face { - font-family: "Antinoou"; - font-style: italic; - src: - url("../fonts/AntinoouItalic.ttf"), - url("../fonts/AntinoouItalic.ttf") format("truetype"); - unicode-range: - U+2C80 –U + 2CFF, - U+0370 –U + 03FF, - U+102E0 –U + 102FF; -} - html { line-height: 1.5; } body { - font-family: "Gentium Plus", "Antinoou", serif; + position: relative; + min-height: 100vh; + font-family: "Vollkorn", serif; max-width: 1024px; font-size: 1.4rem; padding-left: 3rem; @@ -161,41 +334,40 @@ body { color: black; } -header { - display: grid; - grid-template-columns: auto; - grid-auto-flow: column; +a { + color: #000; + text-decoration: none; +} + +a:hover { + text-decoration: underline; + text-decoration-color: red; + font-weight: 500; + font-size: 0.95em; + cursor: pointer; +} + +.header { position: sticky; top: 0; + z-index: 10; + + display: flex; + justify-content: space-between; + align-items: flex-start; + padding-left: 3rem; + padding-right: 10rem; + width: 100%; + max-width: 720px; + padding-top: 0.5rem; font-size: 1.1rem; background-color: white; - z-index: 10; -} - -.breadcrumbs { - grid-column: 1; - list-style: none; - padding: 0; - margin: 0; - display: flex; - flex-wrap: wrap; -} - -.breadcrumbs li { - display: inline; -} - -.breadcrumbs li + li::before { - content: "»"; - margin: 0 0.1em; - color: #666; } .bibliotheke { + display: block; width: 2.4rem; - grid-column: 2; - margin-left: auto; } .bibliotheke:hover { @@ -204,14 +376,39 @@ header { } .content { + display: grid; + grid-template-rows: auto auto 1fr; + grid-template-areas: "title" "menu" "article"; margin-top: 4rem; padding-left: 3rem; padding-right: 10rem; max-width: 720px; } +.title { + grid-area: title; + margin-top: 4rem; + font-style: italic; + font-size: 2rem; + margin-bottom: 4rem; +} + +.supt { + display: inline-flex; + flex-wrap: nowrap; + font-family: + great vibes, + cursive; + font-size: 0.9em; + font-style: normal; + color: rgba(0, 0, 0, 0.8); + vertical-align: baseline; + position: relative; + top: -0.3em; +} + .page-menu { - padding-left: 3rem; + grid-area: menu; margin-bottom: 2rem; display: grid; grid-template-columns: 1fr 1fr; @@ -219,7 +416,8 @@ header { .toc { grid-column: 1; - padding-right: 1.2rem; + padding-top: 0.3rem; + padding-right: 2rem; position: relative; } @@ -230,14 +428,98 @@ header { #TableOfContents li { list-style: decimal inside; - padding-left: 0.5rem; color: rgba(0, 0, 0, 0.4); margin: 0; padding: 0; } #TableOfContents li a { - font-family: "Gentium Plus"; - font-size: 1.4rem; - font-weight: bold; + font-family: "Vollkorn"; + font-size: 1.2rem; +} + +nav#TableOfContents ol li a:hover { + text-decoration: underline; + text-decoration-color: red; + font-size: 0.84em; +} + +.graph-menus { + grid-column: 2; +} + +.graph-menu { + display: inline-grid; + grid-auto-rows: max-content; + font-size: 1.4rem; + font-style: italic; + margin-bottom: 0.8rem; +} + +.graph-inline-cursive { + grid-column: 1; + font-family: "Great Vibes", cursive; + font-size: 0.9em; + font-style: normal; + color: red; + vertical-align: baseline; + position: relative; + /* top: -0.3em; */ +} + +.graph-inline-link { + grid-column: 2; +} + +.article { + grid-area: article; +} + +.logolink { + width: 2.4rem; + margin-left: auto; +} + +.sandpointlogo { + border-radius: 50%; + border: 0.3em solid red; + display: inline-flex; + font-family: "Great Vibes", cursive; + font-size: 1.2rem; + font-weight: bold; + color: white; + background-color: red; + position: relative; + padding-left: 1em; + padding-right: 0.3em; + padding-bottom: 1.2em; + max-width: 0em; + max-height: 0em; +} + +.sandpointF { + position: absolute; + font-size: 1.2em; + margin-top: -0.2em; + margin-left: -0.4em; +} + +.sandpointN { + position: absolute; + font-size: 0.7em; + margin-top: 0.4em; + color: red; + margin-left: -0.5em; +} + +.sandpointC { + position: absolute; + font-size: 1em; + margin-left: -0.37em; +} + +footer { + display: flex; + margin-bottom: 1rem; + margin-top: 4rem; }