simplified main menu, (maybe?) fixed preloading of css

This commit is contained in:
Vrifox 2021-03-02 11:02:13 +01:00
parent 836892e08e
commit 8c242b4aa5
Signed by: vrifox
GPG key ID: D40098E5B60B2197
8 changed files with 39 additions and 173 deletions

View file

@ -1,7 +1,7 @@
{{- define "stylesheet" -}}
{{- $scss := resources.Get "/_default/list.scss" -}}
{{- $style := $scss | resources.ToCSS -}}
<link rel="stylesheet" href="{{ $style.Permalink }}" type="text/css" media="screen" rel="preload" />
<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
{{- end -}}
{{- define "main" }}

View file

@ -1,7 +1,7 @@
{{- define "stylesheet" -}}
{{- $scss := resources.Get "/_default/single.scss" -}}
{{- $style := $scss | resources.ToCSS -}}
<link rel="stylesheet" href="{{ $style.Permalink }}" type="text/css" media="screen" rel="preload" />
<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
{{- end -}}
{{- define "main" -}}

View file

@ -1,5 +1,5 @@
{{ define "stylesheet" }}{{ $sass := resources.Get "/errorpages.scss" }}{{ $style := $sass | resources.ToCSS }}
<link rel="stylesheet" href="{{ $style.Permalink }}" type="text/css" media="screen" rel="preload" />
<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
{{ end }}
{{ define "main" }}

View file

@ -1,5 +1,5 @@
{{ define "stylesheet" }}{{ $sass := resources.Get "/errorpages.scss" }}{{ $style := $sass | resources.ToCSS }}
<link rel="stylesheet" href="{{ $style.Permalink }}" type="text/css" media="screen" rel="preload" />
<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
{{ end }}
{{ define "main" }}

View file

@ -1,7 +1,7 @@
{{- define "stylesheet" -}}
{{- $scss := resources.Get "/index.scss" -}}
{{- $style := $scss | resources.ToCSS -}}
<link rel="stylesheet" href="{{ $style.Permalink }}" type="text/css" media="screen" />
<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
{{- end -}}
{{- define "main" -}}

View file

@ -1,46 +1,11 @@
{{ $currentPage := . }}
<nav>
<div class="container">
<section class="website-name">
{{- range .Site.Menus.name }}
{{- if $currentPage.IsMenuCurrent "name" . }}
<a href="{{ .URL }}" class="active">{{ .Name }}</a>
{{- else }}
<a href="{{ .URL }}">{{ .Name }}</a>
{{- end }}
{{- end }}
</section>
<span class="seperator">/</span>
<section class="website-mainmenu">
<ul>
{{- range .Site.Menus.main -}}
{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) -}}
<li class="active">
<a href="{{ .URL }}">
<span>{{ .Name }}</span>
</a>
</li>
{{- else }}
<li>
<a href="{{ .URL }}">
<span>{{ .Name }}</span>
</a>
</li>
{{- end }}
{{- end }}
</ul>
</section>
<section class="website-externallinks">
<ul>
{{- range .Site.Menus.externallinks }}
<li>
<a title="{{ .URL }}" href="{{ .URL }}">
{{- .Pre }}
<span>{{ .Name }}</span>
</a>
</li>
{{- end }}
</ul>
</section>
</div>
</nav>
{{- $currentPage := . -}}
<header class="main">
{{- range .Site.Menus.name }}
<h1><a href="{{ .URL }}">{{ .Name }}</a></h1>
{{- end }}
<nav>
{{- range .Site.Menus.main }}
<a href="{{ .URL }}">{{ .Name }}</a>
{{- end }}
</nav>
</header>