Merge github.com:luizdepra/hugo-coder and add myself to contributer list

Conflicts:
	layouts/partials/footer.html
This commit is contained in:
2020-04-11 15:26:05 +02:00
16 changed files with 156 additions and 28 deletions

View File

@@ -21,7 +21,7 @@
<link rel="canonical" href="{{ .Permalink }}">
{{ end }}
<link href="https://fonts.googleapis.com/css?family=Lato:400,700%7CMerriweather:300,700%7CSource+Code+Pro:400,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Lato:400,700%7CMerriweather:300,700%7CSource+Code+Pro:400,700&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css" integrity="sha384-KA6wR/X5RY4zFAHpv/CnoG2UW1uogYfdnP67Uv7eULvTveboZJg0qUpmJZb5VqzN" crossorigin="anonymous" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" integrity="sha256-l85OmPOjvil/SOvVt3HnSSjzF1TUMyT9eV0c2BzEGzU=" crossorigin="anonymous" />

View File

@@ -1,23 +1,26 @@
<footer class="footer">
<section class="container">
{{ with .Site.Params.footercontent | safeHTML }}
<p>{{.}}</p>
{{ end }}
{{ if not .Site.Params.hideCopyright }}
{{ with .Site.Params.since }}
© {{ if lt . now.Year }}{{ . }} - {{ end }}{{ now.Year }}
{{ else }}
© {{ now.Year }}
{{ if not .Site.Params.hideFooter | default false }}
<footer class="footer">
<section class="container">
{{ with .Site.Params.footercontent | safeHTML }}
<p>{{ . }}</p>
{{ end }}
{{ if .Site.Params.Author }} {{ .Site.Params.Author }} {{ end }}
{{ end }}
{{ if not .Site.Params.hideCredits }}
{{ if not .Site.Params.hideCopyright }} · {{ end }}
{{ i18n "powered_by" }} <a href="https://gohugo.io/">Hugo</a> & <a href="https://github.com/13hannes11/hugo-coder-timeline">Coder-Timeline</a>.
{{ end }}
{{ if .Site.Params.commit }}
{{ if or (not .Site.Params.hideCredits) (not .Site.Params.hideCopyright) }} · {{ end }}
[<a href="{{ .Site.Params.commit }}{{ getenv "GIT_COMMIT_SHA" }}">{{ getenv "GIT_COMMIT_SHA_SHORT" }}</a>]
{{ end }}
</section>
</footer>
{{ if not .Site.Params.hideCopyright }}
©
{{ if (and (.Site.Params.since) (lt .Site.Params.since now.Year)) }}
{{ .Site.Params.since }} -
{{ end }}
{{ now.Year }}
{{ with .Site.Params.Author }} {{ . }} {{ end }}
{{ end }}
{{ if not .Site.Params.hideCredits }}
{{ if not .Site.Params.hideCopyright }} · {{ end }}
{{ i18n "powered_by" }} <a href="https://gohugo.io/">Hugo</a> & <a href="https://github.com/luizdepra/hugo-coder/">Coder</a>.
{{ end }}
{{ if .Site.Params.commit }}
{{ if .GitInfo }}
[<a href="{{ .Site.Params.commit }}/{{ .GitInfo.Hash }}">{{ .GitInfo.AbbreviatedHash }}</a>]
{{ end }}
{{ end }}
</section>
</footer>
{{ end }}

View File

@@ -17,7 +17,7 @@
{{ if .Site.IsMultiLingual }}
{{ $node := . }}
{{ .Scratch.Set "separator" true }}
{{ range .Site.Home.AllTranslations }}
{{ range .Translations }}
{{ if ne $.Site.Language .Language }}
{{ if $node.Scratch.Get "separator" }}
<li class="navigation-item menu-separator">

View File

@@ -1,7 +1,12 @@
<section class="container centered">
<div class="about">
{{ with .Site.Params.avatarurl }}
<div class="avatar"><img src="{{ . | relURL }}" alt="avatar"></div>
{{ if and (isset .Site.Params "avatarurl") (not (isset .Site.Params "gravatar")) }}
{{ with .Site.Params.avatarurl }}
<div class="avatar"><img src="{{ . | relURL }}" alt="avatar"></div>
{{ end }}
{{ end }}
{{ with .Site.Params.gravatar }}
<div class="avatar"><img src="https://www.gravatar.com/avatar/{{md5 .}}?s=240&d=mp" alt="gravatar"></div>
{{ end }}
<h1>{{ .Site.Params.author }}</h1>
<h2>{{ .Site.Params.info }}</h2>

View File

@@ -7,6 +7,7 @@
{{- .Title -}}
</h1>
{{ .Content }}
<ul>
{{ range .Paginator.Pages }}
<li>