merging branches

This commit is contained in:
rra
2022-06-15 07:56:51 +02:00
4 changed files with 867 additions and 44 deletions

View File

@ -16,7 +16,6 @@
<link rel="stylesheet" href="{{ .Site.BaseURL }}css/main.css">
<link rel="stylesheet" href="{{ .Site.BaseURL }}css/video-box.css">
<link media="print" rel="stylesheet" href="{{ .Site.BaseURL }}css/print.css">
<link rel="canonical" href="{{ .Permalink }}">
{{ with .Site.Params.favicon }}

View File

@ -20,6 +20,13 @@
<ul>
<li><a href="/">home</a></li>
<li><a href="/timeline/">harvest</a></li>
{{/* <li><a href="/about/">about</a></li> */}}
<li class="has-submenu">about
<ul class="submenu">
<li><a href="/about/">about us</a></li>
<li><a href="/contributors/">contributors</a></li>
</ul>
</li>
<li><a href="/calendar/">calendar</a></li>
<li><a href="/tv/">tv</a></li>
<li><a href="/social/">social</a></li>
@ -39,6 +46,12 @@
<ul>
<li><a href="/">home</a></li>
<li><a href="/timeline/">harvest</a></li>
<li class="has-submenu">about
<ul class="submenu">
<li><a href="/about/">about us</a></li>
<li><a href="/contributors/">contributors</a></li>
</ul>
</li>
<li><a href="/calendar/">calendar</a></li>
<li><a href="/tv/">tv</a></li>
<li><a href="/social/">social</a></li>