diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 9925b60..5a9e7d6 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,3 +1,11 @@ +{{ $cdn_url := ""}} +{{ if eq ( getenv "HUGO_ENV" ) "production" }} + {{ with .Site.Params.cdn_url }} + {{ $cdn_url = .}} + {{ end }} +{{ end }} +{{ .Scratch.Set "cdn_url" $cdn_url }} + @@ -6,16 +14,9 @@ {{ block "title" . -}}{{ .Site.Title }}{{- end }} {{ partial "head.html" . }} - {{ $cdn_url := ""}} - {{ if eq ( getenv "HUGO_ENV" ) "production" }} - {{ with .Site.Params.cdn_url }} - {{ $cdn_url = .}} - {{ end }} - {{ end }} - {{ .Scratch.Set "cdn_url" $cdn_url }}
- {{ partial "header" . }} + {{ partial "header.html" . }}
{{ block "content" . }}{{ end }} diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html index 33e9f8b..b066e26 100644 --- a/layouts/partials/comments.html +++ b/layouts/partials/comments.html @@ -1,7 +1,22 @@ {{ if and .IsPage (ne .Params.comment false) -}} {{- if .Site.DisqusShortname -}} - {{ template "_internal/disqus.html" . }} +
+ + + comments powered by Disqus {{- end -}} @@ -23,7 +38,7 @@ gitalk.render('gitalk-container'); - {{- end }} + {{- end -}} {{- if .Site.Params.valine.enable -}} diff --git a/layouts/partials/css.html b/layouts/partials/css.html index f4f0bd5..8d7d3e7 100644 --- a/layouts/partials/css.html +++ b/layouts/partials/css.html @@ -1,5 +1,4 @@ {{ $style := resources.Get "css/main.scss" | resources.ToCSS | resources.Minify}} - {{ $iconfont := resources.Get "font/iconfont.css" }} + {{ $iconfont := resources.Get "font/iconfont.css" | resources.Minify }} - diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 5194f3c..60bd91e 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -2,13 +2,12 @@
© {{ with .Site.Params.since }} - {{ if lt . now.Year }}{{ . }} - {{ end }}{{ now.Year }} + {{ if lt . now.Year }}{{ . }} - {{ end }}{{ now.Year }} {{ end }} {{ if .Site.Params.author }} - {{ .Site.Params.author }} | - + {{ .Site.Params.author }} | + {{ end }} - {{ (printf (T "powered") `Hugo`) | safeHTML }} | {{ T "theme" }}KeepIt
diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 36cfac6..f99e275 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -30,10 +30,14 @@ -{{ partial "css" . }} + +{{ partial "css.html" . }} + {{ with .OutputFormats.Get "RSS" }} {{ end }} + {{ template "_internal/twitter_cards.html" . }} -{{ partial "seo_schema" . }} + +{{ partial "seo_schema.html" . }} diff --git a/layouts/partials/home_post.html b/layouts/partials/home_post.html index 9103a78..80080b9 100644 --- a/layouts/partials/home_post.html +++ b/layouts/partials/home_post.html @@ -1,71 +1,74 @@ +{{ $cdn_url := .Scratch.Get "cdn_url" }}
-
- {{ $cdn_url := .Scratch.Get "cdn_url" }} - {{ with .Site.Params.avatar}} - {{ $avatar := .}} -
- +
+ {{ with .Site.Params.avatar}} + {{ $avatar := .}} +
+ +
+ {{ end }} + {{ if or .Params.gravatar.Email (and .Site.Params.gravatar.Email (ne .Params.gravatar.Email false)) }} +
+ gravatar +
+ {{ end }} + + {{ with .Site.Params.subtitle}} +

+ {{ . }} +

+ {{ end }} +
- {{ end }} - {{ if or .Params.gravatar.Email (and .Site.Params.gravatar.Email (ne .Params.gravatar.Email false)) }} -
- gravatar -
- {{ end }} + {{ range (.Paginate .Pages).Pages }} +
- {{ with .Site.Params.subtitle}} -

- {{ . }} -

- {{ end }} - -
- {{ range (.Paginate .Pages).Pages }} -
+
+

{{ .Title }}

+
+
+ + {{ with .Params.featured_image }} + {{- $img := . -}} +

+ {{ end }} + -
-

{{ .Title }}

-
-
- - {{ with .Params.featured_image }} - {{- $img := . -}} -

