From a094f8fe7bfefbf150f20f068243d210de14d6c7 Mon Sep 17 00:00:00 2001
From: Luiz de Prá <rawarkanis@gmail.com>
Date: Sat, 15 Sep 2018 12:45:29 +0000
Subject: [PATCH] Fix assets permalinks
---
layouts/_default/baseof.html | 8 ++++----
Makefile | 5 ++---
layouts/partials/header.html | 2 +-
layouts/partials/home.html | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index aebf9de..b28625e 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,8 @@
mkdir -p demo/themes/hugo-coder
rsync -av exampleSite/ demo
rsync -av --exclude='demo' --exclude='exampleSite' --exclude='.git' . demo/themes/hugo-coder
- cd demo && ./hugow
- cd .. && rm -rf resources
- cp -r demo/resources resources
+ cd ./demo && ./hugow
+ rm -rf ./resources && cp -r ./demo/resources ./resources
clean:
rm -rf demo
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index ad63fc0..4ff6488 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -21,22 +21,22 @@
{{ if .Site.IsServer }}
{{ $cssOpts := (dict "targetPath" "css/coder.css" "enableSourceMap" true ) }}
{{ $styles := resources.Get "scss/coder.scss" | resources.ExecuteAsTemplate "style.coder.css" . | toCSS $cssOpts }}
- <link rel="stylesheet" href="{{ $styles.Permalink }}" media="screen">
+ <link rel="stylesheet" href="{{ $styles.RelPermalink }}" media="screen">
{{ else }}
{{ $cssOpts := (dict "targetPath" "css/coder.css" ) }}
{{ $styles := resources.Get "scss/coder.scss" | resources.ExecuteAsTemplate "style.coder.css" . | toCSS $cssOpts | minify | fingerprint }}
- <link rel="stylesheet" href="{{ $styles.Permalink }}" integrity="{{ $styles.Data.Integrity }}" media="screen">
+ <link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Integrity }}" media="screen">
{{ end }}
{{ if .Site.Params.rtl }}
{{ if .Site.IsServer }}
{{ $cssOpts := (dict "targetPath" "css/coder-rtl.css" "enableSourceMap" true ) }}
{{ $styles := resources.Get "scss/coder-rtl.scss" | resources.ExecuteAsTemplate "style.coder-rtl.css" . | toCSS $cssOpts }}
- <link rel="stylesheet" href="{{ $styles.Permalink }}" media="screen">
+ <link rel="stylesheet" href="{{ $styles.RelPermalink }}" media="screen">
{{ else }}
{{ $cssOpts := (dict "targetPath" "css/coder-rtl.css" ) }}
{{ $styles := resources.Get "scss/coder-rtl.scss" | resources.ExecuteAsTemplate "style.coder-rtl.css" . | toCSS $cssOpts | minify | fingerprint }}
- <link rel="stylesheet" href="{{ $styles.Permalink }}" integrity="{{ $styles.Data.Integrity }}" media="screen">
+ <link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Integrity }}" media="screen">
{{ end }}
{{ end }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 5c1a88c..2887d6f 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -9,7 +9,7 @@
{{ with .Site.Menus.main}}
{{ range sort . }}
<li class="navigation-item">
- <a class="navigation-link" href="{{ .URL | absLangURL }}">{{ .Name }}</a>
+ <a class="navigation-link" href="{{ .URL | relLangURL }}">{{ .Name }}</a>
</li>
{{ end }}
{{ end }}
diff --git a/layouts/partials/home.html b/layouts/partials/home.html
index 9df0e00..f1d7f50 100644
--- a/layouts/partials/home.html
+++ b/layouts/partials/home.html
@@ -1,7 +1,7 @@
<section class="container centered">
<div class="about">
{{ with .Site.Params.avatarurl }}
- <div class="avatar"><img src="{{.}}" alt="avatar"></div>
+ <div class="avatar"><img src="{{ . }}" alt="avatar"></div>
{{ end }}
<h1>{{ .Site.Params.author }}</h1>
<h2>{{ .Site.Params.info }}</h2>
--
Gitblit v1.10.0