Merge branch 'master' into template-search

This commit is contained in:
Jimmy Cai 2020-10-31 23:37:36 +01:00 committed by GitHub
commit b3df22940d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 13 additions and 18 deletions

1
assets/scss/custom.scss Normal file
View file

@ -0,0 +1 @@
/* Place your custom SCSS in HUGO_SITE_FOLDER/assets/scss/custom.scss */

View file

@ -25,6 +25,8 @@
@import "partials/layout/404.scss"; @import "partials/layout/404.scss";
@import "partials/layout/search.scss"; @import "partials/layout/search.scss";
@import "custom.scss";
a { a {
text-decoration: none; text-decoration: none;
color: var(--accent-color); color: var(--accent-color);

View file

@ -13,14 +13,6 @@ Hugo ships with several [Built-in Shortcodes](https://gohugo.io/content-manageme
<!--more--> <!--more-->
--- ---
## Instagram Simple Shortcode
{{< instagram_simple BGvuInzyFAe hidecaption >}}
<br>
---
## YouTube Privacy Enhanced Shortcode ## YouTube Privacy Enhanced Shortcode
{{< youtube ZJthWmvUzzc >}} {{< youtube ZJthWmvUzzc >}}

View file

@ -19,7 +19,7 @@
{{ range $filtered.GroupByDate "2006" }} {{ range $filtered.GroupByDate "2006" }}
{{ $id := lower (replace .Key " " "-") }} {{ $id := lower (replace .Key " " "-") }}
<div class="archives-group" id="{{ $id }}"> <div class="archives-group" id="{{ $id }}">
<h2 class="archives-date section-title"><a href="{{ $.Permalink }}#{{ $id }}">{{ .Key }}</a></h2> <h2 class="archives-date section-title"><a href="{{ $.RelPermalink }}#{{ $id }}">{{ .Key }}</a></h2>
<div class="article-list--compact"> <div class="article-list--compact">
{{ range .Pages }} {{ range .Pages }}
{{ partial "article-list/compact" . }} {{ partial "article-list/compact" . }}

View file

@ -1,5 +1,5 @@
<article> <article>
<a href="{{ .Permalink }}"> <a href="{{ .RelPermalink }}">
<div class="article-details"> <div class="article-details">
<h2 class="article-title"> <h2 class="article-title">
{{- .Title -}} {{- .Title -}}

View file

@ -2,7 +2,7 @@
<article class="{{ if $image.exists }}has-image{{ end }}"> <article class="{{ if $image.exists }}has-image{{ end }}">
{{ if $image.exists }} {{ if $image.exists }}
<div class="article-image"> <div class="article-image">
<a href="{{ .Permalink }}"> <a href="{{ .RelPermalink }}">
{{ if $image.resource }} {{ if $image.resource }}
{{- $thumbnail := $image.resource.Fill "800x250" -}} {{- $thumbnail := $image.resource.Fill "800x250" -}}
{{- $thumbnailRetina := $image.resource.Fill "1600x500" -}} {{- $thumbnailRetina := $image.resource.Fill "1600x500" -}}

View file

@ -1,6 +1,6 @@
{{ $image := partialCached "helper/image" (dict "Context" .context "Type" .Type) .context.RelPermalink .Type }} {{ $image := partialCached "helper/image" (dict "Context" .context "Type" .Type) .context.RelPermalink .Type }}
<article class="{{ if $image.exists }}has-image{{ end }}"> <article class="{{ if $image.exists }}has-image{{ end }}">
<a href="{{ .context.Permalink }}"> <a href="{{ .context.RelPermalink }}">
{{ if $image.exists }} {{ if $image.exists }}
<div class="article-image"> <div class="article-image">

View file

@ -7,7 +7,7 @@
{{ if and $image.exists $image.resource }} {{ if and $image.exists $image.resource }}
{{- $imageRaw := $image.resource | resources.Fingerprint "md5" -}} {{- $imageRaw := $image.resource | resources.Fingerprint "md5" -}}
{{- $20x := $imageRaw.Fill "20x20 smart" -}} {{- $20x := $imageRaw.Fill "20x20 smart" -}}
<a href="{{ .Permalink }}" <a href="{{ .RelPermalink }}"
class="color-tag" class="color-tag"
data-image="{{ $20x.RelPermalink }}" data-image="{{ $20x.RelPermalink }}"
data-key="{{ $context.Slug }}" data-key="{{ $context.Slug }}"
@ -15,14 +15,14 @@
{{ .LinkTitle }} {{ .LinkTitle }}
</a> </a>
{{ else }} {{ else }}
<a href="{{ .Permalink }}">{{ .LinkTitle }}</a> <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
{{ end }} {{ end }}
{{ end }} {{ end }}
</header> </header>
{{ end }} {{ end }}
<h2 class="article-title"> <h2 class="article-title">
<a href="{{ .Permalink }}"> <a href="{{ .RelPermalink }}">
{{- .Title -}} {{- .Title -}}
</a> </a>
</h2> </h2>

View file

@ -1,7 +1,7 @@
{{ if .Params.Tags }} {{ if .Params.Tags }}
<section class="article-tags"> <section class="article-tags">
{{ range (.GetTerms "tags") }} {{ range (.GetTerms "tags") }}
<a href="{{ .Permalink }}">{{ .LinkTitle }}</a> <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
{{ end }} {{ end }}
</section> </section>
{{ end }} {{ end }}

View file

@ -31,7 +31,7 @@
{{ $active := or (eq $currentPage.Title .Name) (or ($currentPage.HasMenuCurrent "main" .) ($currentPage.IsMenuCurrent "main" .)) }} {{ $active := or (eq $currentPage.Title .Name) (or ($currentPage.HasMenuCurrent "main" .) ($currentPage.IsMenuCurrent "main" .)) }}
<li {{ if $active }} class='current' {{ end }}> <li {{ if $active }} class='current' {{ end }}>
<a href='{{ .URL | absLangURL }}'> <a href='{{ .URL | relURL }}'>
{{ if .Pre }} {{ if .Pre }}
{{ partial "helper/icon" .Pre }} {{ partial "helper/icon" .Pre }}
{{ end }} {{ end }}

View file

@ -6,7 +6,7 @@
<div class="tagCloud-tags"> <div class="tagCloud-tags">
{{ range first .Site.Params.widgets.tagCloud.limit .Site.Taxonomies.tags.ByCount }} {{ range first .Site.Params.widgets.tagCloud.limit .Site.Taxonomies.tags.ByCount }}
<a href="{{ .Page.Permalink }}" class="font_size_{{ .Count }}"> <a href="{{ .Page.RelPermalink }}" class="font_size_{{ .Count }}">
{{ .Page.Title }} {{ .Page.Title }}
</a> </a>
{{ end }} {{ end }}