From dfb6e1f80754c1c8f2d4d332c5292319f008a67b Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Wed, 27 May 2020 22:53:13 +0800 Subject: v2 original port --- layouts/partials/head.html | 77 ++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 37 deletions(-) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 134f6e4..c306ade 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -18,51 +18,54 @@ {{ else }} {{ .Title }} - {{ .Site.Title }} {{ end }} - - +{{ if or (.Params.author) (.Site.Params.author) }} + +{{ end }} +{{ if or (.Params.description) (.Site.Params.description) }} + +{{ end }} {{ if .Params.tags }} {{ end }} + {{ template "_internal/opengraph.html" . }} {{ template "_internal/twitter_cards.html" . }} -{{ template "_internal/google_analytics_async.html" . }} - -{{ $options := (dict "targetPath" "css/main.min.css" "outputStyle" "compressed") }} -{{ $style := resources.Get "sass/main.scss" | resources.ToCSS $options }} - + +{{ $sass := resources.Get "fuji.scss" }} +{{ $options := (dict "targetPath" "assets/css/fuji.min.css" "outputStyle" "compressed" "enableSourceMap" true) }} +{{ $style := $sass | resources.ToCSS $options }} + - -{{ if .Site.Params.useCDN }} - - - - -{{ if or (.Site.Params.playerURL) (.Params.playerURL) }} - - -{{ end }} - +{{ if .Site.Params.useResourceCDN }} + + + + + + + {{ else }} -{{ $jquery := resources.Get "js/jquery.min.js" }} - -{{ $lazysizes := resources.Get "js/lazysizes.min.js" }} - -{{ $fontawesome := resources.Get "css/fontawsome.min.css" }} - -{{ $zoom := resources.Get "js/medium-zoom.min.js" }} - -{{ if or (.Site.Params.playerURL) (.Params.playerURL) }} -{{ $aplayerCSS := resources.Get "css/APlayer.min.css" }} - -{{ $aplayerJS := resources.Get "js/APlayer.min.js" }} - -{{ end }} + + + + + + + {{ end }} - -{{ if or (.Params.math) (.Site.Params.math) }} - - - +{{ with .Site.GoogleAnalytics }} + + + {{ end }} \ No newline at end of file -- cgit v1.2.3 From d47a131ca03b813b26345c752d41cc8999a646ce Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Fri, 29 May 2020 16:14:13 +0800 Subject: Fix highlight.js --- layouts/partials/head.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index c306ade..85b77cc 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -41,7 +41,7 @@ {{ if .Site.Params.useResourceCDN }} - + @@ -52,7 +52,7 @@ - + {{ end }} -- cgit v1.2.3 From cf395763b26103b1b147bc40d8a3126e92996b97 Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Sat, 30 May 2020 12:36:29 +0800 Subject: Update cfga --- layouts/partials/head.html | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 85b77cc..f52a7ce 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -56,16 +56,5 @@ {{ end }} -{{ with .Site.GoogleAnalytics }} - - - -{{ end }} \ No newline at end of file +{{ partial "analytic-gtag.html" . }} +{{ partial "analytic-cfga.html" . }} \ No newline at end of file -- cgit v1.2.3 From f14d5fa8f78a5756866002591aa479f8ccf5b582 Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Sat, 30 May 2020 12:54:18 +0800 Subject: Custom highlight.js support --- layouts/partials/head.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index f52a7ce..b407340 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -43,18 +43,33 @@ +{{ if .Site.Params.customHighlight }} + +{{ else }} +{{ end }} +{{ if .Params.playerURL }} +{{ end }} + {{ else }} + +{{ if .Site.Params.customHighlight }} + +{{ else }} +{{ end }} +{{ if .Params.playerURL }} {{ end }} +{{ end }} + {{ partial "analytic-gtag.html" . }} {{ partial "analytic-cfga.html" . }} \ No newline at end of file -- cgit v1.2.3 From ac62cbd84fc67401f4014b6e9d8ed6c6b175503e Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Sat, 30 May 2020 14:02:20 +0800 Subject: Update fa --- layouts/partials/head.html | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index b407340..d4b610c 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -38,11 +38,10 @@ {{ $style := $sass | resources.ToCSS $options }} -{{ if .Site.Params.useResourceCDN }} - + {{ if .Site.Params.customHighlight }} {{ else }} @@ -53,23 +52,5 @@ {{ end }} -{{ else }} - - - - - -{{ if .Site.Params.customHighlight }} - -{{ else }} - -{{ end }} -{{ if .Params.playerURL }} - - -{{ end }} - -{{ end }} - {{ partial "analytic-gtag.html" . }} {{ partial "analytic-cfga.html" . }} \ No newline at end of file -- cgit v1.2.3 From 8009dfd8f5d33211a07d01319715fc3993979138 Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Sun, 31 May 2020 16:31:27 +0800 Subject: Scripts adjustment --- layouts/partials/head.html | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index d4b610c..f648160 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -38,18 +38,10 @@ {{ $style := $sass | resources.ToCSS $options }} - - - + -{{ if .Site.Params.customHighlight }} - -{{ else }} - -{{ end }} {{ if .Params.playerURL }} - {{ end }} {{ partial "analytic-gtag.html" . }} -- cgit v1.2.3 From 2338da969d3bc1b2bc26df9f7192dd20a0906c5b Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Sun, 31 May 2020 23:06:44 +0800 Subject: Switch to prism.js --- layouts/partials/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index f648160..7141a40 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -33,7 +33,7 @@ {{ template "_internal/twitter_cards.html" . }} -{{ $sass := resources.Get "fuji.scss" }} +{{ $sass := resources.Get "scss/fuji.scss" }} {{ $options := (dict "targetPath" "assets/css/fuji.min.css" "outputStyle" "compressed" "enableSourceMap" true) }} {{ $style := $sass | resources.ToCSS $options }} -- cgit v1.2.3 From 02c3891865c7741b8f772aea75cc01564d2f0ff4 Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Mon, 1 Jun 2020 15:44:04 +0800 Subject: Remove jQuery --- layouts/partials/head.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 7141a40..bf6e1bf 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -33,12 +33,7 @@ {{ template "_internal/twitter_cards.html" . }} -{{ $sass := resources.Get "scss/fuji.scss" }} -{{ $options := (dict "targetPath" "assets/css/fuji.min.css" "outputStyle" "compressed" "enableSourceMap" true) }} -{{ $style := $sass | resources.ToCSS $options }} - - - + {{ if .Params.playerURL }} -- cgit v1.2.3 From da23836b5dfe2d39cda0d89768dadd59b22a9baf Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Mon, 1 Jun 2020 21:49:10 +0800 Subject: DisqusJS support added --- layouts/partials/head.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index bf6e1bf..c8a047b 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -38,6 +38,9 @@ {{ if .Params.playerURL }} {{ end }} +{{ if .Site.Params.useDisqusJS }} + +{{ end }} {{ partial "analytic-gtag.html" . }} {{ partial "analytic-cfga.html" . }} \ No newline at end of file -- cgit v1.2.3 From e6afd04368f56af57b77f71be4dda5a4d9279a64 Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Tue, 2 Jun 2020 12:57:59 +0800 Subject: CDN support added --- layouts/partials/head.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index c8a047b..9ce9479 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -33,7 +33,11 @@ {{ template "_internal/twitter_cards.html" . }} +{{ if .Site.Params.mainAssetsCDN }} + +{{ else }} +{{ end }} {{ if .Params.playerURL }} -- cgit v1.2.3 From 3df71601ae866aff9c2ae060ed1ac7407807fcc4 Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Wed, 3 Jun 2020 13:58:49 +0800 Subject: New comment area & opt out of font awesome --- layouts/partials/head.html | 1 - 1 file changed, 1 deletion(-) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 9ce9479..289c067 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -38,7 +38,6 @@ {{ else }} {{ end }} - {{ if .Params.playerURL }} {{ end }} -- cgit v1.2.3 From 914bf54c493b299268c293be33a8babf99b1cce2 Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Thu, 4 Jun 2020 20:08:43 +0800 Subject: Custom scss variable support --- layouts/partials/head.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'layouts/partials/head.html') diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 289c067..2d7362c 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -36,8 +36,14 @@ {{ if .Site.Params.mainAssetsCDN }} {{ else }} +{{ if .Site.Params.useHugoPipes }} +{{ $options := (dict "targetPath" "assets/css/fuji-custom.min.css" "outputStyle" "compressed") }} +{{ $style := resources.Get "scss/fuji.scss" | resources.ToCSS $options }} + +{{ else }} {{ end }} +{{ end }} {{ if .Params.playerURL }} {{ end }} -- cgit v1.2.3