Browse Source

Merge branch 'master' of http://git.nipponalba.scot/jk/jk_na

master
jk 5 years ago
parent
commit
839ef0cce2
  1. 4
      layouts/_default/section.html
  2. 23
      themes/anatole/layouts/_default/single.html
  3. 2
      themes/anatole/layouts/index.html
  4. 2
      themes/anatole/static/css/style.css

4
layouts/_default/section.html

@ -46,8 +46,8 @@
{{ if .Params.inreplyto }}<a href="{{ .Params.inreplyto }}" class="link u-url"> post</a>{{ end }}
{{ if .Params.repostof }}<a href="{{ .Params.repostof }}" class="link u-url"> post</a>{{ end }}</p>
{{ if .Content }}<div class="e-content">{{ .Content }}</div><br/> {{end}}
<time class="dt-published" datetime="{{ dateFormat "02/01/2006 15:04 GMT" .Params.date }}">{{ dateFormat "02/01/2006 15:04 GMT" .Params.date }}</time>
</article>
<a href="{{ .RelPermalink }}" class="link u-url time"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "02/01/2006 15:04 GMT" }}</time></a>
</article>
</aside>
</section><hr/>
{{end}}

23
themes/anatole/layouts/_default/single.html

@ -22,7 +22,7 @@
</div>
<div class="post-footer">
{{ if not (eq .Type "article")}}<a class="u-url" href="{{ .RelPermalink }}"><span class="date"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "Mon, Jan 2, 2006" }}</time></span>{{end}}
{{ if not (eq .Type "article")}}<span class="date"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "Mon, Jan 2, 2006" }}</time></span>{{end}}
<div class="info">
{{ with .Page.Params.Blog }}{{ partial "taxonomy/blog.html" . }}{{ end }}
{{ with .Page.Params.Categories }}{{ partial "taxonomy/categories.html" . }}{{ end }}
@ -39,6 +39,25 @@
{{- end }}
{{ end }}
</aside></div>
</article>{{end}}
</article> {{ else }}
<section data-post-type="{{ .Params.posttype }}" data-post-id="{{ .Params.slug }}"class="h-entry">
<div class="author" style="display:none;">
<a rel="author" class="u-author h-card" rel="me" href="https://jk.nipponalba.scot">{{ .Site.Params.Title }}<img src="/images/profile.jpg"/></a>
</div>
<aside>
<article class="u-{{ .Params.posttype }} h-cite">
{{ if .Params.inreplyto }}<p> Replied to {{ end }}
{{ if .Params.likeof }}<p> Liked {{ end }}
{{ if .Params.repostof }}<p>Shared {{ end }}
someone's
{{ if .Params.likeof }}<a href="{{ .Params.likeof }}" class="link u-url"> post</a>{{ end }}
{{ if .Params.inreplyto }}<a href="{{ .Params.inreplyto }}" class="link u-url"> post</a>{{ end }}
{{ if .Params.repostof }}<a href="{{ .Params.repostof }}" class="link u-url"> post</a>{{ end }}</p>
{{ if .Content }}<div class="e-content">{{ .Content }}</div><br/> {{end}}
<div class="post-footer"><span class="date"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "02/01/2006 15:04 GMT" }}</time></span></div>
</article>
</aside>
</section>
{{end}}
{{end}}

2
themes/anatole/layouts/index.html

@ -2,7 +2,7 @@
<div class="about">
<h1>Latest post</h1>
{{ range first 1 .Site.RegularPages }}
{{ range (first 1 (where .Site.RegularPages "Type" "!=" "response")) }}
<article class="post h-entry entry contents">
<div class="{{.Type}}" data-post-type="{{.Type }}">
<div class="author" style="display:none;">

2
themes/anatole/static/css/style.css

@ -733,7 +733,7 @@ a.btn {
padding:0px;
}
.contents aside time{
.contents aside time, .h-cite time{
font-size:13px;
width:100%;
}