From 8a8652fbf03faa9a830d77b6429f47dda3152e03 Mon Sep 17 00:00:00 2001
From: Aditya Telange <21258296+adityatelange@users.noreply.github.com>
Date: Sat, 3 Oct 2020 18:31:08 +0530
Subject: [PATCH] assets: improvements

    - rm redundant minify's
    - url as //assets/<js or css>/<path>
---
 layouts/partials/footer.html |  4 ++--
 layouts/partials/head.html   | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 3264b91b..ff5cdd5a 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -11,8 +11,8 @@
             <path d="M12 6H0l6-6z" /></svg>
     </button>
 </a>
-{{- if in site.Params.mainSections .Type }}
-{{- $highlight := resources.Get "js/highlight.min.js" | minify | fingerprint}}
+{{ if in site.Params.mainSections .Type }}
+{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify | fingerprint -}}
 <script src="{{ $highlight.Permalink }}" integrity="{{ $highlight.Data.Integrity }}"></script>
 <script>hljs.initHighlightingOnLoad();</script>
 {{- end }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 685548f2..5b5df657 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -17,23 +17,23 @@
 <meta name="google-site-verification" content="{{ .Site.Params.analytics.google.SiteVerificationTag }}" />
 {{- end}}
 <!-- Styles -->
-{{- $anoldhope := resources.Get "css/an-old-hope.min.css" | minify }}
-{{- $theme := resources.Get "css/theme-vars.css" | minify }}
-{{- $reset := resources.Get "css/reset.css" | minify }}
-{{- $header := resources.Get "css/header.css" | minify }}
-{{- $main := resources.Get "css/main.css" | minify }}
-{{- $postentry := resources.Get "css/post-entry.css" | minify }}
-{{- $postsingle := resources.Get "css/post-single.css" | minify }}
-{{- $terms := resources.Get "css/terms.css" | minify }}
-{{- $archive := resources.Get "css/archive.css" | minify }}
-{{- $footer := resources.Get "css/footer.css" | minify }}
-{{- $404 := resources.Get "css/404.css" | minify }}
-{{- $style := slice $theme $reset $header $main $postentry $postsingle $terms $archive $footer $404 | resources.Concat "stylesheet.css" | minify }}
-{{- $stylesheet := slice $anoldhope $style | resources.Concat "css/stylesheet.css" | minify | fingerprint -}}
+{{- $anoldhope := resources.Get "css/an-old-hope.min.css" }}
+{{- $theme := resources.Get "css/theme-vars.css" }}
+{{- $reset := resources.Get "css/reset.css" }}
+{{- $header := resources.Get "css/header.css" }}
+{{- $main := resources.Get "css/main.css" }}
+{{- $postentry := resources.Get "css/post-entry.css" }}
+{{- $postsingle := resources.Get "css/post-single.css" }}
+{{- $terms := resources.Get "css/terms.css" }}
+{{- $archive := resources.Get "css/archive.css" }}
+{{- $footer := resources.Get "css/footer.css" }}
+{{- $404 := resources.Get "css/404.css" }}
+{{- $style := slice $theme $reset $header $main $postentry $postsingle $terms $archive $footer $404 | resources.Concat "stylesheet.css" }}
+{{- $stylesheet := slice $anoldhope $style | resources.Concat "assets/css/stylesheet.css" | minify | fingerprint -}}
 <link href="{{ $stylesheet.Permalink }}" integrity="{{ $stylesheet.Data.Integrity }}" rel="preload stylesheet"
     as="style">
 {{- if (and (.Site.Params.profileMode.enabled) (.IsHome)) }}
-{{- $profileMode := resources.Get "css/profile-mode.css" | minify | fingerprint }}
+{{- $profileMode := slice (resources.Get "css/profile-mode.css") | resources.Concat "assets/css/profile-mode.css" | minify | fingerprint }}
 <link href="{{ $profileMode.Permalink }}" integrity="{{ $profileMode.Data.Integrity }}" rel="preload stylesheet"
     as="style">
 {{- end -}}