Compare commits

..

3 commits

4 changed files with 49 additions and 36 deletions

View file

@ -1,26 +1,26 @@
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
<channel> <channel>
<title>{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title> <title>{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
<link>{{ .Permalink }}</link> <link>{{ .Permalink }}</link>
<description>Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description> <description>Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
<generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }} <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
<language>{{.}}</language>{{end}}{{ with .Site.Author.email }} <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
<managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }} <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
<webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }} <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
<copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }} <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
<lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }} <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
{{ with .OutputFormats.Get "RSS" }} {{ with .OutputFormats.Get "RSS" }}
{{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }} {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
{{ end }} {{ end }}
{{ range .Site.RegularPages }} {{ range .Site.RegularPages }}
<item> <item>
<title>{{ .Title }}</title> <title>{{ .Title }}</title>
<link>{{ .Permalink }}</link> <link>{{ .Permalink }}</link>
<pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate> <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
{{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}} {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
<guid>{{ .Permalink }}</guid> <guid>{{ .Permalink }}</guid>
<description>{{ .Content | html }}</description> <description>{{ .Content | html }}</description>
</item> </item>
{{ end }} {{ end }}
</channel> </channel>
</rss> </rss>

View file

@ -1,21 +1,31 @@
{{ $img := $.Page.Resources.GetMatch (.Get "src")}} {{ $img := $.Page.Resources.GetMatch (.Get "src")}}
{{ $test := $img.Permalink }}
{{ $name_splitted := split $img.RelPermalink "." }}
{{ $name_base := index $name_splitted 0 }}
<figure {{ with .Get "class" }} class="{{ . }}"{{ end }}> <figure {{ with .Get "class" }} class="{{ . }}"{{ end }}>
{{ with .Get "link" }} {{ with .Get "link" }}
<a href="{{ . }}"> <a href="{{ . | absURL }}">
{{ end }} {{ end }}
<picture> <img src="{{ $img.RelPermalink }}"
<source srcset="{{$img.RelPermalink}}" type="image/jpg"> {{ with .Get "alt"}} alt="{{ . }}"{{ end }}
<img src="{{ $img.RelPermalink }}" alt="{{.Get "alt" }}" /> {{ with .Get "title"}} title="{{ . }}"{{ end }}
</picture> {{ with .Get "height"}} height="{{ . }}"{{ end }}
{{ with .Get "width"}} width="{{ . }}"{{ end }} />
{{ with .Get "link" }} {{ with .Get "link" }}
</a> </a>
{{ end }} {{ end }}
{{ with .Get "title" }} {{ if .Get "caption" }}
<figcaption> <figcaption>
<p>{{ . }}</p> <p>{{ .Get "caption" }}
{{ if .Get "attr" }}
<span class="attribution">
{{ with .Get "attrlink" }}
<a href="{{ . }}">
{{ end }}
{{ .Get "attr" }}
{{ with .Get "attrlink" }}
</a>
{{ end }}
</span>
{{ end }}
</p>
</figcaption> </figcaption>
{{ end }} {{ end }}
</figure> </figure>

View file

@ -9,7 +9,7 @@
<footer> <footer>
<cite> <cite>
{{ with .Get "url" }} {{ with .Get "url" }}
<a href={{ . }} {{ with $.Get "title"}}title="{{ . }}"{{ end }}> <a href="{{ . }}" {{ with $.Get "title"}}title="{{ . }}"{{ end }}>
{{ end }} {{ end }}
{{ .Get "author" | markdownify }} {{ .Get "author" | markdownify }}
{{ with .Get "url" }}</a>{{end}}</cite> {{ with .Get "url" }}</a>{{end}}</cite>

View file

@ -526,7 +526,7 @@ a:focus {
.article-body figure.border figcaption { .article-body figure.border figcaption {
background-color: var(--background-color-light); background-color: var(--background-color-light);
} }
.article-body figure a { .article-body figure>a {
display: block; display: block;
min-height: 100%; min-height: 100%;
} }
@ -540,6 +540,9 @@ a:focus {
margin-left: 1rem; margin-left: 1rem;
margin-right: 1rem; margin-right: 1rem;
} }
.article-body figure figcaption .attribution {
float: right;
}
@media only screen and (max-width: 320px) { @media only screen and (max-width: 320px) {
.article-body .footnotes ol { .article-body .footnotes ol {
padding-left: 2em; padding-left: 2em;