Swap prettier for djlint
This commit is contained in:
parent
e2fd2a13e8
commit
212ca46616
12 changed files with 150 additions and 178 deletions
|
|
@ -1,11 +1,9 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<a
|
<a href="https://creativecommons.org/publicdomain/zero/1.0/"
|
||||||
href="https://creativecommons.org/publicdomain/zero/1.0/"
|
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
aria-label="CC0: This work has been marked as dedicated to the public domain."
|
aria-label="CC0: This work has been marked as dedicated to the public domain.">
|
||||||
>
|
|
||||||
{{ partial "cc.svg" . }}
|
{{ partial "cc.svg" . }}
|
||||||
{{ partial "zero.svg" . }}
|
{{ partial "zero.svg" . }}
|
||||||
</a>
|
</a>
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,10 @@
|
||||||
<link rel="stylesheet" href="{{ .RelPermalink }}" />
|
<link rel="stylesheet" href="{{ .RelPermalink }}" />
|
||||||
{{- else }}
|
{{- else }}
|
||||||
{{- with . | minify | fingerprint }}
|
{{- with . | minify | fingerprint }}
|
||||||
<link
|
<link rel="stylesheet"
|
||||||
rel="stylesheet"
|
|
||||||
href="{{ .RelPermalink }}"
|
href="{{ .RelPermalink }}"
|
||||||
integrity="{{ .Data.Integrity }}"
|
integrity="{{ .Data.Integrity }}"
|
||||||
crossorigin="anonymous"
|
crossorigin="anonymous" />
|
||||||
/>
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,9 @@
|
||||||
{{- with . | js.Build
|
{{- with . | js.Build
|
||||||
$opts | fingerprint
|
$opts | fingerprint
|
||||||
}}
|
}}
|
||||||
<script
|
<script src="{{ .RelPermalink }}"
|
||||||
src="{{ .RelPermalink }}"
|
|
||||||
integrity="{{- .Data.Integrity }}"
|
integrity="{{- .Data.Integrity }}"
|
||||||
crossorigin="anonymous"
|
crossorigin="anonymous"></script>
|
||||||
></script>
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,2 @@
|
||||||
<a href="/" class="title">
|
<a href="/" class="title">{{ partial "logo.svg" . }}{{ site.Title }}</a>
|
||||||
{{ partial "logo.svg" . }}{{ site.Title }}
|
|
||||||
</a>
|
|
||||||
{{ partial "menu.html" (dict "menuID" "main" "page" .) }}
|
{{ partial "menu.html" (dict "menuID" "main" "page" .) }}
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,6 @@
|
||||||
*/}}
|
*/}}
|
||||||
{{- $page := .page }}
|
{{- $page := .page }}
|
||||||
{{- $menuID := .menuID }}
|
{{- $menuID := .menuID }}
|
||||||
|
|
||||||
{{- with index site.Menus $menuID }}
|
{{- with index site.Menus $menuID }}
|
||||||
<nav>
|
<nav>
|
||||||
<ul>
|
<ul>
|
||||||
|
|
@ -17,7 +16,6 @@
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
{{- define "partials/inline/menu/walk.html" }}
|
{{- define "partials/inline/menu/walk.html" }}
|
||||||
{{- $page := .page }}
|
{{- $page := .page }}
|
||||||
{{- range .menuEntries }}
|
{{- range .menuEntries }}
|
||||||
|
|
@ -34,14 +32,11 @@
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
<li>
|
<li>
|
||||||
<a
|
<a {{- range $k, $v := $attrs }}
|
||||||
{{- range $k, $v := $attrs }}
|
|
||||||
{{- with $v }}
|
{{- with $v }}
|
||||||
{{- printf " %s=%q" $k $v | safeHTMLAttr }}
|
{{- printf " %s=%q" $k $v | safeHTMLAttr }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end -}}
|
{{- end -}}>{{ $name }}</a>
|
||||||
>{{ $name }}</a
|
|
||||||
>
|
|
||||||
{{- with .Children }}
|
{{- with .Children }}
|
||||||
<ul>
|
<ul>
|
||||||
{{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
|
{{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,9 @@
|
||||||
<li>Tags:</li>
|
<li>Tags:</li>
|
||||||
<ul>
|
<ul>
|
||||||
{{- range . }}
|
{{- range . }}
|
||||||
<li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
|
<li>
|
||||||
|
<a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
|
||||||
|
</li>
|
||||||
{{- end }}
|
{{- end }}
|
||||||
</ul>
|
</ul>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,16 @@
|
||||||
<!doctype html>
|
<!DOCTYPE html>
|
||||||
<html
|
<html lang="{{ or site.Language.LanguageCode site.Language.Lang }}"
|
||||||
lang="{{ or site.Language.LanguageCode site.Language.Lang }}"
|
dir="{{ or site.Language.LanguageDirection `ltr` }}">
|
||||||
dir="{{ or site.Language.LanguageDirection `ltr` }}"
|
<head>{{ partial "head.html" . }}</head>
|
||||||
>
|
|
||||||
<head>
|
|
||||||
{{ partial "head.html" . }}
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<header>{{ partial "header.html" . }}</header>
|
<header>
|
||||||
<main>{{ block "main" . }}{{ end }}</main>
|
{{ partial "header.html" . }}
|
||||||
<footer>{{ partial "footer.html" . }}</footer>
|
</header>
|
||||||
|
<main>
|
||||||
|
{{ block "main" . }}{{ end }}
|
||||||
|
</main>
|
||||||
|
<footer>
|
||||||
|
{{ partial "footer.html" . }}
|
||||||
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,7 @@
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ .RelPermalink }}" style="display: block">
|
<a href="{{ .RelPermalink }}" style="display: block">
|
||||||
<h2>{{ .Title }}</h2>
|
<h2>{{ .Title }}</h2>
|
||||||
|
|
||||||
<p class="lead">{{ .Description }}</p>
|
<p class="lead">{{ .Description }}</p>
|
||||||
|
|
||||||
{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
|
{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
|
||||||
{{ $dateHuman := .Date | time.Format ":date_long" }}
|
{{ $dateHuman := .Date | time.Format ":date_long" }}
|
||||||
<time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
|
<time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
|
||||||
|
|
|
||||||
|
|
@ -7,11 +7,11 @@
|
||||||
<div class="dates">
|
<div class="dates">
|
||||||
<p>
|
<p>
|
||||||
Editiert:
|
Editiert:
|
||||||
<time datetime="{{ $lastmodDateMachine }}"
|
<time datetime="{{ $lastmodDateMachine }}">{{ $lastmodDateHuman }}</time>
|
||||||
>{{ $lastmodDateHuman }}</time
|
</p>
|
||||||
>
|
<p>
|
||||||
|
<time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
|
||||||
</p>
|
</p>
|
||||||
<p><time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time></p>
|
|
||||||
</div>
|
</div>
|
||||||
<h1>{{ .Title }}</h1>
|
<h1>{{ .Title }}</h1>
|
||||||
<p class="lead">{{ .Description }}</p>
|
<p class="lead">{{ .Description }}</p>
|
||||||
|
|
|
||||||
18
treefmt.nix
18
treefmt.nix
|
|
@ -1,26 +1,10 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
programs = {
|
programs = {
|
||||||
nixfmt.enable = true;
|
nixfmt.enable = true;
|
||||||
gofmt.enable = true;
|
|
||||||
taplo.enable = true;
|
taplo.enable = true;
|
||||||
prettier = {
|
djlint.enable = true;
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
plugins = [
|
|
||||||
"${pkgs.prettier-plugin-go-template}/lib/node_modules/prettier-plugin-go-template/lib/index.js"
|
|
||||||
];
|
|
||||||
overrides = [
|
|
||||||
{
|
|
||||||
files = [ "*.html" ];
|
|
||||||
options.parser = "go-template";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
settings.global.excludes = [
|
settings.global.excludes = [
|
||||||
"archetypes/**"
|
|
||||||
"public/**"
|
"public/**"
|
||||||
"static/**"
|
"static/**"
|
||||||
".envrc"
|
".envrc"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue