Hermit-V2 Theme Update

1bl4z3r · Nov 17, 2023 · 6ea2b76 · 6ea2b76
1 parent ad547d0
commit 6ea2b76
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -56,14 +56,14 @@ Site Configuration is done through `hugo.toml` or `hugo.yaml` file in root direc
 
 I have found that there are some requirement where custom CSS and JS should be supplied to a page to make it work. This custom files are not required for whole of the site, but is restricted to a page or few particular pages. E.g. If you make contact form.
 
-To provision for the same, I have added custom css and js. Please add this to page frontmatter as required.
+To make use of custom CSS and JS, add the below section to page frontmatter. If there is any folder structure, that should be mentioned as well.
 
 ```
-custom_css = ["css/foo.css","css/bar.css"]
-custom_js = ["js/custom-about.js"]
+custom_css = ["custom_css/foo.css","custom_css/bar.css"]
+custom_js = ["custom_js/custom-about.js"]
 ```
 
-The files itself will reside in `static/css` for CSS files and `static/js` for JS files. Refer to [Staging Branch](https://github.com/1bl4z3r/hermit-V2/tree/staging) to have a feel on how [this](https://github.com/1bl4z3r/hermit-V2/blob/staging/content/about-hugo.md) is implemented.
+The files itself will reside in `assets` directory. Refer to [Staging Branch](https://github.com/1bl4z3r/hermit-V2/tree/staging) to have a feel on how [this](https://github.com/1bl4z3r/hermit-V2/blob/staging/content/about-hugo.md) is implemented.
 
 ### Favicon
 

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -17,8 +17,11 @@
 {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Title | safeHTML }}
 {{ end -}}
 {{ $style := resources.Get "scss/style.scss" | resources.ExecuteAsTemplate "css/style.css" . | toCSS | minify | fingerprint -}}
-<link rel="stylesheet preload prefetch" as="style" href="{{ $style.Permalink }}" {{ printf "integrity=%q" $style.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous">
-{{- range .Params.custom_css -}}<link rel="stylesheet preload prefetch" as="style" href="{{ . | absURL }}">{{- end -}}
+<link rel="stylesheet dns-prefetch preconnect preload prefetch" as="style" href="{{ $style.Permalink }}" {{ printf "integrity=%q" $style.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous">
+{{- range .Params.custom_css -}}
+{{ $c_css := resources.Get . | resources.ExecuteAsTemplate "css/style.css" . | toCSS | minify | fingerprint -}}
+<link rel="stylesheet preload prefetch" as="style" href="{{ $c_css.Permalink }}" {{ printf "integrity=%q" $c_css.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous">
+{{- end -}}
 {{- block "head" . -}}{{- end -}}
 {{- if templates.Exists "partials/extra-head.html" -}}{{- partial "extra-head.html" . -}}{{- end -}}</head>
 <body id="page">
@@ -39,7 +42,10 @@
 	{{ $linkshare := resources.Get "js/link-share.js" | minify | fingerprint -}}
 	<script async src="{{ $linkshare.Permalink }}" {{ printf "integrity=%q" $linkshare.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous"></script>
 	{{- end -}}
-	{{- range .Params.custom_js -}}<script async type="text/javascript" src="{{ . | absURL }}"></script>{{- end }}
+	{{- range .Params.custom_js -}}
+	{{ $c_js := resources.Get . | minify | fingerprint -}}
+	<script defer src="{{ $c_js.Permalink }}" {{ printf "integrity=%q" $c_js.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous"></script>
+	{{- end }}
 	{{- partial "mathjax.html" . -}}
 	{{- if templates.Exists "partials/extra-foot.html" -}}{{- partial "extra-foot.html" . -}}{{- end }}
 </body>