Merge remote-tracking branch 'upstream/main'

This commit is contained in:
CDN18 2024-04-07 10:28:49 +08:00
commit cf323291b7
Signed by: CDN
GPG key ID: 0C656827F9F80080
16 changed files with 172 additions and 31 deletions

View file

@ -0,0 +1,16 @@
{{ define "main" }}
<main class="container mx-auto">
{{- $title := .Site.Params.search.title | default .Title }}
{{- $placeholder := .Site.Params.search.placeholder | default .Title }}
<h1 class="text-4xl font-extrabold mt-6">{{ $title }}</h1>
<p class="text-sm mb-6">Powered by <a href="https://fusejs.io" target="_blank">fuse.js</a>.</p>
<div class="search">
<input class="mb-4"
autofocus autocomplete="off" id="search-input" type="search" placeholder="{{ printf `%s ↵` $placeholder }}">
{{ if not .Site.Params.search.enable }}
<p>No search plugin is enabled.</p>
{{ end }}
<ul id="search-result"></ul>
</div>
</main>
{{ end }}

View file

@ -11,8 +11,10 @@
<div>
{{ $paginator := .Paginate (where .Site.RegularPages "Kind" "page") }}
{{ range $paginator.Pages }}
{{ if ne .Page.Layout "search" }}
{{ partial "item.html" . }}
{{ end }}
{{ end }}
{{ partial "paginator.html" . }}
</div>
{{ if .Site.Params.friends.feeds }}

7
layouts/index.json Normal file
View file

@ -0,0 +1,7 @@
{{- $.Scratch.Add "index" slice -}}
{{- range site.RegularPages -}}
{{- if ne .Layout "search" -}}
{{- $.Scratch.Add "index" (dict "title" .Title "permalink" .Permalink "summary" .Summary "content" .Plain) -}}
{{- end -}}
{{- end -}}
{{- $.Scratch.Get "index" | jsonify -}}

View file

@ -1,9 +1,11 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{{ if hugo.IsProduction }}
{{ template "_internal/opengraph.html" . }}
{{ template "_internal/twitter_cards.html" . }}
{{ template "_internal/google_analytics.html" . }}
{{ end }}
<meta name="theme-color" media="(prefers-color-scheme: light)" content="#ffffff">
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="#262d33">
<title>
@ -13,14 +15,25 @@
{{ .Site.Title }} - {{ .Title }}
{{ end }}
</title>
<!-- favicon -->
{{ $favicon := "favicon.ico" }}
<link rel="shortcut icon" href="{{ $favicon | relURL }}" type="image/x-icon" />
<!-- styles -->
{{ $options := (dict "targetPath" "minima.css" "outputStyle" "compressed" "enableSourceMap" true) }}
{{ $style := resources.Get "css/main.scss" | resources.ExecuteAsTemplate "main.scss" . | resources.ToCSS $options }}
<link rel="stylesheet" href="{{ $style.RelPermalink }}">
{{ $options = (dict "targetPath" "minima.js" "minify" true) }}
{{ $js := resources.Get "js/main.js" | js.Build $options | resources.ExecuteAsTemplate "minima.js" . }}
<script defer type="text/javascript" src="{{ $js.RelPermalink }}"></script>
{{ $style := resources.Get "css/main.scss" | resources.ExecuteAsTemplate "main.scss" . | resources.ToCSS $options | fingerprint }}
<link rel="stylesheet" href="{{ $style.RelPermalink }}" integrity="{{ $style.Data.Integrity }}">
<!-- scripts -->
{{ $options = (dict "targetPath" "minima.js" "minify" true "params" site.Params) }}
{{ $script := resources.Get "js/main.js" | js.Build $options | fingerprint }}
<script defer type="text/javascript" src="{{ $script.RelPermalink }}" integrity="{{ $script.Data.Integrity }}"></script>
{{ if and .Site.Params.search.enable (eq .Layout "search") }}
{{ $options = (dict "minify" true "params" site.Params) }}
{{ $search := resources.Get "js/search.js" | js.Build $options}}
{{ $fusejs := resources.Get "js/min/fuse.basic.min.js" }}
{{ $script := (slice $fusejs $search) | resources.Concat "assets/js/search.js" | fingerprint }}
<script defer crossorigin="anonymous" src="{{ $script.RelPermalink }}" integrity="{{ $script.Data.Integrity }}"></script>
{{ end }}
<!-- i18n -->
{{ if .IsTranslated }}
{{ range .Translations }}
<link rel="alternate" hreflang="{{ .Language.Lang }}" href="{{ .Permalink }}" title="{{ .Language.LanguageName }}">