summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Pearce2020-01-10 19:57:53 +0100
committerAlan Pearce2020-01-10 19:57:53 +0100
commitd5857f9dbecd498e341c8cb5d0866749c5c554c7 (patch)
tree5cff905e9c834c0ca7baed5ef43e38643e97227e
parent7befbf2f991e217aa4d52615f9f430cae30897f5 (diff)
downloadwebsite-d5857f9dbecd498e341c8cb5d0866749c5c554c7.tar.xz
website-d5857f9dbecd498e341c8cb5d0866749c5c554c7.zip
Squashed 'themes/xmin/' changes from 982dfb3..aa6eb5a
aa6eb5a Make post template microformats-compatible 217445a Support XFN 6365d4b Improve semanticity ccbf84f Remove useless main tag ee3e939 Show tags as article metadata 6394af8 Add support for alternative output formats (e.g. RSS) b85fdab Remove non-semantic hr tags from layout 311e7f3 Make 404 page less shouty 773e2d4 Convert to block-based templates 791259e Alphabetically sort CSS properties f61a5f2 Use ISO8601 date format 6d06143 Remove custom fonts git-subtree-dir: themes/xmin git-subtree-split: aa6eb5a51f3bdbc4e7c621d2a36701ef57ce0143
-rw-r--r--layouts/404.html6
-rw-r--r--layouts/_default/baseof.html31
-rw-r--r--layouts/_default/list.html6
-rw-r--r--layouts/_default/single.html30
-rw-r--r--layouts/_default/terms.html4
-rw-r--r--layouts/partials/header.html1
-rw-r--r--static/css/fonts.css7
-rw-r--r--static/css/style.css31
8 files changed, 77 insertions, 39 deletions
diff --git a/layouts/404.html b/layouts/404.html
index c2e4e40..2f77920 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,5 +1,5 @@
1{{ partial "header.html" . }} 1{{ define "main" }}
2 2
3404 NOT FOUND 3404 Not Found
4 4
5{{ partial "footer.html" . }} 5{{- end }}
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
new file mode 100644
index 0000000..6757396
--- /dev/null
+++ b/layouts/_default/baseof.html
@@ -0,0 +1,31 @@
1<!DOCTYPE html>
2<html lang="{{ .Site.LanguageCode }}">
3 <head profile="//gmpg.org/xfn/11">
4 <meta charset="utf-8">
5 <meta name="viewport" content="width=device-width, initial-scale=1">
6 <title>{{ .Title }} | {{ .Site.Title }}</title>
7 <link rel="stylesheet" href="{{ "/css/style.css" | relURL }}" />
8 {{ range .AlternativeOutputFormats -}}
9 {{ printf `<link href="%s" rel="%s" type="%s" title="%s" />` .Permalink .Rel .MediaType.Type $.Site.Title | safeHTML }}
10 {{ end -}}
11 </head>
12
13 <body>
14 <nav>
15 <ul>
16 {{ range .Site.Menus.main }}
17 <li><a href="{{ .URL | relURL }}">{{ .Name }}</a></li>
18 {{ end }}
19 </ul>
20 </nav>
21
22 {{ block "main" . }}
23 {{ end }}
24
25 <footer>
26 {{ with .Site.Params.footer }}
27 {{ . | markdownify }}
28 {{ end }}
29 </footer>
30 </body>
31</html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 06b290a..bf0af50 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,4 +1,4 @@
1{{ partial "header.html" . }} 1{{ define "main" }}
2 2
3{{if not .IsHome }} 3{{if not .IsHome }}
4<h1>{{ .Title | markdownify }}</h1> 4<h1>{{ .Title | markdownify }}</h1>
@@ -11,10 +11,10 @@
11 {{ if .IsHome }}{{ $pages = .Site.RegularPages }}{{ end }} 11 {{ if .IsHome }}{{ $pages = .Site.RegularPages }}{{ end }}
12 {{ range (where $pages "Section" "!=" "") }} 12 {{ range (where $pages "Section" "!=" "") }}
13 <li> 13 <li>
14 <span class="date">{{ .Date.Format "2006/01/02" }}</span> 14 <span class="date">{{ .Date.Format "2006-01-02" }}</span>
15 <a href="{{ .RelPermalink }}">{{ .Title | markdownify }}</a> 15 <a href="{{ .RelPermalink }}">{{ .Title | markdownify }}</a>
16 </li> 16 </li>
17 {{ end }} 17 {{ end }}
18</ul> 18</ul>
19 19
20{{ partial "footer.html" . }} 20{{- end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index de3f121..54acdc6 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,12 +1,20 @@
1{{ partial "header.html" . }} 1{{ define "main" }}
2<div class="article-meta"> 2<article class="h-entry">
3<h1><span class="title">{{ .Title | markdownify }}</span></h1> 3 <header>
4{{ with .Params.author }}<h2 class="author">{{ . }}</h2>{{ end }} 4 <h1><span class="title p-name">{{ .Title | markdownify }}</span></h1>
5{{ if (gt .Params.date 0) }}<h2 class="date">{{ .Date.Format "2006/01/02" }}</h2>{{ end }} 5 {{ with .Params.author }}<h2 class="author">{{ . }}</h2>{{ end }}
6</div> 6 {{ if (gt .Params.date 0) }}<time class="dt-published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "2006-01-02" }}</time>{{ end }}
7 <p class="terms">
8 {{ range $i := (slice "categories" "tags") }}
9 {{ with ($.Param $i) }}
10 {{ $i | title }}: {{ range $k := . }}<a href="{{ relURL (print "/" $i "/" $k | urlize) }}">{{$k}}</a> {{ end }}
11 {{ end }}
12 {{ end }}
13 </p>
14 </header>
7 15
8<main> 16 <main class="e-content">
9{{ .Content }} 17 {{ .Content }}
10</main> 18 </main>
11 19</article>
12{{ partial "footer.html" . }} 20{{- end }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 71f47e7..15de7a9 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,4 +1,4 @@
1{{ partial "header.html" . }} 1{{ define "main" }}
2 2
3<h1>{{ .Title }}</h1> 3<h1>{{ .Title }}</h1>
4 4
@@ -10,4 +10,4 @@
10 {{ end }} 10 {{ end }}
11</ul> 11</ul>
12 12
13{{ partial "footer.html" . }} 13{{- end }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 4f431eb..b3dbf64 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -5,7 +5,6 @@
5 <meta name="viewport" content="width=device-width, initial-scale=1"> 5 <meta name="viewport" content="width=device-width, initial-scale=1">
6 <title>{{ .Title }} | {{ .Site.Title }}</title> 6 <title>{{ .Title }} | {{ .Site.Title }}</title>
7 <link rel="stylesheet" href="{{ "/css/style.css" | relURL }}" /> 7 <link rel="stylesheet" href="{{ "/css/style.css" | relURL }}" />
8 <link rel="stylesheet" href="{{ "/css/fonts.css" | relURL }}" />
9 {{ partial "head_custom.html" . }} 8 {{ partial "head_custom.html" . }}
10 </head> 9 </head>
11 10
diff --git a/static/css/fonts.css b/static/css/fonts.css
deleted file mode 100644
index 8ffcecd..0000000
--- a/static/css/fonts.css
+++ /dev/null
@@ -1,7 +0,0 @@
1body {
2 font-family: Optima, Candara, Calibri, Arial, sans-serif;
3}
4code {
5 font-family: "Lucida Console", Monaco, monospace;
6 font-size: 85%;
7}
diff --git a/static/css/style.css b/static/css/style.css
index 4dc3ae4..76658fe 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1,33 +1,40 @@
1body { 1body {
2 max-width: 800px; 2 font-family: sans-serif;
3 line-height: 1.5em;
3 margin: auto; 4 margin: auto;
5 max-width: 800px;
4 padding: 1em; 6 padding: 1em;
5 line-height: 1.5em;
6} 7}
7 8
8/* header and footer areas */ 9/* header and footer areas */
9.menu { padding: 0; } 10nav > ul { padding: 0; }
10.menu li { display: inline-block; } 11nav > ul > li { display: inline-block; }
11.article-meta, .menu a { 12article > header, nav > ul a {
12 text-decoration: none;
13 background: #eee; 13 background: #eee;
14 padding: 5px;
15 border-radius: 5px; 14 border-radius: 5px;
15 padding: 5px;
16 text-decoration: none;
16} 17}
17.menu, .article-meta, footer { text-align: center; } 18.terms { font-size: .9em; }
19nav > ul, article > header, footer { text-align: center; }
18.title { font-size: 1.1em; } 20.title { font-size: 1.1em; }
19footer a { text-decoration: none; } 21footer a { text-decoration: none; }
20hr { 22hr {
21 border-style: dashed; 23 border-style: dashed;
22 color: #ddd; 24 color: #ddd;
23} 25}
26body > nav {
27 border-bottom: 1px solid #ddd;
28}
29body > footer {
30 border-top: 1px solid #ddd;
31}
24 32
25/* code */ 33/* code */
26pre { 34pre {
27 border: 1px solid #ddd; 35 border: 1px solid #ddd;
28 box-shadow: 5px 5px 5px #eee;
29 padding: 1em;
30 overflow-x: auto; 36 overflow-x: auto;
37 padding: 1em;
31} 38}
32code { background: #f9f9f9; } 39code { background: #f9f9f9; }
33pre code { background: none; } 40pre code { background: none; }
@@ -42,9 +49,9 @@ blockquote {
42} 49}
43 50
44table { 51table {
45 margin: auto;
46 border-top: 1px solid #666;
47 border-bottom: 1px solid #666; 52 border-bottom: 1px solid #666;
53 border-top: 1px solid #666;
54 margin: auto;
48} 55}
49table thead th { border-bottom: 1px solid #ddd; } 56table thead th { border-bottom: 1px solid #ddd; }
50th, td { padding: 5px; } 57th, td { padding: 5px; }