merge upstream

This commit is contained in:
Niklas Buschmann 2020-02-03 20:19:33 +01:00
parent dc9cb278f6
commit 67748a2513
2 changed files with 6 additions and 3 deletions

View File

@ -7,11 +7,14 @@
<meta name="description" content="{{ .Description | default .Site.Params.description }}"> <meta name="description" content="{{ .Description | default .Site.Params.description }}">
{{- end }} {{- end }}
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <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 }}css/classes.css">
<link rel="stylesheet" href="{{ .Site.BaseURL }}fonts/PT-Sans.css"> <link rel="stylesheet" href="{{ .Site.BaseURL }}fonts/PT-Sans.css">
<link rel="canonical" href="{{ .Permalink }}"> <link rel="canonical" href="{{ .Permalink }}">
<link rel="alternate" type="application/rss+xml" href="{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }}{{ end }}" title="{{ .Site.Title }}"> <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 }} {{- if or .Params.math .Site.Params.math }}
{{ partial "math.html" . }} {{ partial "math.html" . }}
{{- end }} {{- end }}
@ -20,7 +23,7 @@
<a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a> <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
<nav> <nav>
{{ range .Site.Menus.main }} {{ range .Site.Menus.main }}
<a href="{{ .URL }}">{{ .Name }}</a> <a href="{{ .URL }}">{{ .Pre }}{{ .Name }}{{ .Post }}</a>
{{ end }} {{ end }}
</nav> </nav>
</header> </header>

View File

@ -129,7 +129,7 @@ article header {
} }
article header h1 { article header h1 {
font-size: 2em; font-size: 1.8em;
margin: 0; margin: 0;
} }