title and links different + author and annex added

This commit is contained in:
Marcell Mars 2020-12-09 03:31:44 +01:00
parent 23264c655c
commit 1245ee60d8
10 changed files with 107 additions and 51 deletions

View file

@ -356,6 +356,18 @@ img {
width: 100%; width: 100%;
} }
.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;
}
.sup { .sup {
display: inline-flex; display: inline-flex;
flex-wrap: nowrap; flex-wrap: nowrap;

View file

@ -103,7 +103,8 @@ a.edit-button:hover {
text-decoration: underline; text-decoration: underline;
-webkit-text-decoration-color: red; -webkit-text-decoration-color: red;
text-decoration-color: red; text-decoration-color: red;
font-weight: 700; font-weight: bold;
font-size: 0.95em;
cursor: pointer cursor: pointer
} }
@ -236,6 +237,18 @@ img {
width: 100%; width: 100%;
} }
.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;
}
.sup { .sup {
display: inline-flex; display: inline-flex;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -344,8 +357,8 @@ a {
a:hover { a:hover {
text-decoration: underline; text-decoration: underline;
text-decoration-color: red; text-decoration-color: red;
font-weight: 700; font-weight: bold;
font-size: 0.97em; font-size: 0.95em;
cursor: pointer; cursor: pointer;
} }
@ -354,27 +367,27 @@ h1 {
} }
h2 { h2 {
font-weight: 700; font-weight: bold;
font-size: 1.6rem; font-size: 1.6rem;
} }
h3 { h3 {
font-weight: 700; font-weight: bold;
font-size: 1.4rem; font-size: 1.4rem;
} }
h4 { h4 {
font-weight: 700; font-weight: bold;
font-size: 1.2rem; font-size: 1.2rem;
} }
h5 { h5 {
font-weight: 700; font-weight: bold;
font-size: 1.1rem; font-size: 1.1rem;
} }
h6 { h6 {
font-weight: 700; font-weight: bold;
font-size: 1rem; font-size: 1rem;
} }

File diff suppressed because one or more lines are too long

View file

@ -9,5 +9,7 @@
"experiment": "experiments", "experiment": "experiments",
"session": "sessions", "session": "sessions",
"chapter": "chapters", "chapter": "chapters",
"article": "articles" "article": "articles",
"annex": "annexes",
"author": "authors"
} }

View file

@ -52,7 +52,7 @@
</div> </div>
</div> </div>
{{ else }} {{ else }}
<a href="{{ with (index $scratch.is_in 0) }}{{ .RelPermalink }}{{ end }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}"><span class="sup">{{ with (index $scratch.is_in 0) }}{{ substr .Title 0 1 }}</span><i>{{ substr .Title 1 }}</i></a>{{ end }} <a href="{{ with (index $scratch.is_in 0) }}{{ .RelPermalink }}{{ end }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}"><span class="supt">{{ with (index $scratch.is_in 0) }}{{ substr .Title 0 1 }}</span><i>{{ substr .Title 1 }}</i></a>{{ end }}
{{ end }} {{ end }}
<span class="mantlebar"><i> » <a href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ .Title }}</a></i></span> <span class="mantlebar"><i> » <a href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ .Title }}</a></i></span>
{{ end }} {{ end }}
@ -72,7 +72,7 @@
</div> </div>
{{ else }} {{ else }}
{{ $home := index $is_in_is_in 0 }} {{ $home := index $is_in_is_in 0 }}
<a href="{{ $home.RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}"><span class="sup">{{ substr $home.Title 0 1 }}</span><i>{{ substr $home.Title 1 }}</i></a> <a href="{{ $home.RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}"><span class="supt">{{ substr $home.Title 0 1 }}</span><i>{{ substr $home.Title 1 }}</i></a>
{{ end }} {{ end }}
{{ with gt (len $scratch.is_in) 1 }} {{ with gt (len $scratch.is_in) 1 }}

View file

