diff options
-rw-r--r-- | themes/xmin/layouts/404.html | 6 | ||||
-rw-r--r-- | themes/xmin/layouts/_default/baseof.html | 31 | ||||
-rw-r--r-- | themes/xmin/layouts/_default/list.html | 6 | ||||
-rw-r--r-- | themes/xmin/layouts/_default/single.html | 30 | ||||
-rw-r--r-- | themes/xmin/layouts/_default/terms.html | 4 | ||||
-rw-r--r-- | themes/xmin/layouts/partials/header.html | 1 | ||||
-rw-r--r-- | themes/xmin/static/css/fonts.css | 7 | ||||
-rw-r--r-- | themes/xmin/static/css/style.css | 31 |
8 files changed, 77 insertions, 39 deletions
diff --git a/themes/xmin/layouts/404.html b/themes/xmin/layouts/404.html index c2e4e40..2f77920 100644 --- a/themes/xmin/layouts/404.html +++ b/themes/xmin/layouts/404.html | |||
@@ -1,5 +1,5 @@ | |||
1 | {{ partial "header.html" . }} | 1 | {{ define "main" }} |
2 | 2 | ||
3 | 404 NOT FOUND | 3 | 404 Not Found |
4 | 4 | ||
5 | {{ partial "footer.html" . }} | 5 | {{- end }} |
diff --git a/themes/xmin/layouts/_default/baseof.html b/themes/xmin/layouts/_default/baseof.html new file mode 100644 index 0000000..6757396 --- /dev/null +++ b/themes/xmin/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/themes/xmin/layouts/_default/list.html b/themes/xmin/layouts/_default/list.html index 06b290a..bf0af50 100644 --- a/themes/xmin/layouts/_default/list.html +++ b/themes/xmin/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/themes/xmin/layouts/_default/single.html b/themes/xmin/layouts/_default/single.html index de3f121..54acdc6 100644 --- a/themes/xmin/layouts/_default/single.html +++ b/themes/xmin/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/themes/xmin/layouts/_default/terms.html b/themes/xmin/layouts/_default/terms.html index 71f47e7..15de7a9 100644 --- a/themes/xmin/layouts/_default/terms.html +++ b/themes/xmin/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/themes/xmin/layouts/partials/header.html b/themes/xmin/layouts/partials/header.html index 4f431eb..b3dbf64 100644 --- a/themes/xmin/layouts/partials/header.html +++ b/themes/xmin/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/themes/xmin/static/css/fonts.css b/themes/xmin/static/css/fonts.css deleted file mode 100644 index 8ffcecd..0000000 --- a/themes/xmin/static/css/fonts.css +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | body { | ||
2 | font-family: Optima, Candara, Calibri, Arial, sans-serif; | ||
3 | } | ||
4 | code { | ||
5 | font-family: "Lucida Console", Monaco, monospace; | ||
6 | font-size: 85%; | ||
7 | } | ||
diff --git a/themes/xmin/static/css/style.css b/themes/xmin/static/css/style.css index 4dc3ae4..76658fe 100644 --- a/themes/xmin/static/css/style.css +++ b/themes/xmin/static/css/style.css | |||
@@ -1,33 +1,40 @@ | |||
1 | body { | 1 | body { |
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; } | 10 | nav > ul { padding: 0; } |
10 | .menu li { display: inline-block; } | 11 | nav > ul > li { display: inline-block; } |
11 | .article-meta, .menu a { | 12 | article > 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; } |
19 | nav > ul, article > header, footer { text-align: center; } | ||
18 | .title { font-size: 1.1em; } | 20 | .title { font-size: 1.1em; } |
19 | footer a { text-decoration: none; } | 21 | footer a { text-decoration: none; } |
20 | hr { | 22 | hr { |
21 | border-style: dashed; | 23 | border-style: dashed; |
22 | color: #ddd; | 24 | color: #ddd; |
23 | } | 25 | } |
26 | body > nav { | ||
27 | border-bottom: 1px solid #ddd; | ||
28 | } | ||
29 | body > footer { | ||
30 | border-top: 1px solid #ddd; | ||
31 | } | ||
24 | 32 | ||
25 | /* code */ | 33 | /* code */ |
26 | pre { | 34 | pre { |
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 | } |
32 | code { background: #f9f9f9; } | 39 | code { background: #f9f9f9; } |
33 | pre code { background: none; } | 40 | pre code { background: none; } |
@@ -42,9 +49,9 @@ blockquote { | |||
42 | } | 49 | } |
43 | 50 | ||
44 | table { | 51 | table { |
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 | } |
49 | table thead th { border-bottom: 1px solid #ddd; } | 56 | table thead th { border-bottom: 1px solid #ddd; } |
50 | th, td { padding: 5px; } | 57 | th, td { padding: 5px; } |