summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormms <michal@sapka.me>2024-06-10 22:01:04 +0200
committermms <michal@sapka.me>2024-06-10 22:01:04 +0200
commite8dd384c73b32a7e92ebe5f08c015f8ac1da78d0 (patch)
tree19137ca909423f6446d63766bab27eaddc01a2a4
parent902dd210730f5e7bd537ce9ef7f2b9d91a0b7fb6 (diff)
feat: UH artwork
-rw-r--r--assets/unix-history/header-rect.pngbin0 -> 40418 bytes
-rw-r--r--assets/unix-history/header-top.pngbin0 -> 3863 bytes
-rw-r--r--assets/unix-history/header.pngbin0 -> 91215 bytes
-rw-r--r--config/_default/hugo.toml1
-rw-r--r--content-org/unix-history.org14
-rw-r--r--content/unix-history/_index.md10
l---------layouts/brain-rot/.#baseof.html1
-rw-r--r--layouts/shortcodes/image.html2
l---------layouts/unix-history/.#single.html1
-rw-r--r--layouts/unix-history/baseof.html242
-rw-r--r--layouts/unix-history/list.html33
-rw-r--r--layouts/unix-history/single.html31
12 files changed, 222 insertions, 113 deletions
diff --git a/assets/unix-history/header-rect.png b/assets/unix-history/header-rect.png
new file mode 100644
index 0000000..8bba5bb
--- /dev/null
+++ b/assets/unix-history/header-rect.png
Binary files differ
diff --git a/assets/unix-history/header-top.png b/assets/unix-history/header-top.png
new file mode 100644
index 0000000..64a120a
--- /dev/null
+++ b/assets/unix-history/header-top.png
Binary files differ
diff --git a/assets/unix-history/header.png b/assets/unix-history/header.png
new file mode 100644
index 0000000..f950557
--- /dev/null
+++ b/assets/unix-history/header.png
Binary files differ
diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml
index 51344d7..ee3d778 100644
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@@ -5,7 +5,6 @@ tagline = "Hello do Michał's weblog!"
theme = "sapka-2024"
-enableGitInfo = true
[params]
defaultDescription = "Welcome to my blog!"
diff --git a/content-org/unix-history.org b/content-org/unix-history.org
index 0ba366b..5120fbe 100644
--- a/content-org/unix-history.org
+++ b/content-org/unix-history.org
@@ -17,11 +17,11 @@ CLOSED: [2024-05-30 Sat 21:03]
:PROPERTIES:
:EXPORT_FILE_NAME: _index
:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
-:EXPORT_HUGO_CUSTOM_FRONT_MATTER: :primary_menu bsd
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :primary_menu bsd
:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :aliases '(/bsd/history//)
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :shortname History of Unix
:EXPORT_HUGO_MENU: :menu bsd
-:EXPORT_HUGO_CUSTOM_FRONT_MATTER: :primary_menu "unix-history"
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-r menu menu-info
+:EXPORT_HUGO_PAIRED_SHORTCODES: img-r menu menu-info image
:END:
To say that the history of Unix is long and convoluted would be a huge understatement.
@@ -33,6 +33,13 @@ This site is a fang, and a love letter to computer history.
To the brilliant minds and sleazy lawyers.
To the original, the followers, and imitators.
+#+attr_shortcode: :file header.png
+#+attr_shortcode: :alt A group of characters in the style of Unix Surralism.
+#+attr_shortcode: :class centered
+#+begin_image
+noop
+#+end_image
+
*** Table of contents
#+attr_shortcode: "unix-history"
@@ -44,6 +51,7 @@ Dune
*** Acknowledgements
- [[http://wovenmemories.net/][Jeff]], for proofreading Part III
+- [[https://www.analognowhere.com/][Tomáš]], for providing artwork on homepage
- [[https://static-dust.klpn.se/][Karl Pettersson]], for pointing date errors about IX/386 and Xenix in Part III
*** Changes
diff --git a/content/unix-history/_index.md b/content/unix-history/_index.md
index db8b70a..da26d6b 100644
--- a/content/unix-history/_index.md
+++ b/content/unix-history/_index.md
@@ -5,8 +5,11 @@ date = 2024-05-30T21:03:00+02:00
categories = ["unix-history"]
draft = false
weight = 2001
-primary_menu = "unix-history"
+image_dir = "unix-history"
+image_max_width = 480
+primary_menu = "bsd"
aliases = ["/bsd/history//"]
+shortname = "History of Unix"
[menu]
[menu.bsd]
weight = 2001
@@ -22,6 +25,10 @@ This site is a fang, and a love letter to computer history.
To the brilliant minds and sleazy lawyers.
To the original, the followers, and imitators.
+{{< image class="centered" alt="A group of characters in the style of Unix Surralism." file="header.png" >}}
+noop
+{{< /image >}}
+
## Table of contents {#table-of-contents}
@@ -33,6 +40,7 @@ Dune
## Acknowledgements {#acknowledgements}
- [Jeff](http://wovenmemories.net/), for proofreading Part III
+- [Tomáš](https://www.analognowhere.com/), for providing artwork on homepage
- [Karl Pettersson](https://static-dust.klpn.se/), for pointing date errors about IX/386 and Xenix in Part III
diff --git a/layouts/brain-rot/.#baseof.html b/layouts/brain-rot/.#baseof.html
deleted file mode 120000
index 1a87e03..0000000
--- a/layouts/brain-rot/.#baseof.html
+++ /dev/null
@@ -1 +0,0 @@
-mms@voyager.2829:1717002207 \ No newline at end of file
diff --git a/layouts/shortcodes/image.html b/layouts/shortcodes/image.html
index 2677b2c..d538fde 100644
--- a/layouts/shortcodes/image.html
+++ b/layouts/shortcodes/image.html
@@ -43,6 +43,7 @@
loading="lazy"
>
</a>
+ {{ if not (strings.Contains $caption "noop") }}
<figcaption>
{{ $caption }}
@@ -50,5 +51,6 @@
<a href="{{ $source }}" target="_blank" title="source">[source]</a>
{{ end }}
</figcaption>
+ {{ end }}
</figure>
diff --git a/layouts/unix-history/.#single.html b/layouts/unix-history/.#single.html
new file mode 120000
index 0000000..d7699a2
--- /dev/null
+++ b/layouts/unix-history/.#single.html
@@ -0,0 +1 @@
+mms@voyager.25629:1717856541 \ No newline at end of file
diff --git a/layouts/unix-history/baseof.html b/layouts/unix-history/baseof.html
index 19e557e..b5390b9 100644
--- a/layouts/unix-history/baseof.html
+++ b/layouts/unix-history/baseof.html
@@ -3,126 +3,154 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
- {{ partial "header/meta" . }}
- {{- $bg := resources.Get "unix-history/bg.gif" -}}
-
- <style>
- :root {
- --bg-color: #E8E9EB;
- --heading-color: #738678;
- --text-color: #000;
- }
+ <meta charset="utf-8">
+ <title> {{ .Page.Title }} </title>
- body {
- width: 800px;
- max-width: 70%;
- margin-left: auto;
- margin-right: auto;
- font-family: helvetica;
- font-size: 1em;
- line-height: 1.5em;
- text-align: justify;
- background-image: url({{ $bg.Permalink }});
- background-repeat: repeat-y;
- background-size: 200px;
- background-color: var(--bg-color);
- padding-top: 20px;
- padding-bottom: 30px;
- padding-left: 210px;
- padding-right: 30px;
- overflow-x: hidden;
- color: var(--text-color);
- }
- @media only screen and (max-width: 700px) {
- body {
- background-image: unset;
- max-width: 95%;
- padding: 10px;
- margin-left: 0;
- }
- }
+ <meta name="viewport" content="width=device-width, initial-scale=1">
- a {
- color: var(--text-color);
- }
- p {
- padding-left: 40px;
- }
- article figure {
- text-align: center;
- margin: 0;
- max-width: 100%;
- font-size: 0.8em;
- }
+ {{- $header_rect := resources.Get "unix-history/header-rect.png" }}
+ {{- $header_rect_180 := $header_rect.Resize "180x webp q90"}}
+ <link rel="apple-touch-icon" sizes="180x180" href="{{ $header_rect_180.Permalink }}">
- img {
- max-width: 60%;
- height: auto;
- }
-
- h1 {
- font-style: italic;
- color: var(--heading-color);
- }
-
- h2 {
- font-size:1.1em;
- color: var(--heading-color);
- }
+ {{- $header_rect_32 := $header_rect.Resize "32x webp q90"}}
+ <link rel="icon" type="image/png" sizes="32x32" href="{{ $header_rect_32.Permalink }}">
- .wip {
- width: 80%;
- background-color: #EEE;
- border-radius: 5px;
- margin: 20px;
- margin-left: auto;
- margin-right: auto;
- padding: 10px;
- padding-top: 20px;
- padding-bottom: 20px;
- border-style: solid;
- border-color: #000;
- border-width: 1px;
- vertical-align: middle;
- }
- .wip img {
- vertical-align: middle;
- padding-left: 10px;
- padding-right: 10px;
- }
+ {{- $header_rect_16 := $header_rect.Resize "16x webp q90"}}
+ <link rel="icon" type="image/png" sizes="16x16" href="{{ $header_rect_16.Permalink }}">
+
+ <meta name="description" content="{{ .Params.Abstract | default .Site.Params.DefaultDescription}}">
+
+ <meta property="og:title" content="{{ .Page.Title }}">
+ <meta property="og:type" content="website">
+ <meta property="og:url" content="{{ .Permalink }}">
+ <meta property="og:image" content="{{ $header_rect.Permalink }}">
+ <meta property="og:description" content="{{ .Params.Abstract | default .Site.Params.DefaultDescription}}">
+
+ <link rel="canonical" href="{{ .Permalink }}">
+ <link rel='alternate' type='application/rss+xml' title="Feed with all changes" href='/index.xml'>
+ <link rel='alternate' type='application/rss+xml' title="Feed with Unix History changes" href='/unix-history/index.xml'>
+ <meta name="robots" content="index, follow">
+ <link rel="me" href="https://emacs.ch/@mms">
+
+ <link rel="webmention" href="https://webmention.io/d-s.sh/webmention">
+ <link rel="pingback" href="https://webmention.io/d-s.sh/xmlrpc">
+
+ {{- $bg := resources.Get "unix-history/bg.gif" -}}
+
+ <style>
+ :root {
+ --bg-color: #E8E9EB;
+ --heading-color: #738678;
+ --text-color: #000;
+ }
+
+ body {
+ width: 800px;
+ max-width: 70%;
+ margin-left: auto;
+ margin-right: auto;
+ font-family: helvetica;
+ font-size: 1em;
+ line-height: 1.5em;
+ text-align: justify;
+ background-image: url({{ $bg.Permalink }});
+ background-repeat: repeat-y;
+ background-size: 200px;
+ background-color: var(--bg-color);
+ padding-top: 20px;
+ padding-bottom: 30px;
+ padding-left: 210px;
+ padding-right: 30px;
+ overflow-x: hidden;
+ color: var(--text-color);
+ }
+
+ @media only screen and (max-width: 700px) {
+ body {
+ background-image: unset;
+ max-width: 95%;
+ padding: 10px;
+ margin-left: 0;
+ }
+ }
+
+ a {
+ color: var(--text-color);
+ }
+ p {
+ padding-left: 40px;
+ }
+ article figure {
+ text-align: center;
+ margin: 0;
+ max-width: 100%;
+ font-size: 0.8em;
+ }
+
+ img {
+ max-width: 60%;
+ height: auto;
+ }
+
+ h1 {
+ font-style: italic;
+ color: var(--heading-color);
+ }
+
+ h2 {
+ font-size:1.1em;
+ color: var(--heading-color);
+ }
+
+ .wip {
+ width: 80%;
+ background-color: #EEE;
+ border-radius: 5px;
+ margin: 20px;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 10px;
+ padding-top: 20px;
+ padding-bottom: 20px;
+ border-style: solid;
+ border-color: #000;
+ border-width: 1px;
+ vertical-align: middle;
+ }
+ .wip img {
+ vertical-align: middle;
+ padding-left: 10px;
+ padding-right: 10px;
+ }
- .top-menu {
- display: flex;
- }
- .top-menu-element {
- width: 50%;
- flex-shrink: 0;
- }
+ .top-menu {
+ display: flex;
+ }
+ .top-menu-element {
+ width: 50%;
+ flex-shrink: 0;
+ }
- .header-sep {
- margin-top: 30px;
- margin-bottom: 30px;
- }
+ .header-sep {
+ margin-top: 30px;
+ margin-bottom: 30px;
+ }
- .footnotes p {
- margin: 0;
- padding: 0;
- }
- </style>
+ .footnotes p {
+ margin: 0;
+ padding: 0;
+ }
+ </style>
</head>
<body>
<header>
- <nav>
- {{ range $parent := first 1 .Ancestors}}
- <a href="{{ .Permalink }}"> &lt; Back</a>
- {{ end }}
- </nav>
- <hr>
+ {{ block "head" . }}
+ {{ end }}
- <h1>{{ .Title }}</h1>
+ <h1>{{ .Page.Params.shortname }}</h1>
</header>
<article>
@@ -131,7 +159,7 @@
<img src="{{$wip.Permalink}}" alt="Work in progress" width="{{ $wip.Width}}" height="{{ $wip.Height }}">
This text is still work in progress and will be updated.
</aside>
-
+
{{ block "main" . }}
{{ end }}
diff --git a/layouts/unix-history/list.html b/layouts/unix-history/list.html
new file mode 100644
index 0000000..6295d15
--- /dev/null
+++ b/layouts/unix-history/list.html
@@ -0,0 +1,33 @@
+{{ define "head"}}
+<a href="/">Back</a>
+<hr>
+{{end}}
+
+
+
+{{ define "main" }}
+
+{{if .Page.Content}}
+ {{ .Page.Content }}
+ {{- if .Params.primary_menu }}
+ {{ partial "single/bottom_nav.html" (dict "menuID" .Page.Params.primary_menu "page" .) }}
+ {{- end }}
+
+ {{ partial "single/dates.html" . }}
+{{ else }}
+
+ {{ if in .Page.Params.Categories "blog" }}
+ {{ partial "partials/blog_index.html" . }}
+ {{ else if in .Page.Params.Categories "article" }}
+ {{ partial "partials/article_index.html" . }}
+ {{ else }}
+
+ <h2>Articles</h2>
+ {{ range .Data.Pages }}
+ {{ partial "partials/article_list_item.html" . }}
+ {{ end }}
+
+ {{ end }}
+{{end}}
+
+{{ end }}
diff --git a/layouts/unix-history/single.html b/layouts/unix-history/single.html
new file mode 100644
index 0000000..fa8673b
--- /dev/null
+++ b/layouts/unix-history/single.html
@@ -0,0 +1,31 @@
+{{ define "head" }}
+<a href="/unix-history">
+{{- $header_rect := resources.Get "unix-history/header-top.png" }}
+{{- $header_rect_180 := $header_rect.Resize "50x webp q90"}}
+<img
+ style="
+ height: 1.5em;
+ width: auto;
+ margin-right: 0.5em;
+ "
+ src="{{ $header_rect_180.Permalink }}"
+ ></a>
+
+<b><i>History of Unix</i></b>
+<hr>
+
+{{ end }}
+
+{{ define "main" }}
+
+<article>
+ {{ .Page.Content }}
+</article>
+
+{{- if .Params.primary_menu }}
+ {{ partial "single/bottom_nav.html" (dict "menuID" .Page.Params.primary_menu "page" .) }}
+{{- end }}
+
+{{ partial "single/dates.html" . }}
+
+{{- end }}