diff options
| author | Seshal Jain <seshaljain11@gmail.com> | 2019-11-25 22:49:01 +0300 |
|---|---|---|
| committer | Curtis Timson <curt@live.co.uk> | 2019-11-25 22:49:01 +0300 |
| commit | b486b3d83b9ff134944c6f1e9ad6a9ba0aee4806 (patch) | |
| tree | b7c9646611fb58b947fdcc98c4a602919202d4bc /layouts | |
| parent | 8b5823791d55cd219c8c13d94b37aff20b60fe42 (diff) | |
Add asset handling using Hugo Pipes (#80)6.0.0
* HUGO PIPES: move css/scss to assets
* HUGO PIPES: move js to assets
* Update partial htmlhead to reflect hugo pipes usage
* Check in `resources` folder as temporary fix for Pipes to work on Netlify
* Add exampleSite/resources
* Update version and change log
* Remove commented code
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/partials/htmlhead.html | 12 | ||||
| -rw-r--r-- | layouts/partials/scripts/index.html | 19 |
2 files changed, 22 insertions, 9 deletions
diff --git a/layouts/partials/htmlhead.html b/layouts/partials/htmlhead.html index 35ea1a8..16fd6d8 100644 --- a/layouts/partials/htmlhead.html +++ b/layouts/partials/htmlhead.html @@ -9,9 +9,17 @@ <title>{{ if eq (.Site.Title) (.Title) }}{{ .Site.Title }}{{ else }}{{ .Title }} · {{ .Site.Title }}{{ end }}</title> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" /> - <link rel="stylesheet" href='{{ "assets/css/main.css" | relURL }}' /> + <!-- CSS --> + {{ if .Site.IsServer }} + {{ $style := resources.Get "scss/main.scss" | resources.ExecuteAsTemplate "main.scss" . | toCSS (dict "targetPath" "assets/css/main.css" "enableSourceMap" true) }} + <link rel="stylesheet" href="{{ ($style).RelPermalink }}"> + {{ else }} + {{ $style := resources.Get "scss/main.scss" | resources.ExecuteAsTemplate "main.scss" . | toCSS (dict "targetPath" "assets/css/main.css" "enableSourceMap" false) }} + <link rel="stylesheet" href="{{ ($style | minify).RelPermalink }}"> + {{ end }} {{ with .Site.Params.favicon }} <link rel="shortcut icon" href="{{ . }}"> {{ end }} - <noscript><link rel="stylesheet" href='{{ "assets/css/noscript.css" | relURL }}' /></noscript> + {{ $noscript := resources.Get "scss/noscript.scss" | resources.ExecuteAsTemplate "noscript.scss" . | toCSS (dict "targetPath" "assets/css/noscript.css" "enableSourceMap" false) }} + <noscript><link rel="stylesheet" href='{{ $noscript.RelPermalink }}' /></noscript> </head> diff --git a/layouts/partials/scripts/index.html b/layouts/partials/scripts/index.html index 4b4d14a..14d356b 100644 --- a/layouts/partials/scripts/index.html +++ b/layouts/partials/scripts/index.html @@ -1,8 +1,13 @@ +{{ $jQuery := resources.Get "js/jquery.min.js" }} +{{ $scrollex := resources.Get "js/jquery.scrollex.min.js" }} +{{ $scrolly := resources.Get "js/jquery.scrolly.min.js" }} +{{ $browser := resources.Get "js/browser.min.js" }} +{{ $breakpoints := resources.Get "js/breakpoints.min.js" }} +{{ $util := resources.Get "js/util.js" }} +{{ $main := resources.Get "js/main.js" }} + +{{ $js := slice $jQuery $scrollex $scrolly $browser $breakpoints $util $main | resources.Concat "assets/js/bundle.js" }} + <!-- Scripts --> -<script src='{{ "assets/js/jquery.min.js" | relURL }}'></script> -<script src='{{ "assets/js/jquery.scrollex.min.js" | relURL }}'></script> -<script src='{{ "assets/js/jquery.scrolly.min.js" | relURL }}'></script> -<script src='{{ "assets/js/browser.min.js" | relURL }}'></script> -<script src='{{ "assets/js/breakpoints.min.js" | relURL }}'></script> -<script src='{{ "assets/js/util.js" | relURL }}'></script> -<script src='{{ "assets/js/main.js" | relURL }}'></script> +<script src='{{ $js.RelPermalink }}'></script> + |