Merge remote-tracking branch 'upstream/master' into hmsy

This commit is contained in:
2022-02-14 08:23:14 +08:00
34 changed files with 649 additions and 60 deletions

View File

@@ -7,7 +7,7 @@
{{ if or (not (eq .Description "")) (not (eq .Title "")) -}}
<header class="home-header">
<div class="home-blob-text-container">
{{ with .Title }}<h1 class="home-blob-title">{{ . }}</h1>{{ end }}
{{ with .Title }}<h1 class="home-blob-title">{{ . | markdownify }}</h1>{{ end }}
{{ with .Description }}<p class="home-blob-text">{{ . }}</p>{{ end }}
</div>
{{ with resources.GetMatch .Site.Params.headshotimg -}}
@@ -17,7 +17,7 @@
{{ $faceshot_x2 := .Resize "544x Lanczos" }}
{{ $faceshot_x3 := .Resize "816x Lanczos" }}
<source srcset="{{ $faceshot.Permalink }} 1x, {{ $faceshot_x2.Permalink }} 2x, {{ $faceshot_x3.Permalink }} 3x">
<img class="home-faceshot" src="{{ $faceshot.Permalink }}" {{ with .Params.description -}} alt="{{ . }}" {{- end }}>
<img class="home-faceshot" src="{{ $faceshot.Permalink }}" {{ with $.Site.Params.headshotalt -}} alt="{{ . }}" {{- end }}>
</picture>
</div>
{{ end -}}

View File

@@ -1,5 +1,4 @@
<a ontouchstart="cardPressed.call(this)" ontouchend="cardReleased.call(this)" ontouchmove="cardReleased.call(this)"
href="{{ .Permalink }}" class="card blog-card bc-next" rel="bookmark" >
<a href="{{ .Permalink }}" class="card blog-card bc-next" rel="bookmark" >
{{ with .Resources.GetMatch "featuredImage" }}
<div class="card-img-container">
<p class="card-img-overlay">下一篇文章</p>
@@ -13,10 +12,10 @@
</div>
{{ end }}
<article class="card-body">
<h2 class="card-title">{{ .Title }}</h2>
<h2 class="card-title">{{ .Title | markdownify }}</h2>
<p class="card-text">{{ if (isset .Params "description") }}{{ index .Params "description" | htmlUnescape }}{{ else }}{{ .Summary | plainify | htmlUnescape }}{{ end }}</p>
<div class="card-subtext muted-text">
<p>发布于<time datetime="{{ .PublishDate.Format "2006-01-02 12:00" }}">{{ .PublishDate.Format "2006年1月2日" }}</time></p>
<p>发布于<time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "2006年1月2日" }}</time></p>
{{ if (isset .Params "categories") }}<p>{{ range .Params.categories }}#{{ . }} {{ end }}</p>{{ end }}
</div>
</article>

View File

@@ -1,5 +1,4 @@
<a ontouchstart="cardPressed.call(this)" ontouchend="cardReleased.call(this)" ontouchmove="cardReleased.call(this)"
href="{{ .Permalink }}" class="card blog-card" rel="bookmark" >
<a href="{{ .Permalink }}" class="card blog-card" rel="bookmark" >
{{ with .Resources.GetMatch "featuredImage" }}
<div class="card-img-container">
<picture>
@@ -12,7 +11,7 @@
</div>
{{- end }}
<article class="card-body">
<h2 class="card-title">{{ .Title }}</h2>
<h2 class="card-title">{{ .Title | markdownify }}</h2>
<p class="card-text">{{ if (isset .Params "description") }}{{ index .Params "description" | htmlUnescape }}{{ else }}{{ .Summary | plainify | htmlUnescape }}{{ end }}</p>
<div class="card-subtext muted-text">
<p>发布于<time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "2006年1月2日" }}</time></p>

View File

@@ -6,7 +6,7 @@
<main class="card-container side-gutter">
{{ if or (not (eq .Description "")) (not (eq .Title "")) -}}
<header class="list-header">
{{ with .Title }}<h1 class="list-header-title">{{ . }}</h1>{{ end }}
{{ with .Title | markdownify }}<h1 class="list-header-title">{{ . }}</h1>{{ end }}
{{ with .Description }}<p class="list-header-subtext">{{ . }}</p>{{ end }}
</header>
{{- end }}