diff --git a/assets/js/zzo.js b/assets/js/zzo.js index cfdd0bf..5adc218 100644 --- a/assets/js/zzo.js +++ b/assets/js/zzo.js @@ -12,6 +12,10 @@ $(document).ready(function() { var scroll = $(window).scrollTop(); if (scroll > position) { // scroll down + if (scroll < 45) { + return null; + } + if (!navbar.hasClass('navbar--hide')) { navbar.addClass('navbar--hide'); } else if (navbar.hasClass('navbar--show')) { diff --git a/layouts/partials/head/scripts.html b/layouts/partials/head/scripts.html index 7af2c72..207c0ed 100644 --- a/layouts/partials/head/scripts.html +++ b/layouts/partials/head/scripts.html @@ -4,7 +4,7 @@ {{ $enquire := resources.Get "js/enquire.min.js" | resources.Fingerprint }} -{{ $prism := resources.Get "js/prism.min.js" | minify | resources.Fingerprint }} +{{ $prism := resources.Get "js/prism.min.js" | resources.Minify | resources.Fingerprint }} {{ $lunr := resources.Get "js/lunr.min.js" | resources.Fingerprint }} @@ -12,5 +12,13 @@ {{ $shave := resources.Get "js/jquery.shave.min.js" | resources.Fingerprint }} -{{ $zzo := resources.Get "js/zzo.js" | minify | resources.Fingerprint }} +{{ $zzo := resources.Get "js/zzo.js" | resources.Minify | resources.Fingerprint }} + +{{ range .Site.Params.custom_js -}} + {{ $custom_template := resources.Get . }} + {{ if $custom_template }} + {{ $custom_js := $custom_template | resources.Minify | resources.Fingerprint }} + + {{ end }} +{{- end }} \ No newline at end of file diff --git a/layouts/partials/head/styles.html b/layouts/partials/head/styles.html index 445f7be..95ae80c 100644 --- a/layouts/partials/head/styles.html +++ b/layouts/partials/head/styles.html @@ -1,8 +1,12 @@ {{ $main_options := (dict "targetPath" "css/zzo.css" "outputStyle" "compressed") }} {{ $main_template := resources.Get "sass/main.scss" }} -{{ $main_style := $main_template | resources.ExecuteAsTemplate "main_parsed.scss" . | toCSS $main_options | minify }} +{{ $main_style := $main_template | resources.ExecuteAsTemplate "main_parsed.scss" . | toCSS $main_options | resources.Minify }} {{ range .Site.Params.custom_css -}} - + {{ $custom_template := resources.Get . }} + {{ if $custom_template }} + {{ $custom_style := $custom_template | resources.ToCSS | resources.Minify }} + + {{ end }} {{- end }} \ No newline at end of file