From 1cc7ddd7cde36b0d67137c6f53018edd6bf5a5d9 Mon Sep 17 00:00:00 2001 From: Hanzei Date: Thu, 26 Jul 2018 19:34:02 +0200 Subject: Canonify owlCarousel css path --- layouts/partials/footer/scripts.html | 4 ++-- layouts/partials/head/css.html | 6 +++--- layouts/partials/js/owlCarousel.html | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'layouts') diff --git a/layouts/partials/footer/scripts.html b/layouts/partials/footer/scripts.html index e3533d4..77fa926 100644 --- a/layouts/partials/footer/scripts.html +++ b/layouts/partials/footer/scripts.html @@ -1,5 +1,5 @@ -{{ $jQuery := resources.Get "vendor/jquery/jquery-3.3.1.min.js" }} -{{ $index := resources.Get "js/index.js" | minify }} +{{ $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 }} diff --git a/layouts/partials/head/css.html b/layouts/partials/head/css.html index 0079b5f..0b3f461 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 "style/main.tmp.css" . }} +{{ $bundleRaw := resources.Get "/sass/style.sass" | resources.ExecuteAsTemplate "/css/main.tmp.css" . }} {{ if .Site.IsServer }} -{{ $cssOpts := (dict "targetPath" "styles/main.css" "enableSourceMap" true ) }} +{{ $cssOpts := (dict "targetPath" "/css/main.css" "enableSourceMap" true ) }} {{ $bundle := $bundleRaw | toCSS $cssOpts }} {{ else }} -{{ $cssOpts := (dict "targetPath" "styles/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 34fb45e..36743f1 100644 --- a/layouts/partials/js/owlCarousel.html +++ b/layouts/partials/js/owlCarousel.html @@ -1,5 +1,5 @@ -{{ $owlCarousel := resources.Get "vendor/owlCarousel/owl.carousel.min.js" }} -{{ $initOwlCarousel := resources.Get "js/initOwlCarousel.js" | minify }} +{{ $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 }} -- cgit v1.2.3 From 54169c2cc8791b6e76e490931c7e9e6bd738b659 Mon Sep 17 00:00:00 2001 From: Hanzei Date: Thu, 26 Jul 2018 23:03:06 +0200 Subject: Dont show nav item for current language --- layouts/_default/terms.html | 2 +- layouts/partials/nav.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'layouts') diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 08760a0..c070bfe 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -2,7 +2,7 @@
{{- range $key, $value:= .Data.Terms -}} - {{ $key }} ({{ $value.Count }}) + {{ $key }} ({{ $value.Count }}) {{- end -}}
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index ba0f13e..66c312d 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -92,13 +92,13 @@ {{ end }} {{ end }} - {{ if gt (len $.Site.Home.AllTranslations.ByWeight) 1 }} {{ range $.Site.Home.AllTranslations.ByWeight }} - {{ .Language.LanguageName }} + {{ if ne .Language.LanguageName $.Language.LanguageName }} + {{ .Language.LanguageName }} {{ end }} {{ end }} - {{ if and .Site.Params.showRSSButton .Site.RSSLink }} + {{ if and .Site.Params.showRSSButton .Site.RSSLink }} {{ end }} {{ end }} -- cgit v1.2.3 From e638cc1db659dd937b991049975a5b2d9eec7449 Mon Sep 17 00:00:00 2001 From: Hanzei Date: Thu, 26 Jul 2018 23:11:44 +0200 Subject: Fix link in nav --- layouts/partials/nav.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'layouts') diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 66c312d..60680cc 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -43,7 +43,7 @@ {{ with .Site.GetPage "/home" }} {{ range sort (.Resources.ByType "page") "Params.weight" }} {{ if ne .Name "contact.md" }} - {{ .Title }} + {{ .Title }} {{ end }} {{ end }} {{ end }} @@ -88,7 +88,7 @@ {{ with .Site.GetPage "/home" }} {{ with .Resources.GetMatch "contact.md" }} - {{ .Title }} + {{ .Title }} {{ end }} {{ end }} -- cgit v1.2.3 From 757bd376e3226d5b9131c5650fac91e69103b1e7 Mon Sep 17 00:00:00 2001 From: Hanzei Date: Fri, 27 Jul 2018 01:29:33 +0200 Subject: Fix more assets paths --- layouts/index.html | 8 ++++---- layouts/partials/css/owlCarousel.html | 4 ++-- layouts/partials/js/owlCarousel.html | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'layouts') diff --git a/layouts/index.html b/layouts/index.html index e192241..802177d 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -109,10 +109,10 @@ {{ 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" . }} + {{ $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/css/owlCarousel.html b/layouts/partials/css/owlCarousel.html index 1a1368b..96a0669 100644 --- a/layouts/partials/css/owlCarousel.html +++ b/layouts/partials/css/owlCarousel.html @@ -1,4 +1,4 @@ -{{ $owlCarousel := resources.Get "vendor/owlCarousel/owl.carousel.min.css" }} -{{ $owlCarouselTheme := resources.Get "vendor/owlCarousel/owl.theme.default.min.css" }} +{{ $owlCarousel := resources.Get "/vendor/owlCarousel/owl.carousel.min.css" }} +{{ $owlCarouselTheme := resources.Get "/vendor/owlCarousel/owl.theme.default.min.css" }} {{ $owlCarouselBundle := slice $owlCarousel $owlCarouselTheme | resources.Concat "/css/owlCarousel.min.css" | fingerprint }} diff --git a/layouts/partials/js/owlCarousel.html b/layouts/partials/js/owlCarousel.html index 36743f1..5ffb506 100644 --- a/layouts/partials/js/owlCarousel.html +++ b/layouts/partials/js/owlCarousel.html @@ -1,5 +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 }} - -- cgit v1.2.3 From ef4cd37814ed3acb0d7cedbcef6d28372624217a Mon Sep 17 00:00:00 2001 From: Hanzei Date: Sun, 29 Jul 2018 09:21:19 +0200 Subject: Use doublequotes when possible --- layouts/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'layouts') diff --git a/layouts/index.html b/layouts/index.html index 802177d..6dede6b 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -73,9 +73,9 @@ {{ end }} {{ partial "home/projects.html" . }} - + {{ partial "home/blog.html" . }} - + {{ with .Resources.GetMatch "contact.md" }}
@@ -84,7 +84,7 @@ {{ .Content }}
{{ if .Site.Params.home.localTime }} -

{{ i18n "index_currentTime" . }} .

+

{{ i18n "index_currentTime" . }} .

{{ end }} {{ with .Site.Params.email }}

-- cgit v1.2.3 From 9422e3a1f15bba0c7252309295a311f6326b9142 Mon Sep 17 00:00:00 2001 From: Hanzei Date: Wed, 1 Aug 2018 10:09:14 +0200 Subject: Add section margin to home --- layouts/_default/baseof.html | 2 +- layouts/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'layouts') diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 0e3d569..0345ff8 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -12,7 +12,7 @@ {{ end }} -
+
{{ block "title" . }} diff --git a/layouts/index.html b/layouts/index.html index 6dede6b..6bb259f 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -8,7 +8,7 @@ {{ partial "css/owlCarousel.html" . }} -
+
{{ with .Site.GetPage "/home" }}
@@ -103,7 +103,7 @@ {{ partial "footer/text.html" . }}
-
+
{{ partial "footer/scripts.html" . }} {{ partial "js/owlCarousel.html" . }} -- cgit v1.2.3