From 74b08eaf7aa726b4e093a324ece8dc61c370f1bd Mon Sep 17 00:00:00 2001 From: Brandon Rozek Date: Wed, 15 Jan 2020 22:07:43 -0500 Subject: [PATCH] Pulp modifications as shown at brandonrozek.com --- assets/css/style.css | 23 ++++++++++++++--------- layouts/_default/list.html | 1 - layouts/_default/single.html | 5 +---- layouts/blog/baseof.html | 7 +++++++ layouts/blog/list.html | 30 ++++++++++++++++++++++++++++++ layouts/blog/list.json | 9 +++++++++ layouts/blog/single.html | 12 ++++++++++++ layouts/index.html | 2 +- layouts/partials/footer.html | 8 +++++++- layouts/partials/head.html | 2 +- 10 files changed, 82 insertions(+), 17 deletions(-) create mode 100644 layouts/blog/baseof.html create mode 100644 layouts/blog/list.html create mode 100644 layouts/blog/list.json create mode 100644 layouts/blog/single.html diff --git a/assets/css/style.css b/assets/css/style.css index 145863a..989f270 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -7,28 +7,28 @@ body { padding: 20px; box-sizing:border-box; background-color: #EFEFEF; - color: #707070; + color: #575757; text-align: center; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: 'Open Sans', -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; line-height: 1.5; - font-size: 16px; + font-size: 1.05rem; word-wrap: break-word; } a:link { - color: #707070; + color: #575757; } a:visited { - color: #707070; + color: #575757; } a:hover { - color: #707070; + color: #575757; } a:active { - color: #707070; + color: #575757; } /* Header */ @@ -72,14 +72,15 @@ footer { nav ul { display: flex; justify-content: space-evenly; - max-width: 300px; + /* max-width: 300px; */ margin: 20px auto; padding: 0; list-style: none; + flex-wrap: wrap; } nav li { - flex: 1; + margin: 10px; } /* Contents List */ @@ -170,3 +171,7 @@ nav li { padding: 20px 0; text-align: left; } + +.title { + font-family: 'Comfortaa'; +} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index f98242d..3df77db 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -14,7 +14,6 @@ {{ if (ne $index 0) }}
{{ end }} -

{{ .Key }}

{{ range .Pages }}

{{ .Title }}

{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index ea6919a..3b8774f 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,9 +1,6 @@ {{ define "main"}} -

{{ .Title }}

+

{{ .Title }}

{{ partial "header.html" . }} - - {{ $singlePageDateFormat := .Site.Params.singlePageDateFormat | default "January 2, 2006"}} -

{{ .Date.Format $singlePageDateFormat }}

{{ .Content }} diff --git a/layouts/blog/baseof.html b/layouts/blog/baseof.html new file mode 100644 index 0000000..0ab5755 --- /dev/null +++ b/layouts/blog/baseof.html @@ -0,0 +1,7 @@ + + + {{ partial "head.html" . }} + + {{ block "main" . }}{{ end }} + + diff --git a/layouts/blog/list.html b/layouts/blog/list.html new file mode 100644 index 0000000..f98242d --- /dev/null +++ b/layouts/blog/list.html @@ -0,0 +1,30 @@ +{{ define "main"}} + {{ partial "header.html" . }} + + + +
+ +
+ {{ $listPageDateFormat := .Site.Params.listPageDateFormat | default "January, 2006"}} + {{ range $index, $value := .Pages.GroupByDate $listPageDateFormat }} + {{ if (ne $index 0) }} +
+ {{ end }} +

{{ .Key }}

+ {{ range .Pages }} +

{{ .Title }}

+ {{ end }} + {{ end }} +
+ {{ partial "footer.html" . }} + {{ $jquery := resources.Get "js/jquery-3.3.1.min.js" }} + {{ $mark := resources.Get "js/jquery.mark.es6.min.js" }} + {{ $lunr := resources.Get "js/lunr.js" }} + {{ $search := resources.Get "js/search.js" }} + {{ $js := slice $jquery $mark $lunr $search | resources.Concat "bundle.js" | resources.Minify | resources.Fingerprint }} + +{{ end }} diff --git a/layouts/blog/list.json b/layouts/blog/list.json new file mode 100644 index 0000000..0fa510c --- /dev/null +++ b/layouts/blog/list.json @@ -0,0 +1,9 @@ +[{{ range $index, $page := .Pages }}{{ if ne $index 0 }},{{ end }} + { + "ref": "{{ $page.Permalink }}", + "title": {{ $page.Title | jsonify }}, + "section": "{{ $page.Section }}", + "date" : {{ $page.Date.Format "2006.01.02" | jsonify }}, + "body": {{ $page.Plain | jsonify }} + } +{{ end }}] diff --git a/layouts/blog/single.html b/layouts/blog/single.html new file mode 100644 index 0000000..8aed3ef --- /dev/null +++ b/layouts/blog/single.html @@ -0,0 +1,12 @@ +{{ define "main"}} +

{{ .Title }}

+ {{ partial "header.html" . }} + + {{ $singlePageDateFormat := .Site.Params.singlePageDateFormat | default "January 2, 2006"}} +

{{ .Date.Format $singlePageDateFormat }}

+ +
+ {{ .Content }} +
+ {{ partial "footer.html" . }} +{{ end }} diff --git a/layouts/index.html b/layouts/index.html index ce98446..6bba63b 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -11,7 +11,7 @@ avatar-border
-

{{ .Site.Params.Author }}

+

{{ .Site.Params.Author }}

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index a35c5a4..ca75678 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -2,9 +2,15 @@

© {{ .Site.Params.publicationYear }} {{ .Site.Params.Author }}. Powered by Hugo - using the pulp theme. + using a modified version of the pulp theme.

+ + {{- range .Site.Params.custom_js -}} {{ end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 9bc849d..3c274f4 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -19,7 +19,7 @@ {{ $css := slice $style $markdown $syntaxHighlight | resources.Concat "style.css" | resources.Minify | resources.Fingerprint }} - + {{ range .Site.Params.custom_css }}