Compare commits

...

3 Commits

Author SHA1 Message Date
Jez Cope 35adcc1141 [WIP] Initial work on layout 2021-04-01 21:11:28 +01:00
Jez Cope 5cfa6aae0b Add Bulma as a submodule 2021-04-01 21:10:50 +01:00
Jez Cope 6d4c5de025 Get SCSS compilation working 2021-03-30 12:04:04 +01:00
10 changed files with 122 additions and 49 deletions

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "bulma"]
path = assets/style/bulma
url = https://github.com/jgthms/bulma.git

View File

@ -0,0 +1,3 @@
$main-font-family: 'Iosevka Etoile', sans-serif;
$header-font-family: 'Iosevka Aile', sans-serif;

1
assets/style/bulma Submodule

@ -0,0 +1 @@
Subproject commit 7efea70ecfc96a60300bb21a4788d4d22347418b

21
assets/style/main.scss Normal file
View File

@ -0,0 +1,21 @@
@charset "utf-8";
$family-sans-serif: "Iosevka Aile", sans-serif;
$family-serif: "Iosevka Etoile", serif;
$family-monospace: "Iosevka", monospace;
$family-primary: $family-serif;
@import 'bulma/bulma.sass';
h1, h2, h3, h4, h5, h6 {
font-family: $family-sans-serif;
}
h1 {
font-size: $size-large;
}
.site-title {
@extend h1;
}

View File

@ -7,7 +7,8 @@
<title>{{ .Title }}</title>
{{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }}
{{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
<link rel="stylesheet" href="{{ "css/style.css" | relURL }}">
{{ $style := resources.Get "style/main.scss" | resources.ToCSS }}
<link rel="stylesheet" href="{{ $style.Permalink }}">
{{ with .OutputFormats.Get "RSS" -}}
{{ printf `<link rel="%s" type="%s" href="%s" title="%s">` .Rel .MediaType.Type .RelPermalink $.Site.Title | safeHTML }}
{{- end }}

View File

@ -1,26 +1,36 @@
{{ define "main" }}
<main>
<article>
<h1>{{ .Title }}</h1>
<time>{{ .Date.Format "02.01.2006 15:04" }}</time>
<div>
{{ .Content }}
<main class="container">
<article>
<div class="columns">
<div class="column is-8 is-offset-2">
<h1>{{ .Title }}</h1>
</div>
{{ with .Params.tags }}
<div>
<ul id="tags">
{{ range . }}
<li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></li>
{{ end }}
</ul>
</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>
{{ end }}
{{ with .Site.DisqusShortname }}
<div>
{{ template "_internal/disqus.html" . }}
<div class="column is-8">
<div class="content">
{{ .Content }}
</div>
</div>
{{ end }}
</article>
</main>
</div>
{{ with .Site.DisqusShortname }}
<div>
{{ template "_internal/disqus.html" . }}
</div>
{{ end }}
</article>
</main>
{{ partial "sidebar.html" . }}
{{ end }}

View File

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

View File

@ -1,10 +1,23 @@
{{ define "main" }}
<main>
<section class="hero">
<div class="hero-body">
<div class="container">
<div class="columns">
<div class="column is-8 is-offset-2">
{{ with .Site.Params.Description }}{{.}}{{ end }}
</div>
</div>
</div>
</div>
</section>
<main class="section">
<div class="container">
{{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}
{{ range $paginator.Pages }}
{{ .Render "summary" }}
{{ .Render "summary" }}
{{ end }}
{{ partial "pagination.html" . }}
</main>
{{ partial "sidebar.html" . }}
</div>
</main>
{{ end }}

View File

@ -1,12 +1,23 @@
<header>
<a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
{{ with .Site.Menus.main }}
<nav>
<ul>
{{ range . }}
<li><a href="{{ .URL | relURL }}">{{ .Name }}</a></li>
{{ end }}
</ul>
</nav>
{{ end }}
</header>
<div class="container">
<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>
{{ with .Site.Menus.main }}
<div class="navbar-menu">
<div class="navbar-end">
{{ range . }}
<a class="navbar-item" href="{{ .URL | relURL }}">{{ .Name }}</a>
{{ end }}
</div>
</div>
{{ end }}
</nav>
</div>
</div>
</div>

View File

@ -1,4 +1,5 @@
<div>
<footer class="columns">
<div class="column is-8 is-offset-2">
{{ if .Paginator.HasPrev }}
<a href="{{ .Paginator.Prev.URL }}">Previous Page</a>
{{ end }}
@ -6,4 +7,5 @@
{{ if .Paginator.HasNext }}
<a href="{{ .Paginator.Next.URL }}">Next Page</a>
{{ end }}
</div>
</div>
</footer>