From a136fa977b90c656b705c9589a2236b892324836 Mon Sep 17 00:00:00 2001 From: Niklas Buschmann Date: Tue, 18 Feb 2020 17:40:33 +0100 Subject: [PATCH] merge upstream --- layouts/_default/baseof.html | 4 +++- layouts/_default/list.html | 21 ++++++++++++++++++++- static/css/classes.css | 17 +++++++++++++++++ static/css/index.css | 9 ++++++--- 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 047eee0..38d1222 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -21,14 +21,16 @@ {{ partial "math.html" . }} {{- end }} + +
{{ if not (gt (len .Site.Menus) 1) }}{{ .Site.Title }}{{ end }} {{ range .Site.Menus }}{{ end }} {{ with .Site.Params.description }}{{ end }}
- {{- block "main" . }}{{- end }} + diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 543e095..fc3c753 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -3,9 +3,26 @@ {{ $Pages := .Pages }} {{ if .IsHome }} - {{ $Pages = where site.RegularPages "Type" "in" site.Params.mainSections }} + {{ $Pages = where site.RegularPages "Type" "in" .Site.Params.mainSections }} {{ end }} +{{ if .Site.Params.show_excerpts }} + +{{- range $Pages }} +
+
+

{{ .Title }}

+ {{ if .Date }}{{ end }} +
+ {{ .Summary }} + {{- if .Truncated }} +
read more
+ {{- end }} +
+{{- end }} + +{{ else }} +

{{ .Title | default "Posts" | humanize }}

{{ end }} + +{{ end }} diff --git a/static/css/classes.css b/static/css/classes.css index 0fef62e..dbe607e 100644 --- a/static/css/classes.css +++ b/static/css/classes.css @@ -12,6 +12,23 @@ display: none; } +.more { + margin: 2em 0 1em; +} + +.more a { + border-radius: 2px; + border: 1.5px solid #68f; + padding: .4em .8em; + transition: .2s; +} + +.more a:hover { + color: #fff; + background: #68f; + text-decoration: inherit; +} + .fa, .fab, .fad, .fal, .far, .fas { margin-right: 1.2em; } diff --git a/static/css/index.css b/static/css/index.css index 8e81799..af56f84 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -72,6 +72,10 @@ hr { margin: 2em 0; } +article:not(:last-child) { + border-bottom: 1px solid rgba(142, 142, 145, 0.12); +} + blockquote { background: rgba(142, 142, 145, 0.06); border-left: 3px solid rgba(142, 142, 145, 0.9); @@ -138,7 +142,6 @@ body > header { body > header > a { font-size: 1.3em; - margin: .2em 0; } article header { @@ -151,11 +154,11 @@ article header h1 { } nav { - margin: .4em -.8em; + margin: .5em -.8em; } nav a { - margin: .4em .8em; + margin: .5em .8em; } body > header, body > article, body > footer {