Major refactor of layouts to remove duplication

This commit is contained in:
Jez Cope 2021-04-04 16:06:05 +01:00
parent 8c88512735
commit 444defc10d
16 changed files with 37 additions and 83 deletions

View File

@ -100,6 +100,12 @@ h6, .content h6
@extend .px-3
@extend .py-5
.link-summary
@extend .has-background-link-light
.note-summary
@extend .has-background-info-light
.single
@extend .my-5
@extend .px-3

View File

@ -0,0 +1,2 @@
<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
{{ partial "tags.html" .Params.tags }}

View File

@ -0,0 +1,4 @@
{{ .Summary }}
{{ if .Truncated }}
<a href="{{ .RelPermalink }}">Read more...</a>
{{ end }}

View File

@ -0,0 +1 @@
[{{ .Type | upper }}] {{ .Title }}

View File

@ -4,16 +4,12 @@
<div class="container">
<div class="columns">
<div class="column is-8 is-offset-2">
<h1>
{{ if ne .Type "posts" }}[{{ .Type | upper }}]{{ end }}
{{ .Title }}
</h1>
<h1>{{ .Render "frag/title" }}</h1>
</div>
</div>
<div class="columns">
<div class="column is-2">
<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
{{ partial "tags.html" .Params.tags }}
{{ .Render "frag/metadata" }}
</div>
<div class="column is-8">
<div class="content">
@ -21,7 +17,7 @@
</div>
</div>
</div>
{{ partial "comments.html" . }}
{{ partial "comments" . }}
</div>
</article>
</main>

View File

@ -1,20 +1,19 @@
<article class="summary">
<article class="summary {{ .Type }}-summary">
<div class="container">
<div class="columns">
<div class="column is-8 is-offset-2">
<h2><a href="{{ .RelPermalink }}">{{ .Title }}</a></h1>
{{ if ne .Type "note" }}
<div class="columns">
<div class="column is-8 is-offset-2">
<h2><a href="{{ with .Params.link }}{{.}}{{ else }}{{ .RelPermalink }}{{ end }}">
{{ .Render "frag/title" }}</a></h2>
</div>
</div>
</div>
{{ end }}
<div class="columns">
<div class="column is-2">
<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
{{ partial "tags.html" .Params.tags }}
{{ .Render "frag/metadata" }}
</div>
<div class="column is-8">
{{ .Summary }}
{{ if .Truncated }}
<a href="{{ .RelPermalink }}">Read more...</a>
{{ end }}
<div class="column is-8 content">
{{ .Render "frag/summary-content" }}
</div>
</div>
</div>

View File

@ -17,6 +17,6 @@
{{ range $paginator.Pages }}
{{ .Render "summary" }}
{{ end }}
{{ partial "pagination.html" . }}
{{ partial "pagination" . }}
</main>
{{ end }}

View File

@ -0,0 +1,4 @@
{{ .Content }}
<p>
<a href="{{ .Params.link }}">&gt;&gt;&gt;</a>
</p>

View File

@ -1,21 +0,0 @@
<article class="summary link has-background-link-light">
<div class="container">
<div class="columns">
<div class="column is-8 is-offset-2">
<h2><a href="{{ .Params.link }}">[LINK] {{ .Title }}</a></h2>
</div>
</div>
<div class="columns">
<div class="column is-2">
<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
{{ partial "tags.html" .Params.tags }}
</div>
<div class="column is-8 content">
{{ .Content }}
<p>
<a href="{{ .Params.link }}">&gt;&gt;&gt;</a>
</p>
</div>
</div>
</div>
</article>

View File

@ -0,0 +1 @@
{{ .Content }}

View File

@ -1,15 +0,0 @@
<article class="summary note has-background-info-light">
<div class="container">
<div class="columns">
<div class="column is-2">
<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
{{ partial "tags.html" .Params.tags }}
</div>
<div class="column is-8">
<div class="content">
{{ .Content }}
</div>
</div>
</div>
</div>
</article>

View File

@ -0,0 +1 @@
{{ partial "tags" .Params.tags }}

View File

@ -0,0 +1 @@
{{ .Title }}

View File

@ -1,26 +0,0 @@
{{ define "main" }}
<main>
<article class="single">
<div class="container">
<div class="columns">
<div class="column is-8 is-offset-2">
<h1>
{{ .Title }}
</h1>
</div>
</div>
<div class="columns">
<div class="column is-2">
{{ partial "tags.html" .Params.tags }}
</div>
<div class="column is-8">
<div class="content">
{{ .Content }}
</div>
</div>
</div>
{{ partial "comments.html" . }}
</div>
</article>
</main>
{{ end }}

View File

@ -2,7 +2,7 @@
<div class="container">
<div class="columns">
<footer class="column is-8 is-offset-2 has-text-centered">
{{ partial "social.html" . }}
{{ partial "social" . }}
<p>
&copy; {{ now.Year }}
<a href="{{ .Site.BaseURL }}">{{ .Site.Params.Author }}</a>

View File

@ -0,0 +1 @@
{{ .Title }}