[SHORTCODE] Use img instead of figure, adapt css for attribution

This commit is contained in:
Gregory Trolliet 2020-05-07 09:48:29 +02:00
parent 7b6c1ca8df
commit a01da17f26
2 changed files with 24 additions and 11 deletions

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

@ -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;