From 67748a251382b4269e39281aa7abd1024bea5831 Mon Sep 17 00:00:00 2001
From: Niklas Buschmann <niklasbuschmann@posteo.org>
Date: Mon, 3 Feb 2020 20:19:33 +0100
Subject: merge upstream

---
 layouts/_default/baseof.html |   7 +-
 static/css/index.css         | 152 +++++++++++++++++++++++++++++++++++++++++++
 static/css/theme.css         | 152 -------------------------------------------
 3 files changed, 157 insertions(+), 154 deletions(-)
 create mode 100644 static/css/index.css
 delete mode 100644 static/css/theme.css

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 2ff9369..0300bda 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -7,11 +7,14 @@
 <meta name="description" content="{{ .Description | default .Site.Params.description }}">
 {{- end }}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="{{ .Site.BaseURL }}css/theme.css">
+<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">
 <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">
+{{- end }}
 {{- if or .Params.math .Site.Params.math }}
 {{ partial "math.html" . }}
 {{- end }}
@@ -20,7 +23,7 @@
   <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
   <nav>
     {{ range .Site.Menus.main }}
-      <a href="{{ .URL }}">{{ .Name }}</a>
+      <a href="{{ .URL }}">{{ .Pre }}{{ .Name }}{{ .Post }}</a>
     {{ end }}
   </nav>
 </header>
diff --git a/static/css/index.css b/static/css/index.css
new file mode 100644
index 0000000..afcaed9
--- /dev/null
+++ b/static/css/index.css
@@ -0,0 +1,152 @@
+@media (prefers-color-scheme: light) {
+  html {
+    background: #ffffff;
+    color: #1c1d22;
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  html {
+    background: #1c1d22;
+    color: #ffffff;
+  }
+}
+
+body {
+  font-family: "PT Sans", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Roboto", sans-serif;
+  font-size: calc(0.8rem + 0.3vw);
+  font-weight: 400;
+  line-height: 1.6;
+  margin: 0;
+  -webkit-text-size-adjust: 100%;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-weight: 400;
+}
+
+b, strong, th {
+  font-weight: 600;
+}
+
+a {
+  color: inherit;
+  text-decoration: inherit;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+article a {
+  color: #68f;
+}
+
+header time {
+  color: #8e8e91;
+}
+
+hr {
+  border: 1px solid rgba(142, 142, 145, 0.3);
+  margin: 2em 0;
+}
+
+blockquote {
+  background: rgba(142, 142, 145, 0.04);
+  border-left: 3px solid rgba(142, 142, 145, 0.7);
+  padding: 1px 1.5em;
+}
+
+blockquote p {
+  opacity: .7;
+}
+
+blockquote, figure {
+  margin: 1em 0;
+}
+
+img, li {
+  margin: .5em 0;
+}
+
+img {
+  border-radius: 2px;
+  max-width: 100%;
+  height: auto;
+}
+
+table {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+th, td {
+  padding: .5em 1em;
+}
+
+tr {
+  border: 1px solid rgba(142, 142, 145, 0.2);
+}
+
+tr:hover, tr:nth-child(odd) td {
+  background: rgba(142, 142, 145, 0.04);
+}
+
+pre {
+  background: rgba(142, 142, 145, 0.12);
+  border-radius: 2px;
+  font-size: .8em;
+  margin: 1.5em 0;
+  padding: .8em 1.2em;
+  overflow-x: auto;
+}
+
+:not(pre) > code {
+  font-size: .9em;
+  background: rgba(142, 142, 145, 0.15);
+  opacity: .7;
+  border-radius: 2px;
+  margin: 0 .1em;
+  padding: .2em .4em;
+}
+
+body > header {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  align-items: center;
+}
+
+body > header > a {
+  font-size: 1.3em;
+  margin: .2em 0;
+}
+
+article header {
+  margin-bottom: 1.5em;
+}
+
+article header h1 {
+  font-size: 1.8em;
+  margin: 0;
+}
+
+nav {
+  margin: .4em -.8em;
+}
+
+nav a {
+  margin: .4em .8em;
+}
+
+body > header, article {
+  padding: 1.5em;
+}
+
+@media (min-width: 32em) {
+  body > header, article {
+    padding: 1.5em calc(38% - 12em);
+  }
+}
diff --git a/static/css/theme.css b/static/css/theme.css
deleted file mode 100644
index 5a02854..0000000
--- a/static/css/theme.css
+++ /dev/null
@@ -1,152 +0,0 @@
-@media (prefers-color-scheme: light) {
-  html {
-    background: #ffffff;
-    color: #1c1d22;
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-  html {
-    background: #1c1d22;
-    color: #ffffff;
-  }
-}
-
-body {
-  font-family: "PT Sans", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Roboto", sans-serif;
-  font-size: calc(0.8rem + 0.3vw);
-  font-weight: 400;
-  line-height: 1.6;
-  margin: 0;
-  -webkit-text-size-adjust: 100%;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  font-weight: 400;
-}
-
-b, strong, th {
-  font-weight: 600;
-}
-
-a {
-  color: inherit;
-  text-decoration: inherit;
-}
-
-a:hover {
-  text-decoration: underline;
-}
-
-article a {
-  color: #68f;
-}
-
-header time {
-  color: #8e8e91;
-}
-
-hr {
-  border: 1px solid rgba(142, 142, 145, 0.3);
-  margin: 2em 0;
-}
-
-blockquote {
-  background: rgba(142, 142, 145, 0.04);
-  border-left: 3px solid rgba(142, 142, 145, 0.7);
-  padding: 1px 1.5em;
-}
-
-blockquote p {
-  opacity: .7;
-}
-
-blockquote, figure {
-  margin: 1em 0;
-}
-
-img, li {
-  margin: .5em 0;
-}
-
-img {
-  border-radius: 2px;
-  max-width: 100%;
-  height: auto;
-}
-
-table {
-  width: 100%;
-  border-collapse: collapse;
-}
-
-th, td {
-  padding: .5em 1em;
-}
-
-tr {
-  border: 1px solid rgba(142, 142, 145, 0.2);
-}
-
-tr:hover, tr:nth-child(odd) td {
-  background: rgba(142, 142, 145, 0.04);
-}
-
-pre {
-  background: rgba(142, 142, 145, 0.12);
-  border-radius: 2px;
-  font-size: .8em;
-  margin: 1.5em 0;
-  padding: .8em 1.2em;
-  overflow-x: auto;
-}
-
-:not(pre) > code {
-  font-size: .9em;
-  background: rgba(142, 142, 145, 0.15);
-  opacity: .7;
-  border-radius: 2px;
-  margin: 0 .1em;
-  padding: .2em .4em;
-}
-
-body > header {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-  align-items: center;
-}
-
-body > header > a {
-  font-size: 1.3em;
-  margin: .2em 0;
-}
-
-article header {
-  margin-bottom: 1.5em;
-}
-
-article header h1 {
-  font-size: 2em;
-  margin: 0;
-}
-
-nav {
-  margin: .4em -.8em;
-}
-
-nav a {
-  margin: .4em .8em;
-}
-
-body > header, article {
-  padding: 1.5em;
-}
-
-@media (min-width: 32em) {
-  body > header, article {
-    padding: 1.5em calc(38% - 12em);
-  }
-}
-- 
cgit v1.2.3