diff options
| author | Sebastian Pech <windows@spech.de> | 2022-01-15 12:18:00 +0300 |
|---|---|---|
| committer | Sebastian Pech <windows@spech.de> | 2022-01-15 12:18:00 +0300 |
| commit | e8b1dc87595ae10261c0dfbbd304ed05e48f9e1b (patch) | |
| tree | 2dd20f7702526d231ea681691d743c61c12acc51 | |
| parent | 736825d975bd5256c6ff36578b8f0d71d5e63671 (diff) | |
v5 file handling
| -rw-r--r-- | layouts/partials/head.html | 6 | ||||
| -rw-r--r-- | layouts/partials/js.html | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 2965065..d05fa60 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -17,12 +17,10 @@ {{ $themeColor = .Site.Params.themeColor }} {{ end }} -{{ $cssbootstrap := resources.Get (printf "/css/bootstrap-%s.min.css" $themeColor) }} {{ $cssfontawesome := resources.Get "/css/fontawesome-free-5.13.0-web-all.min.css" }} -{{ $cssmain := resources.Get "/css/main.css" }} -{{ $csstheme := resources.Get (printf "/css/main-%s.css" $themeColor) }} +{{ $csstheme := resources.Get (printf "/sass/main-%s.scss" $themeColor) | toCSS }} {{ $customcss := resources.Get "/css/custom.css" }} -{{ $allcss := slice $cssbootstrap $cssfontawesome $cssmain $csstheme $customcss | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }} +{{ $allcss := slice $cssfontawesome $csstheme $customcss | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }} <link rel="stylesheet" href="{{ $allcss.RelPermalink }}" integrity="{{ $allcss.Data.Integrity }}"> {{- range .Site.Params.csscdn }} diff --git a/layouts/partials/js.html b/layouts/partials/js.html index 7dad8d6..f58c530 100644 --- a/layouts/partials/js.html +++ b/layouts/partials/js.html @@ -1,7 +1,6 @@ -{{ $jquery := resources.Get "/js/jquery-3.5.1.slim.min.js" }} -{{ $bootstrap := resources.Get "/js/bootstrap.min.js" }} +{{ $bootstrap := resources.Get "/js/bootstrap.bundle.min.js" }} {{ $customjs := resources.Get "/js/custom.js" }} -{{ $allscript := slice $jquery $bootstrap $customjs | resources.Concat "/js/vendor.js" | minify | fingerprint "sha512" }} +{{ $allscript := slice $bootstrap $customjs | resources.Concat "/js/vendor.js" | minify | fingerprint "sha512" }} <script src="{{ $allscript.RelPermalink }}" integrity="{{ $allscript.Data.Integrity }}"></script> {{- range .Site.Params.jscdn }} |