From 89e8c3eba46ec62fb70557225b2250524fe2c954 Mon Sep 17 00:00:00 2001
From: Niklas Buschmann <niklasbuschmann@posteo.org>
Date: Mon, 3 Feb 2020 20:44:17 +0100
Subject: [PATCH] merge upstream

---
 layouts/_default/baseof.html       |  8 +++--
 layouts/partials/font-awesome.html |  1 +
 layouts/partials/math.html         |  2 +-
 static/css/classes.css             |  5 ++-
 static/css/sidebar.css             | 58 ++++++++++++++++++++++++++++++
 5 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 layouts/partials/font-awesome.html
 create mode 100644 static/css/sidebar.css

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 0300bda..833196b 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -10,10 +10,13 @@
 <link rel="stylesheet" href="{{ .Site.BaseURL }}css/index.css">
 <link rel="stylesheet" href="{{ .Site.BaseURL }}css/classes.css">
 <link rel="stylesheet" href="{{ .Site.BaseURL }}fonts/PT-Sans.css">
+{{- if .Site.Params.sidebar }}
+<link rel="stylesheet" href="{{ .Site.BaseURL }}css/sidebar.css" media="screen and (min-width: 70em)">
+{{- end }}
 <link rel="canonical" href="{{ .Permalink }}">
 <link rel="alternate" type="application/rss+xml" href="{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }}{{ end }}" title="{{ .Site.Title }}">
-{{- if .Site.Params.FontAwesome }}
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css">
+{{- if .Site.Params.fontawesome }}
+{{ partial "font-awesome.html" . }}
 {{- end }}
 {{- if or .Params.math .Site.Params.math }}
 {{ partial "math.html" . }}
@@ -26,6 +29,7 @@
       <a href="{{ .URL }}">{{ .Pre }}{{ .Name }}{{ .Post }}</a>
     {{ end }}
   </nav>
+  {{ if and .Site.Params.sidebar (isset .Site.Params "description") }}<p>{{ .Site.Params.description }}</p>{{ end }}
 </header>
 
 {{- block "main" . }}{{- end }}
diff --git a/layouts/partials/font-awesome.html b/layouts/partials/font-awesome.html
new file mode 100644
index 0000000..cc96773
--- /dev/null
+++ b/layouts/partials/font-awesome.html
@@ -0,0 +1 @@
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css">
diff --git a/layouts/partials/math.html b/layouts/partials/math.html
index 7c4c389..e078d13 100644
--- a/layouts/partials/math.html
+++ b/layouts/partials/math.html
@@ -1,3 +1,3 @@
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.css" integrity="sha384-zB1R0rpPzHqg7Kpt0Aljp8JPLqbXI3bhnPWROx27a9N0Ll6ZP/+DiW/UqRcLbRjq" crossorigin="anonymous">
 <script defer src="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.js" integrity="sha384-y23I5Q6l+B6vatafAwxRu/0oK/79VlbSz7Q9aiSZUvyWYIYsd+qj+o24G5ZU2zJz" crossorigin="anonymous"></script>
-<script defer src="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/contrib/auto-render.min.js" integrity="sha384-kWPLUVMOks5AQFrykwIup5lo0m3iMkkHrD0uJ4H5cjeGihAutqP0yW0J6dpFiVkI" crossorigin="anonymous" onload="renderMathInElement(document.body);"></script>
\ No newline at end of file
+<script defer src="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/contrib/auto-render.min.js" integrity="sha384-kWPLUVMOks5AQFrykwIup5lo0m3iMkkHrD0uJ4H5cjeGihAutqP0yW0J6dpFiVkI" crossorigin="anonymous" onload="renderMathInElement(document.body);"></script>
diff --git a/static/css/classes.css b/static/css/classes.css
index 95b6574..0b8463c 100644
--- a/static/css/classes.css
+++ b/static/css/classes.css
@@ -12,7 +12,6 @@
 
 .archive li {
   font-size: 1.1em;
-  margin: .6em 0;
 }
 
 .archive time {
@@ -20,3 +19,7 @@
   min-width: 10ch;
   margin: 0 .2em;
 }
+
+.fa, .fab, .fad, .fal, .far, .fas {
+  margin-right: 1.2em;
+}
diff --git a/static/css/sidebar.css b/static/css/sidebar.css
new file mode 100644
index 0000000..558c445
--- /dev/null
+++ b/static/css/sidebar.css
@@ -0,0 +1,58 @@
+body {
+  font-size: 18px;
+  padding: 0 4em;
+  margin-left: 16em;
+}
+
+body > article, body > footer {
+  margin: 0 auto;
+  padding: 2em 0;
+  max-width: 55em;
+}
+
+body > header {
+  display: block;
+  position: fixed;
+  background: #17181c;
+  color: #fff;
+  border: none;
+  box-shadow: none;
+  opacity: .96;
+  margin: 0;
+  padding: 2.2em 2em;
+  width: 12em;
+  top: 0;
+  bottom: 0;
+  left: 0;
+}
+
+nav {
+  margin: 0 -2em;
+}
+
+nav a {
+  display: block;
+  margin: 0;
+  padding: .5em 2em;
+}
+
+nav a:hover, nav a.selected {
+  background: #23242a;
+  text-decoration: inherit;
+}
+
+nav a svg {
+  margin-right: 1.2em;
+}
+
+article header h1 {
+  font-size: 2em;
+}
+
+body > header > a {
+  display: none;
+}
+
+body > header > p {
+  margin-top: 3em;
+}