From f59b40a8e0ee3f4c808ab7b269667ab31c43c34e Mon Sep 17 00:00:00 2001
From: weru <fromweru@gmail.com>
Date: Sun, 09 Jul 2023 16:07:43 +0000
Subject: [PATCH] Merge branch 'master' into #114
---
layouts/_default/baseof.html | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 395c139..03e111b 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -24,22 +24,42 @@
{{ if .IsHome }}
{{ $uniqueHomepage = true }}
{{ end }}
+ <head>
+ {{- partial "head" . }}
+ </head>
+ <body class="page-{{ .Kind }}" id="pagetop">
+ <header class="nav_header">
+ {{- partial "nav" . }}
+ </header>
+ {{ if or (eq .Section site.Params.blogDir) (eq .Type "search" ) }}
+ {{- block "main" . }}{{ end }}
{{ else }}
- {{ $uniqueHomepage = false }}
+ <div class="main wrap pt-4">
+ {{ $docSections := site.Params.docSections }}
+ {{- with $docSections }}{{- else }}
+ {{- $docSections = "docs" }}
+ {{- end }}
+ {{ $uniqueHomepage := .IsHome }}
+ {{ if site.Params.uniqueHomepage }}
+ {{ if .IsHome }}
+ {{ $uniqueHomepage = true }}
+ {{ end }}
+ {{ else }}
+ {{ $uniqueHomepage = false }}
+ {{ end }}
+ {{- if and (in $docSections .Section) (ne $uniqueHomepage true) }}
+ {{- partial "document" . }}
+ {{- else }}
+ <div class="content">
+ {{- block "main" . }}{{ end }}
+ </div>
+ {{- end -}}
+ </div>
{{ end }}
- {{- if and (in $docSections .Section) (ne $uniqueHomepage true) }}
- {{- partial "document" . }}
- {{- else }}
- <div class="content">
- {{- block "main" . }}{{ end }}
- </div>
- {{- end -}}
- </div>
- {{ end }}
- {{- partial "scripts/translations" . -}}
- {{- partialCached "footer" . -}}
- {{- partialCached "sprites" . -}}
- {{- partial "scripts/bundle" . -}}
- {{- partial "scripts/other" . -}}
-</body>
+ {{- partial "scripts/translations" . -}}
+ {{- partialCached "footer" . -}}
+ {{- partialCached "sprites" . -}}
+ {{- partial "scripts/bundle" . -}}
+ {{- partial "scripts/mermaid" . -}}
+ </body>
</html>
--
Gitblit v1.10.0