- {{ end }} - - - {{ .Summary }} -
-
-
+ {{ .Summary }} +
+
+
- + in {{ with .Params.categories -}} - {{ range . }} - {{- $name := . -}} - {{- with $.Site.GetPage "taxonomy" (printf "categories/%s" $name) | default ($.Site.GetPage "taxonomy" (printf "categories/%s" ($name | urlize))) -}} - {{ $name }} - {{ end -}} - {{ end }} + {{ range . }} + {{- $name := . -}} + {{- with $.Site.GetPage "taxonomy" (printf "categories/%s" $name) | default ($.Site.GetPage "taxonomy" (printf "categories/%s" ($name | urlize))) -}} + {{ $name }} + {{ end -}} + {{ end }} {{- end }} +
+ {{ with .Params.tags }} +
+ {{ range . }} + + #{{.}} + {{ end }} +
+ {{ end }}
- {{ with .Params.tags }} -
- {{ range . }} - - #{{.}} - {{ end }} -
- {{ end }} -
-
- {{ end }} + + {{ end }} - {{ partial "paginator.html" . }} + {{ partial "paginator.html" . }}
diff --git a/layouts/partials/home_profile.html b/layouts/partials/home_profile.html index 50a3e0a..3901231 100644 --- a/layouts/partials/home_profile.html +++ b/layouts/partials/home_profile.html @@ -1,22 +1,22 @@ +{{ $cdn_url := .Scratch.Get "cdn_url" }} +
- {{ $cdn_url := .Scratch.Get "cdn_url" }} + {{ $avatar := "" }} {{ with .Site.Params.avatar}} - {{ $avatar := .}} -
- -
+ {{ $avatar = (printf "%s%s" $cdn_url .) }} {{ end }} {{ if or .Params.gravatar.Email (and .Site.Params.gravatar.Email (ne .Params.gravatar.Email false)) }} -
- gravatar -
- {{ end }} - {{ with .Site.Params.subtitle}} -

- {{ . }} -

+ {{ $avatar = (printf "https://www.gravatar.com/avatar/%s?s=240&d=mp" (md5 .Site.Params.gravatar.email)) }} {{ end }} + {{ if $avatar }} +
avatar
+ {{ end }} + + {{ with .Site.Params.subtitle}} +

{{ . }}

+ {{ end }} +
diff --git a/layouts/partials/js.html b/layouts/partials/js.html index 0db6572..2d1075f 100644 --- a/layouts/partials/js.html +++ b/layouts/partials/js.html @@ -5,25 +5,25 @@ {{ $prettify := resources.Get "/js/prettify.min.js" }} {{ $dynamic := resources.Get "/js/dynamic.to.top.min.js" }} {{ $main := resources.Get "/js/main.js" }} -{{ $lihtGallery := resources.Get "/js/lightGallery-all.min.js" }} -{{ $lihtGallery_init := resources.Get "/js/lightGallery-init.js" }} -{{ if .IsPage }} +{{ $lightGallery := resources.Get "/js/lightGallery-all.min.js" }} +{{ $lightGallery_init := resources.Get "/js/lightGallery-init.js" }} +{{ if .IsPage }} {{ if $postHasImages }} - - {{ $vendorscript := slice $jquery $lazysizes $prettify $dynamic $main $lihtGallery $lihtGallery_init | resources.Concat "/js/vendor_gallery.js" | resources.Minify }} - + + {{ $vendorScript := slice $jquery $lazysizes $prettify $dynamic $main $lightGallery $lightGallery_init | resources.Concat "/js/vendor_gallery.js" | resources.Minify }} + {{ else }} - {{ $vendorscript := slice $jquery $prettify $dynamic $main | resources.Concat "/js/vendor_no_gallery.js" | resources.Minify }} - + {{ $vendorScript := slice $jquery $prettify $dynamic $main | resources.Concat "/js/vendor_no_gallery.js" | resources.Minify }} + {{ end }} + + + {{ else }} - {{ $main := slice $jquery $main | resources.Concat "/js/vendor_main.js" | resources.Minify}} - -{{ end }} - -{{ if eq ( getenv "HUGO_ENV" ) "production" }} + {{ $vendorScript := slice $jquery $main | resources.Concat "/js/vendor_main.js" | resources.Minify}} + {{ end }} {{ template "_internal/google_analytics_async.html" . }} diff --git a/layouts/partials/related.html b/layouts/partials/related.html deleted file mode 100644 index 3b77b91..0000000 --- a/layouts/partials/related.html +++ /dev/null @@ -1,9 +0,0 @@ -{{ $related := .Site.RegularPages.Related . | first 5 }} -{{ with $related }} -

