From 3bb959dc9aa6955c1d67f45d811a1af7496f3d80 Mon Sep 17 00:00:00 2001 From: kengrimes Date: Sun, 8 Apr 2018 14:41:59 -0700 Subject: [PATCH] major refactor, card pagination beta testing --- layouts/_default/baseof.html | 20 +-- layouts/_default/baseof.html~ | 59 --------- layouts/_default/list.html | 52 +++++--- layouts/_default/list.html~ | 3 - layouts/_default/single.html | 24 ++-- layouts/_default/single.html~ | 3 - layouts/partials/footer.html | 0 layouts/partials/header.html | 0 static/css/main.css | 222 ---------------------------------- static/img/home.png | Bin 27439 -> 0 bytes static/img/nav.svg | 2 +- static/img/nav.svg~ | 24 ---- static/js/main.js | 55 --------- 13 files changed, 58 insertions(+), 406 deletions(-) delete mode 100644 layouts/_default/baseof.html~ delete mode 100644 layouts/_default/list.html~ delete mode 100644 layouts/_default/single.html~ delete mode 100644 layouts/partials/footer.html delete mode 100644 layouts/partials/header.html delete mode 100644 static/css/main.css delete mode 100644 static/img/home.png delete mode 100644 static/img/nav.svg~ delete mode 100644 static/js/main.js diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 1f102a4..3f7a35d 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,8 +2,8 @@ {{ .Site.Title }}{{ if .Page.Title }} :: {{ .Page.Title }}{{ end }} - - + + {{ .Hugo.Generator }} @@ -11,12 +11,12 @@
{{- $sp := .Site.GetPage "section" .Section }} - {{- $ph := .Page.Resources.GetMatch "header.png" -}} - {{- $ph := cond (not $ph) ($sp.Resources.GetMatch "header.png") $ph }} - {{- $ph := cond (not $ph) (relURL "/img/speedy.png") $ph.RelPermalink }} + {{- $sh := cond (or (not $sp.Params.header) (not (fileExists (printf "static/%s" $sp.Params.header)))) (cond (or (not .Site.Home.Params.header) (not (fileExists (printf "static/%s" .Site.Home.Params.header)))) "/img/speedy.png" .Site.Home.Params.header) $sp.Params.header }} + {{- $sc := cond (or (not $sp.Params.caption)) (cond (not .Site.Home.Params.caption) .Site.Title .Site.Home.Params.caption) $sp.Params.caption }} + {{- $ph := cond (or (not .Params.header) (not (fileExists (printf "static/%s" .Params.header)))) $sh .Params.header }}
- {{ $caption := cond (not .Page.Params.caption) (cond (not $sp.Params.caption) .Site.Title $sp.Params.caption) .Page.Params.caption }} + {{ $caption := cond (not .Params.caption) $sc .Params.caption }} {{- if (eq (printf "%T" $caption) "string") }} {{- $caption -}} {{- else }} @@ -33,11 +33,11 @@