diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 917ca38..5ee4497 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,6 +1,11 @@ {{ define "main" -}} <ul class="posts"> <h1>{{ .Title }}</h1> + <div class="homepage-content"> + <!-- Note that the content for index.html, as a sort of list page, will pull from content/_index.md --> + {{ .Content }} + </div> + {{ range .Data.Pages -}} <li> <div class="flex"> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 3dd0886..b034420 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -3,11 +3,6 @@ <h1 class="title">{{ .Title }}</h1> {{ with .Params.tagline }}<span class="tagline">{{ . }}</span>{{ end }} - {{ if ne .Type "page" -}} - <div class="post-date"> - <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time> <span class="readtime">· {{ .ReadingTime }} min read</span> - </div> - {{- end }} <div> {{ .Content }} diff --git a/layouts/index.html b/layouts/index.html index f66109b..015ff87 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,16 +1,21 @@ {{ define "main" -}} + <div class="homepage-content"> + <!-- Note that the content for index.html, as a sort of list page, will pull from content/_index.md --> + {{ .Content }} + </div> + <h2>Latest Updates</h2> <div class="posts"> {{- $pages := where .Site.RegularPages "Type" "in" .Site.Params.MainSections -}} {{- $paginator := .Paginate $pages -}} {{ range $paginator.Pages }} <article class="post"> - <h1 class="post-title"> + <h3> <a href="{{ .Permalink }}">{{ .Title }}</a> - </h1> + </h3> <div class="post-date"> - <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time> · {{ .ReadingTime }} min read + <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time> </div> <div> @@ -25,4 +30,6 @@ </div> {{ template "_internal/pagination.html" . }} + {{- end }} +