merge upstream

This commit is contained in:
Niklas Buschmann 2020-02-03 20:44:17 +01:00
parent 67748a2513
commit 89e8c3eba4
5 changed files with 70 additions and 4 deletions

View File

@ -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 }}

View File

@ -0,0 +1 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css">

View File

@ -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>
<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>

View File

@ -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;
}

58
static/css/sidebar.css Normal file
View File

@ -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;
}