diff options
| author | Wang Chucheng <ccwangchn@gmail.com> | 2020-10-08 11:57:42 +0300 |
|---|---|---|
| committer | Wang Chucheng <ccwangchn@gmail.com> | 2020-10-08 11:57:42 +0300 |
| commit | 32ad5bd98d44ebedbff9106d36b1a913a6e88019 (patch) | |
| tree | 2ed2e84afffeb07653320e5a2c3841c6c60ba758 | |
| parent | 70ac6fc3b2f063d1038768986bc137b9ca1342f1 (diff) | |
refactor: change assets
| -rw-r--r-- | data/assets.toml | 8 | ||||
| -rw-r--r-- | layouts/partials/head.html | 31 |
2 files changed, 29 insertions, 10 deletions
diff --git a/data/assets.toml b/data/assets.toml index 216fe8f..7780b05 100644 --- a/data/assets.toml +++ b/data/assets.toml @@ -2,13 +2,13 @@ [css.highlight] version = "10.1.0" - url = "//cdn.jsdelivr.net/gh/highlightjs/cdn-release@%s/build/styles/solarized-light.min.css" + url = "https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@%s/build/styles/solarized-light.min.css" [js.highlight] version = "10.1.0" - url = "//cdn.jsdelivr.net/gh/highlightjs/cdn-release@%s/build/highlight.min.js" + url = "https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@%s/build/highlight.min.js" [js.fontawesome] version = "5.14.0" - sri = "sha256-uNYoXefWRqv+PsIF/OflNmwtKM4lStn9yrz2gVl6ymo=" - url = "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@%s/js/all.min.js"
\ No newline at end of file + url = "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@%s/js/all.min.js" + sri = "sha256-uNYoXefWRqv+PsIF/OflNmwtKM4lStn9yrz2gVl6ymo="
\ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html index d1cbb4c..731524e 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -12,20 +12,39 @@ {{ return $icon_resized }} {{ end }} +{{ $css := .Site.Data.assets.css }} +{{ $js := .Site.Data.assets.js }} + +{{ if $css.eureka.url }} +{{ if $css.eureka.version }} +<link rel="stylesheet" href="{{ printf $css.eureka.url $css.eureka.version }}"> +{{ else }} +<link rel="stylesheet" href="{{ $css.eureka.url }}"> +{{ end }} +{{ else }} {{ $eureka_css := resources.Get "css/eureka.css" | postCSS (dict "config" "./assets/css/postcss.config.js") }} {{ $eureka_css := $eureka_css | minify }} <link rel="stylesheet" href="{{ $eureka_css.Permalink }}"> -{{ $eureka_js := resources.Get "js/eureka.js" }} -<script async src="{{ $eureka_js.Permalink }}"></script> +{{ end }} + +{{ if $js.eureka.url }} +{{ if $js.eureka.version }} +<script defer src="{{ printf $js.eureka.url $js.eureka.version }}"></script> +{{ else }} +<script defer src="{{ $js.eureka.url }}"></script> +{{ end }} +{{ else }} +{{ $eureka_js := resources.Get "js/eureka.js" | minify }} +<script defer src="{{ $eureka_js.Permalink }}"></script> +{{ end }} + <link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;600;700&family=Noto+Serif+SC:wght@400;600;700&display=swap" rel="stylesheet"> -{{ $css := .Site.Data.assets.css }} -{{ $js := .Site.Data.assets.js }} <link rel="stylesheet" href="{{ printf $css.highlight.url $css.highlight.version }}"> -<script defer src="{{ printf $js.highlight.url $css.highlight.version }}"></script> -<script src="{{ printf $js.fontawesome.url $js.fontawesome.version }}" integrity="{{ $js.fontawesome.sri }}" crossorigin="anonymous"></script> +<script defer src="{{ printf $js.highlight.url $js.highlight.version }}"></script> +<script async src="{{ printf $js.fontawesome.url $js.fontawesome.version }}" integrity="{{ $js.fontawesome.sri }}" crossorigin="anonymous"></script> {{ template "_internal/google_analytics_async.html" . }} {{ partial "schema.html" . }} {{ partial "opengraph.html" . }} |