links and titles are different visually

This commit is contained in:
Marcell Mars 2020-12-09 03:13:51 +01:00
parent 3a9930d2dd
commit ac4f55f1fe
6 changed files with 75 additions and 36 deletions

View file

@ -356,6 +356,18 @@ img {
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 {
display: inline-flex;
flex-wrap: nowrap;

View file

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

View file

@ -52,7 +52,7 @@
</div>
</div>
{{ 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 }}
<span class="mantlebar"><i> » <a href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ .Title }}</a></i></span>
{{ end }}
@ -72,7 +72,7 @@
</div>
{{ else }}
{{ $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 }}
{{ with gt (len $scratch.is_in) 1 }}

View file

@ -8,41 +8,55 @@
{{ $currentFile := (printf "/%s" .File) }}
{{ $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="leftcolumn">
{{ if ne (trim .Page.TableOfContents "\n") "<nav id=\"TableOfContents\"></nav>" }}
{{ .Page.TableOfContents }}
<div class="leftcolumn">
{{ if ne (trim .Page.TableOfContents "\n") "<nav id=\"TableOfContents\"></nav>" }}
{{ .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 }}
</div>
<div class="rightcolumn">
{{ if and (not (eq $scratch.depth "crust")) $scratch.has_children }}
<div class="has">
{{ with $scratch.has }}
<span class="sup">has {{ $scratch.has }}</span>
{{ 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 }}
</div>
<div class="afterhas">
{{ range $scratch.backlinks }}
<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 }}
{{ if and (not (eq $scratch.depth "crust")) $scratch.has_children }}
<div class="has">
{{ with $scratch.has }}
<span class="sup">has {{ $scratch.has }}</span>
{{ 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>

View file

@ -33,6 +33,7 @@
{{ $http_links := (slice) }}
{{ $library_links := (slice) }}
{{ $anchor_links := (slice) }}
{{ $other_links := (slice) }}
{{ with ($p.Scratch.Get "urls") }}
@ -79,12 +80,22 @@
{{ end }}
{{ with $other_links }}
{{ $formattingN := 0 }}
{{ $anchorN := 0 }}
{{ range $i, $_ := $other_links }}
{{ 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 }}
<li><span class="sup">other</span><a href="{{ $_ }}" target="_blank">{{ $_ }}</a></li>
{{ end }}
{{ with $formattingN }}<li>{{ $formattingN }} formatting links.</a></li>{{ end }}
{{ with $anchorN }}<li>{{ $anchorN }} anchor links.</a></li>{{ end }}
</ul></details>
{{ end }}

File diff suppressed because one or more lines are too long