From 56ce3fcba02605f4102d68ea751687508c9c3283 Mon Sep 17 00:00:00 2001 From: Niklas Buschmann Date: Tue, 18 Feb 2020 17:49:01 +0100 Subject: [PATCH] merge upstream --- README.md | 27 +++++++-------------------- layouts/_default/baseof.html | 16 +++++++++++++--- static/css/sidebar.css | 4 +--- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index db91b5e..3a2eabe 100644 --- a/README.md +++ b/README.md @@ -22,31 +22,18 @@ An example `config.yaml` section could look like this: ```yaml params: sidebar: true + show_excerpts: true fontawesome: true description: 'Made by Blog Author' menu: main: - - identifier: "home" - name: "Home" - url: "/" - weight: 1 - pre: "" - - identifier: "about" - name: "About" - url: "/about/" - weight: 2 - pre: "" - - identifier: "github" - name: "Github" - url: "https://github.com/" - weight: 3 - pre: "" - - identifier: "feed" - name: "Subscribe" - url: "/index.xml" - weight: 4 - pre: "" + - {name: "Home", url: "/", identifier: "home", weight: 1, pre: ""} + - {name: "About", url: "/about/", identifier: "address-card", weight: 2, pre: ""} + remote: + - {name: "Mail", url: "mailto:", identifier: "envelope", weight: 3, pre: ""} + - {name: "Github", url: "https://github.com/", identifier: "github", weight: 4, pre: ""} + - {name: "Subscribe", url: "/index.xml", identifier: "rss", weight: 5, pre: ""} ``` ## Features diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 38d1222..ca2bd67 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -24,9 +24,19 @@
- {{ if not (gt (len .Site.Menus) 1) }}{{ .Site.Title }}{{ end }} - {{ range .Site.Menus }}{{ end }} - {{ with .Site.Params.description }}{{ 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/static/css/sidebar.css b/static/css/sidebar.css index aeb3a0c..bdfd436 100644 --- a/static/css/sidebar.css +++ b/static/css/sidebar.css @@ -51,10 +51,8 @@ article header h1 { font-size: 2em; } -header > div { - position: absolute; +.description { margin: 2em 0; - bottom: 0; } .hidden {