Asset management #18

koirand · Mar 26, 2019 · f2117d7 · f2117d7
1 parent edf4e92
commit f2117d7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/static/css/markdown.css → assets/css/markdown.css b/static/css/markdown.css → assets/css/markdown.css
diff --git a/static/css/style.css → assets/css/style.css b/static/css/style.css → assets/css/style.css
diff --git a/static/css/syntax-highlight.css → assets/css/syntax-highlight.css b/static/css/syntax-highlight.css → assets/css/syntax-highlight.css
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -24,6 +24,6 @@
   {{ $mark := resources.Get "js/jquery.mark.es6.min.js" }}
   {{ $lunr := resources.Get "js/lunr.js" }}
   {{ $search := resources.Get "js/search.js" }}
-  {{ $js := slice $jquery $mark $lunr $search | resources.Concat "js/bundle.js" | resources.Minify | resources.Fingerprint }}
+  {{ $js := slice $jquery $mark $lunr $search | resources.Concat "bundle.js" | resources.Minify | resources.Fingerprint }}
   <script src="{{ $js.Permalink }}"></script>
 {{ end }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -13,9 +13,11 @@
   <link rel="shortcut icon" type="image/x-icon" href="/img/favicon.ico">
 
   <!-- css -->
-  <link rel="stylesheet" href="/css/style.css">
-  <link rel="stylesheet" href="/css/markdown.css">
-  <link rel="stylesheet" href="/css/syntax-highlight.css">
+  {{ $style := resources.Get "css/style.css" }}
+  {{ $markdown := resources.Get "css/markdown.css" }}
+  {{ $syntaxHighlight := resources.Get "css/syntax-highlight.css" }}
+  {{ $css := slice $style $markdown $syntaxHighlight | resources.Concat "style.css" | resources.Minify | resources.Fingerprint }}
+  <link rel="stylesheet" href="{{ $css.Permalink }}">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 
   <!-- custom css -->