@ -8,41 +8,55 @@
{{ $currentFile := (printf "/%s" .File) }} {{ $currentFile := (printf "/%s" .File) }}
{{ $scratch := $s.Get $currentFile }} {{ $scratch := $s.Get $currentFile }}
<div class="{{ $scratch.depth }}title"><span class="sup">{{ substr $currentDir 0 -1 }}{{ substr .Title 0 1 }}</span>{{ substr .Title 1 }}</div></div> <div class="{{ $scratch.depth | default "crust" }}title"><span class="supt">{{ substr $currentDir 0 -1 }}:&thinsp;{{ substr .Title 0 1 }}</span>{{ substr .Title 1 }}</div></div>
<div class="grid"> <div class="grid">
<div class="leftcolumn"> <div class="leftcolumn">
{{ if ne (trim .Page.TableOfContents "\n") "<nav id=\"TableOfContents\"></nav>" }} {{ if ne (trim .Page.TableOfContents "\n") "<nav id=\"TableOfContents\"></nav>" }}
{{ .Page.TableOfContents }} {{ .Page.TableOfContents }}
{{ end }}
</div>
<div class="rightcolumn">
{{ if in .Page.Site.Params.mentionedIn (substr $currentDir 0 -1) }}
<div class="has">
{{ with $scratch.backlinks }}
<span class="sup">mentioned in</span>
{{ end }} {{ end }}
</div> </div>
<div class="rightcolumn"> <div class="afterhas">
{{ if and (not (eq $scratch.depth "crust")) $scratch.has_children }} {{ range $scratch.backlinks }}
<div class="has"> <div class="{{ $scratch.child_depth }}">
{{ with $scratch.has }} <a href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ .Title }}</a>
<span class="sup">has {{ $scratch.has }}</span> </div>
{{ end }}
</div>
<div class="afterhas">
{{ range $scratch.has_children }}
<div class="{{ $scratch.child_depth }}">
<a href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ .Title }}</a>
</div>
{{ end }}
{{ end }} {{ end }}
{{ end }}
{{ if eq $scratch.depth "crust" }} {{ if and (not (eq $scratch.depth "crust")) $scratch.has_children }}
<div class="has"> <div class="has">
<span class="sup">in {{ index $scratch.in 1 }}</span> {{ with $scratch.has }}
</div> <span class="sup">has {{ $scratch.has }}</span>
<div class="afterhas">
{{ range $scratch.is_in }}
<div class="{{ substr $currentDir 0 -1 }}">
<a href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ .Title }}</a>
</div>
{{ end }}
{{ end }} {{ end }}
</div> </div>
</div> <div class="afterhas">
{{ range $scratch.has_children }}
<div class="{{ $scratch.child_depth }}">
<a href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ .Title }}</a>
</div>
{{ end }}
{{ end }}
{{ if eq $scratch.depth "crust" }}
<div class="has">
<span class="sup">in {{ index $scratch.in 1 }}</span>
</div>
<div class="afterhas">
{{ range $scratch.is_in }}
<div class="{{ substr $currentDir 0 -1 }}">
<a href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ .Title }}</a>
</div>
{{ end }}
{{ end }}
</div>
</div>
</div> </div>

View file

@ -33,6 +33,7 @@
{{ $http_links := (slice) }} {{ $http_links := (slice) }}
{{ $library_links := (slice) }} {{ $library_links := (slice) }}
{{ $anchor_links := (slice) }}
{{ $other_links := (slice) }} {{ $other_links := (slice) }}
{{ with ($p.Scratch.Get "urls") }} {{ with ($p.Scratch.Get "urls") }}
@ -79,12 +80,22 @@
{{ end }} {{ end }}
{{ with $other_links }} {{ with $other_links }}
{{ $formattingN := 0 }}
{{ $anchorN := 0 }}
{{ range $i, $_ := $other_links }} {{ range $i, $_ := $other_links }}
{{ if eq $i 0 }} {{ if eq $i 0 }}
<details><summary>Other links ({{ len $other_links }}):</summary><ul> <details><summary>Anchor, formatting and other links ({{ len $other_links }}):</summary><ul>
{{ end }}
{{ if strings.HasPrefix $_ "#" }}
{{ $anchorN = add $anchorN 1 }}
{{ else if strings.HasPrefix $_ "{"}}
{{ $formattingN = add $formattingN 1 }}
{{ else }}
<li><span class="sup">other</span><a href="{{ $_ }}" target="_blank">{{ $_ }}</a></li>
{{ end }} {{ end }}
<li><span class="sup">other</span><a href="{{ $_ }}" target="_blank">{{ $_ }}</a></li>
{{ end }} {{ end }}
{{ with $formattingN }}<li>{{ $formattingN }} formatting links.</a></li>{{ end }}
{{ with $anchorN }}<li>{{ $anchorN }} anchor links.</a></li>{{ end }}
</ul></details> </ul></details>
{{ end }} {{ end }}

File diff suppressed because one or more lines are too long

View file

@ -1 +1 @@
# git.sandpoints.org/Drawwell/SandpointsTheme v0.0.0-20201208130837-37b055b5fbf3 # git.sandpoints.org/Drawwell/SandpointsTheme v0.0.0-20201209022150-1c0c9e5e7fcd

View file

@ -8,9 +8,9 @@
description = "Some description should land here...." description = "Some description should land here...."
images = ["/UNS-logo.png"] images = ["/UNS-logo.png"]
title = "Dotawo Journal" title = "Dotawo Journal"
giturl = "https://git.sandpoints.org/UnionForNubianStudies/Dotawo" sandpointsGiteaUrl = "https://git.sandpoints.org/UnionForNubianStudies/Dotawo"
home = "journal" sandpointsCatalogPrefix = "/library/"
catalogprefix = "/library/" sandpointsMentionedIn = ["annex", "author"]
[outputFormats] [outputFormats]
[outputFormats.js] [outputFormats.js]
@ -53,9 +53,14 @@
[[module.imports.mounts]] [[module.imports.mounts]]
source = "static" source = "static"
target = "static" target = "static"
[[module.imports.mounts]]
source = "customizations/Dotawo/static/fonts"
target = "static/fonts"
[[module.imports.mounts]] [[module.imports.mounts]]
source = "customizations/Dotawo/assets/css/site.css" source = "customizations/Dotawo/assets/css/site.css"
target = "assets/css/site.css" target = "assets/css/site.css"
[[module.imports.mounts]] [[module.imports.mounts]]
source = "customizations/Dotawo/static/fonts" source = "customizations/Dotawo/static/css/site.min.css"
target = "static/fonts" target = "static/css/site.min.css"