From b38eec2bae65e16278bbb19f12f8d41af7b37f1d Mon Sep 17 00:00:00 2001
From: Djordje Atlialp <djordje@atlialp.com>
Date: Tue, 16 Apr 2019 00:29:02 +0200
Subject: [PATCH] Fix assets generation path

Assets were generated into  `resources/_gen/js/js/*` and `resources/_gen/scss/scss/*`. Now the files are in the correct folder --> no double nesting anymore.
---
 layouts/partials/head.html       | 3 ++-
 layouts/partials/javascript.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index d2b5f61..c0efba4 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -23,7 +23,8 @@
 <link href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/3.2.1/css/flag-icon.min.css" rel="stylesheet"
     type="text/css">
 
-{{ $style := resources.Get "scss/main.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }}
+{{ $options := (dict "targetPath" "style.css" "outputStyle" "compressed" "enableSourceMap" true) }}
+{{ $style := resources.Get "scss/main.scss" | resources.ToCSS $options | resources.Minify | resources.Fingerprint }}
 <link rel="stylesheet" href="{{ $style.Permalink }}">
 
 {{ range $val := $.Site.Params.customCSS }}
diff --git a/layouts/partials/javascript.html b/layouts/partials/javascript.html
index dca8df4..540b633 100644
--- a/layouts/partials/javascript.html
+++ b/layouts/partials/javascript.html
@@ -2,7 +2,7 @@
 {{ $menu := resources.Get "js/menu.js" }}
 {{ $prism := resources.Get "js/prism.js" }}
 {{ $theme := resources.Get "js/theme.js" }}
-{{ $secureJS := slice $main $menu $prism $theme | resources.Concat "js/bundle.js" | resources.Minify | resources.Fingerprint "sha512" }}
+{{ $secureJS := slice $main $menu $prism $theme | resources.Concat "bundle.js" | resources.Minify | resources.Fingerprint "sha512" }}
 <script type="text/javascript" src="{{ $secureJS.Permalink }}" integrity="{{ $secureJS.Data.Integrity }}"></script>
 
 {{- if .Site.GoogleAnalytics }}