From f2117d7fcb0f00255b95a093b243b3f0053c99a9 Mon Sep 17 00:00:00 2001
From: koirand <koirand.jp@gmail.com>
Date: Wed, 27 Mar 2019 01:14:08 +0900
Subject: [PATCH] Asset management #18

---
 {static => assets}/css/markdown.css         | 0
 {static => assets}/css/style.css            | 0
 {static => assets}/css/syntax-highlight.css | 0
 layouts/_default/list.html                  | 2 +-
 layouts/partials/head.html                  | 8 +++++---
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename {static => assets}/css/markdown.css (100%)
 rename {static => assets}/css/style.css (100%)
 rename {static => assets}/css/syntax-highlight.css (100%)

diff --git a/static/css/markdown.css b/assets/css/markdown.css
similarity index 100%
rename from static/css/markdown.css
rename to assets/css/markdown.css
diff --git a/static/css/style.css b/assets/css/style.css
similarity index 100%
rename from static/css/style.css
rename to assets/css/style.css
diff --git a/static/css/syntax-highlight.css b/assets/css/syntax-highlight.css
similarity index 100%
rename from static/css/syntax-highlight.css
rename to assets/css/syntax-highlight.css
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index ccf01dc..540d2b8 100644
--- 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
index b2782c3..81d5292 100644
--- 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 -->