diff options
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/_default/list.html | 20 | ||||
| -rw-r--r-- | layouts/_markup/render-image.html (renamed from layouts/_default/_markup/render-image.html) | 0 | ||||
| -rw-r--r-- | layouts/baseof.html | 20 | ||||
| -rw-r--r-- | layouts/home.html | 19 | ||||
| -rw-r--r-- | layouts/page.html (renamed from layouts/_default/single.html) | 4 | ||||
| -rw-r--r-- | layouts/partials/footer.html | 14 | ||||
| -rw-r--r-- | layouts/partials/head.html | 15 | ||||
| -rw-r--r-- | layouts/partials/header.html | 34 | ||||
| -rw-r--r-- | layouts/partials/navigation.html | 18 | ||||
| -rw-r--r-- | layouts/section.html | 17 | ||||
| -rw-r--r-- | layouts/terms.html (renamed from layouts/_default/terms.html) | 0 |
11 files changed, 91 insertions, 70 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html deleted file mode 100644 index 9b40ced..0000000 --- a/layouts/_default/list.html +++ /dev/null @@ -1,20 +0,0 @@ -{{ partial "header.html" . }} -<div class="body"> -{{ .Content }} -</div> -{{ if .IsHome }} - <div class="list"> - <h2>Recent posts</h2> - <ul> - {{ $pages := .Pages }} - {{ $pages = .Site.RegularPages }} - {{ range (where $pages "Section" "!=" "") }} - <li> - <a href="{{ .RelPermalink }}">{{ .Title | markdownify }}</a> - <span class="date"> Published on {{ .Date.Format "2006/01/02" }}</span> - </li> - {{ end }} - </ul> - </div> -{{ end }} -{{ partial "footer.html" . }} diff --git a/layouts/_default/_markup/render-image.html b/layouts/_markup/render-image.html index 179fe95..179fe95 100644 --- a/layouts/_default/_markup/render-image.html +++ b/layouts/_markup/render-image.html diff --git a/layouts/baseof.html b/layouts/baseof.html new file mode 100644 index 0000000..11f8e65 --- /dev/null +++ b/layouts/baseof.html @@ -0,0 +1,20 @@ +<!DOCTYPE html> +<html lang="{{ site.Language.LanguageCode }}"> +<head> + {{ partial "head.html" . }} +</head> +<body> + <header> + {{ partial "header.html" . }} + </header> + + <main> + {{ block "main" . }} + {{ end }} + </main> + + <footer> + {{ partial "footer.html" . }} + </footer> +</body> +</html> diff --git a/layouts/home.html b/layouts/home.html new file mode 100644 index 0000000..2dabf5b --- /dev/null +++ b/layouts/home.html @@ -0,0 +1,19 @@ +{{ define "main" }} +<div class="body"> + <h2>{{ .Title }}</h2> + {{ .Content }} +</div> +<div class="list"> + <h2>Recent posts</h2> + <ul> + {{ $pages := .Pages }} + {{ $pages = .Site.RegularPages }} + {{ range (where $pages "Section" "!=" "") }} + <li> + <a href="{{ .RelPermalink }}">{{ .Title | markdownify }}</a> + <span class="date"> Published on {{ .Date.Format "2006/01/02" }}</span> + </li> + {{ end }} + </ul> +</div> +{{ end }} diff --git a/layouts/_default/single.html b/layouts/page.html index a322e0a..cea54ae 100644 --- a/layouts/_default/single.html +++ b/layouts/page.html @@ -1,7 +1,7 @@ -{{ partial "header.html" .}} +{{ define "main" }} <div class="single"> <h2>{{ .Title }}</h2> <h4> Published on {{ .Date.Format "2006/01/02" }}</h4> {{ .Content }} </div> -{{ partial "footer.html" . }} +{{ end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 83be5c4..641b3b9 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,11 +1,3 @@ -<footer style="vertical-align: bottom;"> - <div style="display: block; margin-left:20em; margin-right:20em; font-size: 10pt"> - <center> - {{ with .Site.Params.footer }} - {{ . | markdownify }} - {{ end }} - </center> - </div> -</footer> -</body> -</html> +{{ with .Site.Params.footer }} +{{ . | markdownify }} +{{ end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 546851c..8708ddb 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,9 +1,6 @@ -<head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png"> - <link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png"> - <link rel="stylesheet" href="{{ "/css/style.css" | relURL }}" /> - <link rel="stylesheet" href="{{ "/css/fonts.css" | relURL }}" /> - <script async type="text/javascript" src="js/code.js"> </script> -</head> +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width, initial-scale=1"> +<link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png"> +<link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png"> +<link rel="stylesheet" href="{{ "/css/style.css" | relURL }}" /> +<link rel="stylesheet" href="{{ "/css/fonts.css" | relURL }}" /> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index f3feda0..9deb68f 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,10 +1,24 @@ -<!DOCTYPE html> -<html lang=en-us> - {{ partial "head.html" . }} - <header> - <img width="100em" height="100em" src="/images/logo.jpg" alt="my logo"> - <div> - <h1>mjkw.pl</h1> - {{ partial "navigation.html" .}} - </div> - </header> +<img width="100em" height="100em" src="/images/logo.jpg" alt="mjkw logo"> +<div> + <h1>mjkw.pl</h1> + <ul> + <li> + <a href="/">home</a> + </li> + <li> + <a href="/articles">articles</a> + </li> + <li> + <a href="https://git.denounce.ai/">git.denounce.ai</a> + </li> + <li> + <a href="https://ohmyghost.nl">ohmyghost.nl</a> + </li> + <li> + <a href="https://atlarge-research.com/mkwiatkowski/">research</a> + </li> + <li> + <a href="/contact">contact me</a> + </li> + </ul> +</div> diff --git a/layouts/partials/navigation.html b/layouts/partials/navigation.html deleted file mode 100644 index 6d9d2ca..0000000 --- a/layouts/partials/navigation.html +++ /dev/null @@ -1,18 +0,0 @@ -<ul> - <li> - <a href="/">home</a> - </li> - <li> - <a href="https://git.denounce.ai/">git.denounce.ai</a> - </li> - <li> - <a href="https://ohmyghost.nl">ohmyghost.nl</a> - </li> - <li> - <a href="https://atlarge-research.com/mkwiatkowski/">research</a> - </li> - <li> - <a href="/contact">contact me</a> - </li> -</ul> - diff --git a/layouts/section.html b/layouts/section.html new file mode 100644 index 0000000..84557c3 --- /dev/null +++ b/layouts/section.html @@ -0,0 +1,17 @@ +{{ define "main" }} +<div class="list"> + <h2>{{ .Title }}</h2> + {{ .Content }} + <ul> + {{ $pages := .Pages }} + {{ $pages = .Site.RegularPages }} + {{ range (where $pages "Section" "==" .Section ) }} + <li> + <a href="{{ .RelPermalink }}">{{ .Title | markdownify }}</a> + <span class="date"> Published on {{ .Date.Format "2006/01/02" }}</span> + <span class="summary"> {{ .Summary }} </span> + </li> + {{ end }} + </ul> +</div> +{{ end }} diff --git a/layouts/_default/terms.html b/layouts/terms.html index c018b05..c018b05 100644 --- a/layouts/_default/terms.html +++ b/layouts/terms.html |