Oops, a big commit with loads of stuff!

This commit is contained in:
Jez Cope 2021-04-03 21:03:34 +01:00
parent 58faa7587e
commit ed45333838
15 changed files with 158 additions and 81 deletions

View File

@ -89,6 +89,20 @@ h6, .content h6
ul
list-style-type: "- "
&.taxonomy-list
column-count: 4
.summary
@extend .hero
@extend .my-5
@extend .px-3
@extend .py-5
.single
@extend .my-5
@extend .px-3
@extend .py-5
.site-title
@extend h1
@ -97,6 +111,3 @@ h6, .content h6
&:before
content: none
.hero
background-color: $white-ter

View File

@ -17,5 +17,6 @@
{{ partial "header" . }}
{{ block "main" . }}{{ end }}
{{ partial "footer" . }}
{{ partial "scripts" . }}
</body>
</html>

6
layouts/_default/li.html Normal file
View File

@ -0,0 +1,6 @@
<li>
{{ .Date.Format .Site.Params.DateFormat }}:
<a href="{{ .RelPermalink }}">
{{ .Title }}
</a>
</li>

View File

@ -1,16 +1,24 @@
{{ define "main" }}
<main>
{{ if or .Title .Content }}
<div>
{{ with .Title }}<h1>{{ . }}</h1>{{ end }}
{{ with .Content }}<div>{{ . }}</div>{{ end }}
</div>
{{ end }}
<div class="container">
{{ if or .Title .Content }}
<div class="columns">
<div class="column is-8 is-offset-2">
{{ with .Title }}<h1>{{ . }}</h1>{{ end }}
{{ with .Content }}<div class="content">{{ . }}</div>{{ end }}
</div>
</div>
{{ end }}
{{ range .Paginator.Pages }}
{{ .Render "summary" }}
{{ end }}
{{ partial "pagination.html" . }}
<div class="columns mb-6">
<div class="column is-8 is-offset-2 content">
<ul class="list {{ .Kind }}-list">
{{ range sort .Pages "Title" "asc" }}
{{ .Render "li" }}
{{ end }}
</ul>
</div>
</div>
</div>
</main>
{{ partial "sidebar.html" . }}
{{ end }}

View File

@ -1,34 +1,28 @@
{{ define "main" }}
<main class="container">
<article class="mb-6">
<div class="columns">
<div class="column is-8 is-offset-2">
<h1>
{{ if ne .Type "posts" }}[{{ .Type | upper }}]{{ end }}
{{ .Title }}
</h1>
</div>
</div>
<div class="columns">
<div class="column is-2">
<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
{{ with .Params.tags }}
<div>
<ul id="tags">
{{ range . }}
<li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></li>
{{ end }}
</ul>
</div>
{{ end }}
</div>
<div class="column is-8">
<div class="content">
{{ .Content }}
<main>
<article class="single">
<div class="container">
<div class="columns">
<div class="column is-8 is-offset-2">
<h1>
{{ if ne .Type "posts" }}[{{ .Type | upper }}]{{ end }}
{{ .Title }}
</h1>
</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">
<div class="content">
{{ .Content }}
</div>
</div>
</div>
{{ partial "comments.html" . }}
</div>
{{ partial "comments.html" . }}
</article>
</main>
{{ end }}

View File

@ -1,21 +1,21 @@
<article class="my-6 container">
<div class="columns">
<div class="column is-8 is-offset-2">
<h2><a href="{{ .RelPermalink }}">{{ .Title }}</a></h1>
<article class="summary">
<div class="container">
<div class="columns">
<div class="column is-8 is-offset-2">
<h2><a href="{{ .RelPermalink }}">{{ .Title }}</a></h1>
</div>
</div>
</div>
<div class="columns">
<div class="column is-2">
<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
{{ range .Params.tags }}
<a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a>
{{ end }}
</div>
<div class="column is-8">
{{ .Summary }}
{{ if .Truncated }}
<a href="{{ .RelPermalink }}">Read more...</a>
{{ end }}
<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">
{{ .Summary }}
{{ if .Truncated }}
<a href="{{ .RelPermalink }}">Read more...</a>
{{ end }}
</div>
</div>
</div>
</article>

View File

@ -1,5 +1,5 @@
<div class="hero has-background-link-light">
<article class="my-6 container note">
<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>
@ -8,16 +8,14 @@
<div class="columns">
<div class="column is-2">
<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
{{ range .Params.tags }}
<a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a>
{{ end }}
{{ partial "tags.html" .Params.tags }}
</div>
<div class="column is-8 content">
{{ .Content }}
<p>
<a href="{{ .Params.link }}">go &gt;&gt;</a>
<a href="{{ .Params.link }}">&gt;&gt;&gt;</a>
</p>
</div>
</div>
</article>
</div>
</div>
</article>

View File

@ -1,16 +1,15 @@
<div class="hero has-background-info-light">
<article class="my-6 container note">
<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>
{{ range .Params.tags }}
<a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a>
{{ end }}
{{ partial "tags.html" .Params.tags }}
</div>
<div class="column is-8 content">
<div class="column is-8">
<div class="content">
{{ .Content }}
<!-- <p><a href="{{ .RelPermalink }}">Permalink</a></p> -->
</div>
</div>
</div>
</article>
</div>
</div>
</article>

26
layouts/page/single.html Normal file
View File

@ -0,0 +1,26 @@
{{ 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

@ -1,21 +1,21 @@
<div class="container">
<div class="container p-3">
<div class="columns">
<div class="column is-8 is-offset-2">
<nav class="navbar" role="navigation" aria-label="main navigation">
<div class="navbar-brand">
{{- if .IsHome -}}<h1 class="site-title navbar-item">{{- else -}}<div class="site-title navbar-item">{{- end -}}
<a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
{{- if .IsHome -}}</h1>{{- else -}}</div>{{- end -}}
</div>
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample">
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="nav-menu">
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
</a>
</div>
{{ with .Site.Menus.main }}
<div class="navbar-menu">
<div class="navbar-menu" id="nav-menu">
<div class="navbar-end">
{{ range . }}
<a class="navbar-item" href="{{ .URL | relURL }}">{{ .Name }}</a>

View File

@ -0,0 +1 @@
<script type="text/javascript" src="/js/navbar.js"></script>

View File

@ -0,0 +1,3 @@
{{ range . }}
<a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">[{{ . }}]</a>
{{ end }}

View File

@ -4,7 +4,7 @@
</p>
<div class="panel-block">
<div class="content">
{{ .Inner | markdownify }}
{{ .Inner | $.Page.RenderString }}
</div>
</div>
</div>

5
layouts/tags/li.html Normal file
View File

@ -0,0 +1,5 @@
<li>
<a href="{{ .RelPermalink }}">
{{ .Title }}
</a>
</li>

25
static/js/navbar.js Normal file
View File

@ -0,0 +1,25 @@
document.addEventListener('DOMContentLoaded', () => {
// Get all "navbar-burger" elements
const $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll('.navbar-burger'), 0);
// Check if there are any navbar burgers
if ($navbarBurgers.length > 0) {
// Add a click event on each of them
$navbarBurgers.forEach( el => {
el.addEventListener('click', () => {
// Get the target from the "data-target" attribute
const target = el.dataset.target;
const $target = document.getElementById(target);
// Toggle the "is-active" class on both the "navbar-burger" and the "navbar-menu"
el.classList.toggle('is-active');
$target.classList.toggle('is-active');
});
});
}
});