From 4f59157d5b4da425040df4f771ed8282fa4955e9 Mon Sep 17 00:00:00 2001 From: Vincent Tam Date: Thu, 25 Jul 2019 16:15:03 +0200 Subject: [PATCH] Replace leading slash in some relURL --- layouts/index.html | 10 +++++----- layouts/partials/footer/scripts.html | 6 +++--- layouts/partials/head/css.html | 6 +++--- layouts/partials/js/owlCarousel.html | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/layouts/index.html b/layouts/index.html index 4a2dfca..f38c33a 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -132,11 +132,11 @@ {{ partial "js/owlCarousel.html" . }} {{ if .Site.Params.home.localTime }} - {{ $momentjs := resources.Get "/vendor/momentjs/moment.min.js" }} - {{ $momentTimezone := resources.Get "/vendor/momentjs/moment-timezone.min.js" }} - {{ $momentTimezoneWithData := resources.Get "/vendor/momentjs/moment-timezone-with-data-2012-2022.min.js" }} - {{ $initMomentjs := resources.Get "/js/initMoment.js" | resources.ExecuteAsTemplate "js/initMoment.tmp.js" . }} - {{ $bundleMoment := slice $momentjs $momentTimezone $momentTimezoneWithData $initMomentjs | resources.Concat "/js/bundleMoment.js" | fingerprint }} + {{ $momentjs := resources.Get "vendor/momentjs/moment.min.js" }} + {{ $momentTimezone := resources.Get "vendor/momentjs/moment-timezone.min.js" }} + {{ $momentTimezoneWithData := resources.Get "vendor/momentjs/moment-timezone-with-data-2012-2022.min.js" }} + {{ $initMomentjs := resources.Get "js/initMoment.js" | resources.ExecuteAsTemplate "js/initMoment.tmp.js" . }} + {{ $bundleMoment := slice $momentjs $momentTimezone $momentTimezoneWithData $initMomentjs | resources.Concat "js/bundleMoment.js" | fingerprint }} {{ end }} diff --git a/layouts/partials/footer/scripts.html b/layouts/partials/footer/scripts.html index 77fa926..6142f3d 100644 --- a/layouts/partials/footer/scripts.html +++ b/layouts/partials/footer/scripts.html @@ -1,6 +1,6 @@ -{{ $jQuery := resources.Get "/vendor/jquery/jquery-3.3.1.min.js" }} -{{ $index := resources.Get "/js/index.js" | minify }} -{{ $scripts := slice $jQuery $index | resources.Concat "/js/bundle.js" | fingerprint }} +{{ $jQuery := resources.Get "vendor/jquery/jquery-3.3.1.min.js" }} +{{ $index := resources.Get "js/index.js" | minify }} +{{ $scripts := slice $jQuery $index | resources.Concat "js/bundle.js" | fingerprint }} {{ template "_internal/google_analytics_async.html" . }} diff --git a/layouts/partials/head/css.html b/layouts/partials/head/css.html index 3e54be5..6d00b8d 100644 --- a/layouts/partials/head/css.html +++ b/layouts/partials/head/css.html @@ -1,11 +1,11 @@ -{{ $bundleRaw := resources.Get "/sass/style.sass" | resources.ExecuteAsTemplate "/css/main.tmp.css" . }} +{{ $bundleRaw := resources.Get "sass/style.sass" | resources.ExecuteAsTemplate "css/main.tmp.css" . }} {{ if .Site.IsServer }} -{{ $cssOpts := (dict "targetPath" "/css/main.css" "enableSourceMap" true ) }} +{{ $cssOpts := (dict "targetPath" "css/main.css" "enableSourceMap" true ) }} {{ $bundle := $bundleRaw | toCSS $cssOpts }} {{ else }} -{{ $cssOpts := (dict "targetPath" "/css/main.css" ) }} +{{ $cssOpts := (dict "targetPath" "css/main.css" ) }} {{ $postCSSOpts := (dict "use" "autoprefixer" ) }} {{ $bundle := $bundleRaw | toCSS $cssOpts | postCSS $postCSSOpts | minify | fingerprint }} diff --git a/layouts/partials/js/owlCarousel.html b/layouts/partials/js/owlCarousel.html index 5ffb506..f64ebc7 100644 --- a/layouts/partials/js/owlCarousel.html +++ b/layouts/partials/js/owlCarousel.html @@ -1,4 +1,4 @@ -{{ $owlCarousel := resources.Get "/vendor/owlCarousel/owl.carousel.min.js" }} -{{ $initOwlCarousel := resources.Get "/js/initOwlCarousel.js" | minify }} -{{ $bundleOwlCarousel := slice $owlCarousel $initOwlCarousel | resources.Concat "/js/bundleOwlCarousel.js" | fingerprint }} +{{ $owlCarousel := resources.Get "vendor/owlCarousel/owl.carousel.min.js" }} +{{ $initOwlCarousel := resources.Get "js/initOwlCarousel.js" | minify }} +{{ $bundleOwlCarousel := slice $owlCarousel $initOwlCarousel | resources.Concat "js/bundleOwlCarousel.js" | fingerprint }}