From 440942620571ddb4db8df35a56023047aabccf0e Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 14 Apr 2018 02:08:43 -0400 Subject: [PATCH] Added sidebar component. Added entry frontmatter. Tweaked padding for heros. --- layouts/_default/baseof.html | 20 +++++++- layouts/_default/single.html | 8 ++- layouts/entry/single.html | 53 ++++++++++++++++++++ layouts/entry/summary.html | 1 + layouts/partials/entry/summary.html | 48 ++++++++++++++++++ layouts/partials/home_hero.html | 2 +- layouts/partials/layout/navbar_contents.html | 10 ++-- 7 files changed, 130 insertions(+), 12 deletions(-) create mode 100644 layouts/entry/single.html create mode 100644 layouts/entry/summary.html create mode 100644 layouts/partials/entry/summary.html diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 6e6a52e..5d5c5d9 100755 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -52,7 +52,25 @@ {{ .Render "header" }} - {{ block "main" . }}{{ end }} + {{ block "header" . }}{{ end }} + + {{ $full_width := .Params.FullWidth | default false }} + {{ if eq $full_width true }} +
+ {{ block "main" . }}{{ end }} +
+ {{ else }} +
+
+
+ {{ block "main" . }}{{ end }} +
+
+ {{ partial "layout/sidebar" }} +
+
+
+ {{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b7dea75..8e7d4aa 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,10 +1,8 @@ {{ define "main" }}
-
-

{{ .Title }}

-
- {{ .Content }} -
+

{{ .Title }}

+
+ {{ .Content }}
{{ end }} \ No newline at end of file diff --git a/layouts/entry/single.html b/layouts/entry/single.html new file mode 100644 index 0000000..f001438 --- /dev/null +++ b/layouts/entry/single.html @@ -0,0 +1,53 @@ +{{ define "header" }} +{{ $author := index .Site.Data.authors ( .Params.author | default "" ) }} +
+
+
+   +
+
+
+
+ {{ .Title }} +
+ {{ if $author }} +
+ + Written by {{ $author.name }} + on {{ .Date.Format "January 02 2006" }} + +
+ {{ else }} +
+ + Written on {{ .Date.Format "January 02 2006" }} + +
+ {{ end }} +
+
+
+
+{{ end }} + +{{ define "main" }} +
+ {{ .Content }} +
+ + +{{ end }} \ No newline at end of file diff --git a/layouts/entry/summary.html b/layouts/entry/summary.html new file mode 100644 index 0000000..aeac35a --- /dev/null +++ b/layouts/entry/summary.html @@ -0,0 +1 @@ +{{ partial "entry/summary" . }} \ No newline at end of file diff --git a/layouts/partials/entry/summary.html b/layouts/partials/entry/summary.html new file mode 100644 index 0000000..fb18084 --- /dev/null +++ b/layouts/partials/entry/summary.html @@ -0,0 +1,48 @@ +{{ if .Params.twitter }} +
+ + + + + TWITTER {{ .Title }} + +
+{{ else }} +{{ $author := index .Site.Data.authors ( .Params.author | default "" ) }} +
+
+   +
+
+
+
+ {{ .Title }} +
+ {{ if $author }} +
+ + Written by {{ $author.name }} + on {{ .Date.Format "January 02 2006" }} + +
+ {{ else }} +
+ + Written on {{ .Date.Format "January 02 2006" }} + +
+ {{ end }} +
+ + {{ .Summary }} + +
+
+ + Read More + +
+
+
+
+{{ end }} \ No newline at end of file diff --git a/layouts/partials/home_hero.html b/layouts/partials/home_hero.html index 01c0638..02e9521 100644 --- a/layouts/partials/home_hero.html +++ b/layouts/partials/home_hero.html @@ -6,7 +6,7 @@
-
+
diff --git a/layouts/partials/layout/navbar_contents.html b/layouts/partials/layout/navbar_contents.html index 6b7cf83..5cd2bd9 100644 --- a/layouts/partials/layout/navbar_contents.html +++ b/layouts/partials/layout/navbar_contents.html @@ -14,7 +14,7 @@
{{ $currentPage := . }} {{ range .Site.Menus.main }} {{ if .HasChildren }}
- + {{ .Name }} @@ -30,7 +30,7 @@
{{ else }} - + {{ .Name }} {{ end }} {{ end }} @@ -48,17 +48,17 @@
- + - + - +