{{ i18n "Similar" }} {{ i18n "articles" }}:

- -{{ end }} \ No newline at end of file diff --git a/layouts/partials/share-links.html b/layouts/partials/share-links.html index f804a06..78f9153 100644 --- a/layouts/partials/share-links.html +++ b/layouts/partials/share-links.html @@ -1,68 +1,75 @@ {{ if or .Params.socialShare (and .Site.Params.socialShare (ne .Params.socialShare false)) }} - {{ if or .Params.Share.Twitter (and .Site.Params.Share.Twitter (ne .Params.Share.Twitter false)) }} - - + {{ if or .Params.Share.Twitter (and .Site.Params.Share.Twitter (ne .Params.Share.Twitter false)) }} + + - {{ end }} - - {{ if or .Params.Share.Facebook (and .Site.Params.Share.Facebook (ne .Params.Share.Facebook false)) }} + {{ end }} + + {{ if or .Params.Share.Facebook (and .Site.Params.Share.Facebook (ne .Params.Share.Facebook false)) }} - + - {{ end }} - - {{ if or .Params.Share.Reddit (and .Site.Params.Share.Reddit (ne .Params.Share.Reddit false)) }} + {{ end }} + + {{ if or .Params.Share.Reddit (and .Site.Params.Share.Reddit (ne .Params.Share.Reddit false)) }} - + - {{ end }} - - {{ if or .Params.Share.Linkedin (and .Site.Params.Share.Linkedin (ne .Params.Share.Linkedin false)) }} - - + {{ end }} + + {{ if or .Params.Share.Linkedin (and .Site.Params.Share.Linkedin (ne .Params.Share.Linkedin false)) }} + + - {{ end }} - - {{ if or .Params.Share.Pinterest (and .Site.Params.Share.Pinterest (ne .Params.Share.Pinterest false)) }} - - + {{ end }} + + {{ if or .Params.Share.Pinterest (and .Site.Params.Share.Pinterest (ne .Params.Share.Pinterest false)) }} + + - {{ end }} - - {{ if or .Params.Share.HackerNews (and .Site.Params.Share.HackerNews (ne .Params.Share.HackerNews false)) }} - - + {{ end }} + + {{ if or .Params.Share.HackerNews (and .Site.Params.Share.HackerNews (ne .Params.Share.HackerNews false)) }} + + - {{ end }} - - {{ if or .Params.Share.Mix (and .Site.Params.Share.Mix (ne .Params.Share.Mix false)) }} + {{ end }} + + {{ if or .Params.Share.Mix (and .Site.Params.Share.Mix (ne .Params.Share.Mix false)) }} - - {{ end }} + + {{ end }} - {{ if or .Params.Share.Tumblr (and .Site.Params.Share.Tumblr (ne .Params.Share.Tumblr false)) }} - + {{ if or .Params.Share.Tumblr (and .Site.Params.Share.Tumblr (ne .Params.Share.Tumblr false)) }} + - - {{ end }} + + {{ end }} - {{ if or .Params.Share.VKontakte (and .Site.Params.Share.VKontakte (ne .Params.Share.VKontakte false)) }} + {{ if or .Params.Share.VKontakte (and .Site.Params.Share.VKontakte (ne .Params.Share.VKontakte false)) }} - - {{ end }} + + {{ end }} - {{ if or .Params.Share.Douban (and .Site.Params.Share.Douban (ne .Params.Share.Douban false)) }} - + {{ if or .Params.Share.Douban (and .Site.Params.Share.Douban (ne .Params.Share.Douban false)) }} + - - {{ end }} + + {{ end }} - {{ if or .Params.Share.Weibo (and .Site.Params.Share.Weibo (ne .Params.Share.Weibo false)) }} - + {{ if or .Params.Share.Weibo (and .Site.Params.Share.Weibo (ne .Params.Share.Weibo false)) }} + - - {{ end }} -{{ end }} \ No newline at end of file + + {{ end }} +{{ end }} diff --git a/layouts/partials/social.html b/layouts/partials/social.html index a5da3bd..cf926fc 100644 --- a/layouts/partials/social.html +++ b/layouts/partials/social.html @@ -1,171 +1,171 @@ {{ with .Site.Params.Social.Github }} - + {{ end }} {{ with .Site.Params.Social.LinkedIn }} - + {{ end }} {{ with .Site.Params.Social.Twitter }} - + {{ end }} {{ with .Site.Params.Social.Instagram }} - + {{ end }} {{ with .Site.Params.Social.Email}} - + {{ end }} {{ with .Site.Params.Social.Facebook}} - + {{ end }} {{ with .Site.Params.Social.Telegram}} - + {{ end }} {{ with .Site.Params.Social.Medium}} - + {{ end }} {{ with .Site.Params.Social.Gitlab}} - + {{ end }} {{ with .Site.Params.Social.Youtubelegacy}} - + {{ end }} {{ with .Site.Params.Social.Youtubecustom}} - + {{ end }} {{ with .Site.Params.Social.Youtubechannel}} - + {{ end }} {{ with .Site.Params.Social.Tumblr}} - + {{ end }} {{ with .Site.Params.Social.Quora}} - + {{ end }} {{ with .Site.Params.Social.Keybase}} - + {{ end }} {{ with .Site.Params.Social.Pinterest}} - + {{ end }} {{ with .Site.Params.Social.Reddit}} - + {{ end }} {{ with .Site.Params.Social.Codepen}} - + {{ end }} {{ with .Site.Params.Social.Bitbucket}} - + {{ end }} {{ with .Site.Params.Social.Stackoverflow}} - + {{ end }} {{ with .Site.Params.Social.Weibo}} - + {{ end }} {{ with .Site.Params.Social.Odnoklassniki}} - + {{ end }} {{ with .Site.Params.Social.VKontakte}} - + {{ end }} {{ with .Site.Params.Social.Flickr}} - + {{ end }} {{ with .Site.Params.Social.Xing}} - + {{ end }} {{ with .Site.Params.Social.Snapchat}} - + {{ end }} {{ with .Site.Params.Social.Soundcloud}} - + {{ end }} {{ with .Site.Params.Social.Spotify}} - + {{ end }} {{ with .Site.Params.Social.Bandcamp}} - + {{ end }} {{ with .Site.Params.Social.Paypal}} - + {{ end }} {{ with .Site.Params.Social.Fivehundredpx}} - + {{ end }} {{ with .Site.Params.Social.Mix}} - + {{ end }} {{ with .Site.Params.Social.Goodreads}} - + {{ end }} {{ with .Site.Params.Social.Lastfm}} - + {{ end }} {{ with .Site.Params.Social.Foursquare}} - + {{ end }} {{ with .Site.Params.Social.Hackernews}} - + {{ end }} {{ with .Site.Params.Social.Kickstarter}} - + {{ end }} {{ with .Site.Params.Social.Patreon}} - + {{ end }} {{ with .Site.Params.Social.Steam}} - + {{ end }} {{ with .Site.Params.Social.Twitch}} - + {{ end }} {{ with .Site.Params.Social.Strava}} - + {{ end }} {{ with .Site.Params.Social.Skype}} - + {{ end }} {{ with .Site.Params.Social.Whatsapp}} - + {{ end }} {{ with .Site.Params.Social.Zhihu}} - + {{ end }} {{ with .Site.Params.Social.Douban}} - + {{ end }} {{ with .Site.Params.Social.Angellist}} - + {{ end }} {{ with .Site.Params.Social.Slideshare}} - + {{ end }} {{ with .Site.Params.Social.Jsfiddle}} - + {{ end }} {{ with .Site.Params.Social.Deviantart}} - + {{ end }} {{ with .Site.Params.Social.Behance}} - + {{ end }} {{ with .Site.Params.Social.Dribble}} - + {{ end }} {{ with .Site.Params.Social.Wordpress}} - + {{ end }} {{ with .Site.Params.Social.Vine}} - + {{ end }} {{ with .Site.Params.Social.Googlescholar}} - + {{ end }} {{ with .Site.Params.Social.Researchgate}} - + {{ end }} {{ with .Site.Params.Social.Mastodon}} - + {{ end }} {{ with .Site.Params.Social.Thingiverse}} - -{{ end }} \ No newline at end of file + +{{ end }} diff --git a/layouts/posts/single.html b/layouts/posts/single.html index 3ac8ba3..2548339 100644 --- a/layouts/posts/single.html +++ b/layouts/posts/single.html @@ -68,7 +68,7 @@

{{ if and ( $.Param "socialShare" ) (gt (len ($.Param "share")) 0) }} {{ T "share" }}: - {{ partial "share-links" . }} + {{ partial "share-links.html" . }} {{ end }}

@@ -110,7 +110,7 @@
{{ if ( .Params.showComments | default true ) }} - {{ partial "comments" . }} + {{ partial "comments.html" . }} {{ end }}