Browse Source

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

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

5
layouts/_default/section.html

@ -4,8 +4,9 @@
<span id="pagination-top">{{ partial "pagination.html" . }}</span> <span id="pagination-top">{{ partial "pagination.html" . }}</span>
{{ range .Paginator.Pages }} {{ range .Paginator.Pages }}
<section data-post-type="{{ .Type }}" class="h-entry {{.Type }}"> <section data-post-type="{{ .Type }}" class="h-entry {{.Type }}">
<div class="author">
<a rel="author" class= "u-author" href="https://jk.nipponalba.scot" style="display:none"><img class="u-photo" src="/images/profile.jpg"/></a>
<div class="p-author author" style="display:none;">
<a rel="author" class="p-name u-url u-uid" rel="me" href="https://jk.nipponalba.scot">{{ .Site.Params.Title }}</a>
<img class="u-photo" src="/images/profile.jpg"/>
</div> </div>
<aside> <aside>
{{if eq .Type "article" }}<a href="{{ .RelPermalink }}" class="link u-url"><h3 class="">{{ .Title }}</h3></a><b>{{ .Description }}</b>{{ end }} {{if eq .Type "article" }}<a href="{{ .RelPermalink }}" class="link u-url"><h3 class="">{{ .Title }}</h3></a><b>{{ .Description }}</b>{{ end }}

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

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<article class="post h-entry entry contents"> <article class="post h-entry entry contents">
<div class="{{.Type}}" data-post-type="{{.Type }}"><div class="author" style="display:none;"><a rel="author" class="u-author p-author h-card" href="{{ .RelPermalink }}"><img class="u-photo" src="/images/profile.jpg" /></a></div>
<div class="{{.Type}}" data-post-type="{{.Type }}"><div class="p-author author" style="display:none;"><a rel="author" class="p-name u-url u-uid" rel="me" href="https://jk.nipponalba.scot">{{ .Site.Params.Title }}</a><img class="u-photo" src="/images/profile.jpg" /></div>
<div class="post-content">{{ with .Page.Params.Image }}{{ partial "taxonomy/image.html" . }}{{ end }}<h3 class="post-title p-name entry-title">{{ .Title }}</h3> <div class="post-content">{{ with .Page.Params.Image }}{{ partial "taxonomy/image.html" . }}{{ end }}<h3 class="post-title p-name entry-title">{{ .Title }}</h3>
<aside> <aside>
{{ if eq .Type "article" }}<div class="info"> {{ if eq .Type "article" }}<div class="info">

5
themes/anatole/layouts/index.html

@ -4,7 +4,8 @@
<h1>Latest post</h1> <h1>Latest post</h1>
{{ range first 1 .Site.RegularPages }} {{ range first 1 .Site.RegularPages }}
<article class="post h-entry entry contents"> <article class="post h-entry entry contents">
<div class="{{.Type}}" data-post-type="{{.Type }}"><div class="author" style="display:none;"><a rel="author" class="u-author p-author h-card" href="{{ .RelPermalink }}"><img class="u-photo" src="/images/profile.jpg" /></a></div>
<div class="{{.Type}}" data-post-type="{{.Type }}">
<div class="p-author author" style="display:none;"><a rel="author" class="p-name u-url u-uid" rel="me" href="https://jk.nipponalba.scot">{{ .Site.Params.Title }}</a><img class="u-photo" src="/images/profile.jpg" /></div>
<div class="post-content">{{ with .Page.Params.Image }}{{ partial "taxonomy/image.html" . }}{{ end }}<h3 class="post-title p-name entry-title">{{ .Title }}</h3> <div class="post-content">{{ with .Page.Params.Image }}{{ partial "taxonomy/image.html" . }}{{ end }}<h3 class="post-title p-name entry-title">{{ .Title }}</h3>
<aside> <aside>
<div class="index_info"> <div class="index_info">
@ -31,8 +32,8 @@
</div> </div>
</aside></div> </aside></div>
</div> </div>
</article>
<a href="https://brid.gy/publish/mastodon"></a> <a href="https://brid.gy/publish/mastodon"></a>
</article>
{{ end }} {{ end }}
</div> </div>
{{ end }} {{ end }}

4
themes/anatole/static/css/style.css

@ -743,14 +743,14 @@ a.btn {
.contents aside .info time{ .contents aside .info time{
font-size:15px; font-size:15px;
} }
.contents .photos{
.photos{
display:inline-block; display:inline-block;
width:100%; width:100%;
float:left; float:left;
min-width:100%; min-width:100%;
margin-bottom:10px; margin-bottom:10px;
} }
.contents .thumb{
.contents img.thumb{
width:300px; width:300px;
float:left; float:left;
display:inline; display:inline;