diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-22 14:17:34 +0300 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-22 14:17:34 +0300 |
commit | 7ba69458f2ad969f681deae1eee1b877f72560e5 (patch) | |
tree | 5253441cf3e55b51737b1b34cfab77ee32fe54fc | |
parent | 2b9b50be1b2df024a3642888ddc3c6521a96407a (diff) |
Run npx prettier --write layouts/**/*.html
-rw-r--r-- | layouts/404.html | 6 | ||||
-rw-r--r-- | layouts/_default/_markup/render-heading.html | 2 | ||||
-rw-r--r-- | layouts/_default/baseof.html | 50 | ||||
-rw-r--r-- | layouts/_default/list.html | 39 | ||||
-rw-r--r-- | layouts/partials/funcs/toc_from_pages.html | 84 | ||||
-rw-r--r-- | layouts/partials/hook_left_sidebar_logo.html | 2 | ||||
-rw-r--r-- | layouts/partials/js.html | 5 | ||||
-rw-r--r-- | layouts/partials/styles.html | 19 | ||||
-rw-r--r-- | layouts/partials/translations.html | 10 |
9 files changed, 136 insertions, 81 deletions
diff --git a/layouts/404.html b/layouts/404.html index 6503875..c18bab0 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,3 +1,3 @@ -{{define "main"}} -<h2>Page Not Found!</h2> -{{end}}
\ No newline at end of file +{{ define "main" }} + <h2>Page Not Found!</h2> +{{ end }} diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html index 0e4f6ab..e0c4bce 100644 --- a/layouts/_default/_markup/render-heading.html +++ b/layouts/_default/_markup/render-heading.html @@ -12,4 +12,4 @@ {{ end }} {{ $s.SetInMap "anchors" $anchor true }} {{ $h := printf "<h%d id=%q>%s</h%d>" .Level $anchor .Text .Level }} -{{ $h | safeHTML }}
\ No newline at end of file +{{ $h | safeHTML }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index d51ee42..2520251 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,9 +1,11 @@ -<!doctype html> +<!DOCTYPE html> <html lang="{{ .Lang | default "en" }}"> <head> - <meta charset="utf-8"> - <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"> - <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <meta charset="utf-8" /> + <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible" /> + <meta + name="viewport" + content="width=device-width, initial-scale=1, maximum-scale=1" /> <title> {{ .Title }} </title> @@ -12,15 +14,19 @@ {{ partial "hook_head_end.html" . }} <style> [x-cloak] { - display: none !important; + display: none !important; } </style> </head> <body class="index" x-data="{ navOpen: false }" x-cloak> - <a href="#" id="nav-button" @click="navOpen = !navOpen" :class="{'open': navOpen }"> + <a + href="#" + id="nav-button" + @click="navOpen = !navOpen" + :class="{'open': navOpen }"> <span> NAV - <img src='{{ relURL "images/navbar.png" }}'/> + <img src="{{ relURL "images/navbar.png" }}" /> </span> </a> <div class="toc-wrapper" :class="{'open': navOpen }"> @@ -28,8 +34,16 @@ {{ partial "hook_left_sidebar_logo.html" . }} {{ if .Site.Params.search }} <div class="search" x-data="searchController"> - <input x-model.debounce.100ms="query" type="search" class="search" id="input-search" placeholder='{{ T "search" . }}'> - <ul class="search-results visible" x-show="results.length > 0" x-transition.duration.700ms > + <input + x-model.debounce.100ms="query" + type="search" + class="search" + id="input-search" + placeholder="{{ T "search" . }}" /> + <ul + class="search-results visible" + x-show="results.length > 0" + x-transition.duration.700ms> <template x-for="item in results"> <li> <a x-text="item.title"></a> @@ -53,23 +67,29 @@ <li> {{ . | markdownify }} </li> - {{ end}} + {{ end }} </ul> - {{ end}} + {{ end }} {{ partial "hook_left_sidebar_end.html" . }} </div> <div class="page-wrapper"> <div class="dark-box"></div> <div class="content"> - {{block "main" .}} + {{ block "main" . }} This is the main content. - {{end}} + {{ end }} </div> <div class="dark-box"> {{ with .Site.Params.language_tabs }} - <div class="lang-selector" x-data="langController" x-init="initLangs({{ . | jsonify }})"> + <div + class="lang-selector" + x-data="langController" + x-init="initLangs({{ . | jsonify }})"> <template x-for="(tab, index) in tabs"> - <a x-text="tab.name" :class="{ 'active': tab.active }" @click="changeLanguage(index)"></a> + <a + x-text="tab.name" + :class="{ 'active': tab.active }" + @click="changeLanguage(index)"></a> </template> </div> {{ end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 10871b5..47a47a8 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -9,24 +9,47 @@ {{ define "toc" }} {{ $headers := slice }} - {{ with .Site.RegularPages }} + {{ with .Site.RegularPages }} {{ $headers = partial "funcs/toc_from_pages" . }} {{ end }} - <ul id="toc" class="toc-list-h1" x-data="tocController" x-init="load({{ $headers | jsonify }})" @scroll.window="onScroll()"> + <ul + id="toc" + class="toc-list-h1" + x-data="tocController" + x-init="load({{ $headers | jsonify }})" + @scroll.window="onScroll()"> {{ $maxDepth := $.Site.Params.maxMenuDepth | default 2 }} <template x-for="row in rows"> <li> - <a x-text="row.title" @click="click(row)" :href="`#${row.id}`" class="toc-link" x-bind="rowClass(row)"></a> - {{ if (ge $maxDepth 2) }} + <a + x-text="row.title" + @click="click(row)" + :href="`#${row.id}`" + class="toc-link" + x-bind="rowClass(row)"></a> + {{ if (ge $maxDepth 2) }} <ul x-show="row.open" x-bind="transitions()" class="da-toc-list-h2"> <template x-for="row in row.sub"> <li> - <a x-text="row.title" @click="click(row)" :href="`#${row.id}`" class="toc-link" x-bind="rowClass(row)"></a> - {{ if (ge $maxDepth 3) }} - <ul x-show="row.open" x-bind="transitions()" class="toc-list-h3"> + <a + x-text="row.title" + @click="click(row)" + :href="`#${row.id}`" + class="toc-link" + x-bind="rowClass(row)"></a> + {{ if (ge $maxDepth 3) }} + <ul + x-show="row.open" + x-bind="transitions()" + class="toc-list-h3"> <template x-for="row in row.sub"> <li> - <a x-text="row.title" @click="click(row)" :href="`#${row.id}`" class="toc-link" x-bind="rowClass(row)"></a> + <a + x-text="row.title" + @click="click(row)" + :href="`#${row.id}`" + class="toc-link" + x-bind="rowClass(row)"></a> </li> </template> </ul> diff --git a/layouts/partials/funcs/toc_from_pages.html b/layouts/partials/funcs/toc_from_pages.html index 456f8a6..a00b5e7 100644 --- a/layouts/partials/funcs/toc_from_pages.html +++ b/layouts/partials/funcs/toc_from_pages.html @@ -1,63 +1,63 @@ {{ $combined := slice }} {{ range . }} - {{ $headers := findRE "<h\\d.*?>(.|\n)*?</h\\d>" .Content }} - {{ $combined = $combined | append $headers }} + {{ $headers := findRE "<h\\d.*?>(.|\n)*?</h\\d>" .Content }} + {{ $combined = $combined | append $headers }} {{ end }} {{ $toc := slice }} -{{ $previousH1 := dict}} -{{ $previousH2 := dict}} +{{ $previousH1 := dict }} +{{ $previousH2 := dict }} {{ $previousLevel := 0 }} {{ $h2s := slice }} {{ $h3s := slice }} {{ range $combined }} - {{ $level := int (substr . 2 1) }} - {{ if le $level 3 }} - {{ $idTitle := split (. | replaceRE "<h\\d id=\"(.*?)\">(.*)</h\\d>" "$1|$2") "|" }} - {{ $item := dict "level" $level "id" (index $idTitle 0) "title" (index $idTitle 1) }} - - {{ if eq $level 1 }} - {{ if ne $previousLevel 0 }} - {{ if or (eq $previousLevel 2) (eq $previousLevel 3) }} - {{ $tocItem := merge $previousH2 (dict "sub" $h3s) }} - {{ $h2s = $h2s | append $tocItem }} - {{ $h3s = slice }} - {{ end }} - - {{ $tocItem := merge $previousH1 (dict "sub" $h2s) }} - {{ $toc = $toc | append $tocItem }} - {{ $h2s = slice }} - {{ $previousH2 = slice }} - {{ end }} - {{ $previousH1 = $item }} - {{ else }} - {{ if eq $level 2 }} - {{ if and (ne $previousLevel 1) (ne $previousLevel 2) }} - {{ $tocItem := merge $previousH2 (dict "sub" $h3s) }} - {{ $h2s = $h2s | append $tocItem }} - {{ $h3s = slice }} - {{ end }} - {{ if eq $previousLevel 2 }} - {{ $h2s = $h2s | append $previousH2 }} - {{ end }} - {{ $previousH2 = $item }} - {{ else }} - {{ $h3s = $h3s | append $item }} - {{ end }} + {{ $level := int (substr . 2 1) }} + {{ if le $level 3 }} + {{ $idTitle := split (. | replaceRE "<h\\d id=\"(.*?)\">(.*)</h\\d>" "$1|$2") "|" }} + {{ $item := dict "level" $level "id" (index $idTitle 0) "title" (index $idTitle 1) }} + + {{ if eq $level 1 }} + {{ if ne $previousLevel 0 }} + {{ if or (eq $previousLevel 2) (eq $previousLevel 3) }} + {{ $tocItem := merge $previousH2 (dict "sub" $h3s) }} + {{ $h2s = $h2s | append $tocItem }} + {{ $h3s = slice }} {{ end }} - {{ $previousLevel = $level }} + + {{ $tocItem := merge $previousH1 (dict "sub" $h2s) }} + {{ $toc = $toc | append $tocItem }} + {{ $h2s = slice }} + {{ $previousH2 = slice }} + {{ end }} + {{ $previousH1 = $item }} + {{ else }} + {{ if eq $level 2 }} + {{ if and (ne $previousLevel 1) (ne $previousLevel 2) }} + {{ $tocItem := merge $previousH2 (dict "sub" $h3s) }} + {{ $h2s = $h2s | append $tocItem }} + {{ $h3s = slice }} + {{ end }} + {{ if eq $previousLevel 2 }} + {{ $h2s = $h2s | append $previousH2 }} + {{ end }} + {{ $previousH2 = $item }} + {{ else }} + {{ $h3s = $h3s | append $item }} + {{ end }} {{ end }} + {{ $previousLevel = $level }} + {{ end }} {{ end }} {{ if ne $previousLevel 0 }} - {{ $tocItem := merge $previousH2 (dict "sub" $h3s) }} - {{ $h2s = $h2s | append $tocItem }} + {{ $tocItem := merge $previousH2 (dict "sub" $h3s) }} + {{ $h2s = $h2s | append $tocItem }} - {{ $item := merge $previousH1 (dict "sub" $h2s) }} - {{ $toc = $toc | append $item }} + {{ $item := merge $previousH1 (dict "sub" $h2s) }} + {{ $toc = $toc | append $item }} {{ end }} {{ return $toc }} diff --git a/layouts/partials/hook_left_sidebar_logo.html b/layouts/partials/hook_left_sidebar_logo.html index 6000d7b..349b39c 100644 --- a/layouts/partials/hook_left_sidebar_logo.html +++ b/layouts/partials/hook_left_sidebar_logo.html @@ -1 +1 @@ - <img src='{{ relURL "images/logo.png" }}' class="logo" />
\ No newline at end of file +<img src="{{ relURL "images/logo.png" }}" class="logo" /> diff --git a/layouts/partials/js.html b/layouts/partials/js.html index 1b001d2..a0539ad 100644 --- a/layouts/partials/js.html +++ b/layouts/partials/js.html @@ -6,4 +6,7 @@ {{ if hugo.IsProduction }} {{ $js = $js | fingerprint }} {{ end }} -<script src="{{ $js.RelPermalink }}" {{ if hugo.IsProduction }}integrity="{{ $js.Data.Integrity }}"{{ end }} defer></script> +<script + src="{{ $js.RelPermalink }}" + {{ if hugo.IsProduction }}integrity="{{ $js.Data.Integrity }}"{{ end }} + defer></script> diff --git a/layouts/partials/styles.html b/layouts/partials/styles.html index 1f48c14..0b5d956 100644 --- a/layouts/partials/styles.html +++ b/layouts/partials/styles.html @@ -2,11 +2,18 @@ {{ $cssOpts := (dict "targetPath" "styles/screen.css" "enableSourceMap" $isDev ) }} {{ $screenCSS := resources.Get "scss/slate/screen.css.scss" | toCSS $cssOpts }} {{ $cssOpts = (dict "targetPath" "styles/print.css" "enableSourceMap" $isDev ) }} -{{ $printCSS := resources.Get "scss/slate/print.css.scss" | toCSS $cssOpts }} +{{ $printCSS := resources.Get "scss/slate/print.css.scss" | toCSS $cssOpts }} {{ if not $isDev }} -{{ $printCSS = $printCSS | postCSS | minify | fingerprint }} -{{ $screenCSS = $screenCSS | postCSS | minify | fingerprint }} + {{ $printCSS = $printCSS | postCSS | minify | fingerprint }} + {{ $screenCSS = $screenCSS | postCSS | minify | fingerprint }} {{ end }} -<link href='{{ $screenCSS.RelPermalink }}' rel="stylesheet" media="screen" {{ if not $isDev }}integrity="{{ $screenCSS.Data.Integrity }}"{{ end }} /> -<link href='{{ $printCSS.RelPermalink }}' rel="stylesheet" media="print" {{ if not $isDev }}integrity="{{ $printCSS.Data.Integrity }}"{{ end }} /> - +<link + href="{{ $screenCSS.RelPermalink }}" + rel="stylesheet" + media="screen" + {{ if not $isDev }}integrity="{{ $screenCSS.Data.Integrity }}"{{ end }} /> +<link + href="{{ $printCSS.RelPermalink }}" + rel="stylesheet" + media="print" + {{ if not $isDev }}integrity="{{ $printCSS.Data.Integrity }}"{{ end }} /> diff --git a/layouts/partials/translations.html b/layouts/partials/translations.html index 026ec0b..b20c52d 100644 --- a/layouts/partials/translations.html +++ b/layouts/partials/translations.html @@ -1,7 +1,9 @@ {{ if .IsTranslated }} -<ul> + <ul> {{ range $i, $e := .Translations }} - <li class="toc-h2"><a href="{{ .Permalink }}">{{ $e.Language.LanguageName }}</a></li> - {{ end}} -</ul> + <li class="toc-h2"> + <a href="{{ .Permalink }}">{{ $e.Language.LanguageName }}</a> + </li> + {{ end }} + </ul> {{ end }} |