diff options
author | Hanzei <16541325+hanzei@users.noreply.github.com> | 2018-11-28 22:50:50 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-28 22:50:50 +0300 |
commit | 3a6144e557b1ec8befb653ac0008ebe47f057d93 (patch) | |
tree | 44d718c5fad544a1b435ea982f51a6181a8932df /layouts/partials | |
parent | 5895d84506e343b20d34d76c51edcc879602d666 (diff) |
Fix assets for thems site (#111)
* Fix font path
* Fix favicon path
* Revert "Serve hugo pipes assets with .RelPermalink (#107)"
This reverts commit 88aa5812f5e081e32853135981cf5784f6c5d5a4.
* Use relLangURL
* Rebuild docs
Diffstat (limited to 'layouts/partials')
-rw-r--r-- | layouts/partials/css/owlCarousel.html | 2 | ||||
-rw-r--r-- | layouts/partials/footer/scripts.html | 2 | ||||
-rw-r--r-- | layouts/partials/head/css.html | 6 | ||||
-rw-r--r-- | layouts/partials/head/favicons.html | 2 | ||||
-rw-r--r-- | layouts/partials/js/owlCarousel.html | 2 | ||||
-rw-r--r-- | layouts/partials/nav.html | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/layouts/partials/css/owlCarousel.html b/layouts/partials/css/owlCarousel.html index d5e030d..d42e685 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" }} {{ $owlCarouselBundle := slice $owlCarousel $owlCarouselTheme | resources.Concat "/styles/owlCarousel.min.css" | fingerprint }} -<link rel="stylesheet" href="{{ $owlCarouselBundle.RelPermalink }}" integrity="{{ $owlCarouselBundle.Data.Integrity }}" media="screen"> +<link rel="stylesheet" href="{{ $owlCarouselBundle.Permalink }}" integrity="{{ $owlCarouselBundle.Data.Integrity }}" media="screen"> diff --git a/layouts/partials/footer/scripts.html b/layouts/partials/footer/scripts.html index 2ad1fda..77fa926 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 }} -<script src="{{ $scripts.RelPermalink }}" integrity="{{ $scripts.Data.Integrity }}"></script> +<script src="{{ $scripts.Permalink }}" integrity="{{ $scripts.Data.Integrity }}"></script> {{ template "_internal/google_analytics_async.html" . }} diff --git a/layouts/partials/head/css.html b/layouts/partials/head/css.html index 28d8d91..0b3f461 100644 --- a/layouts/partials/head/css.html +++ b/layouts/partials/head/css.html @@ -3,16 +3,16 @@ {{ if .Site.IsServer }} {{ $cssOpts := (dict "targetPath" "/css/main.css" "enableSourceMap" true ) }} {{ $bundle := $bundleRaw | toCSS $cssOpts }} -<link rel="stylesheet" href="{{ $bundle.RelPermalink }}" media="screen"> +<link rel="stylesheet" href="{{ $bundle.Permalink }}" media="screen"> {{ else }} {{ $cssOpts := (dict "targetPath" "/css/main.css" ) }} {{ $postCSSOpts := (dict "use" "autoprefixer" ) }} {{ $bundle := $bundleRaw | toCSS $cssOpts | postCSS $postCSSOpts | minify | fingerprint }} -<link rel="stylesheet" href="{{ $bundle.RelPermalink }}" integrity="{{ $bundle.Data.Integrity }}" media="screen"> +<link rel="stylesheet" href="{{ $bundle.Permalink }}" integrity="{{ $bundle.Data.Integrity }}" media="screen"> {{ end }} <!-- Custom css --> {{ range .Site.Params.customCSS -}} {{ $style := resources.Get . }} - <link rel="stylesheet" href="{{ $style.RelPermalink }}" integrity="{{ $style.Data.Integrity }}" media="screen"> + <link rel="stylesheet" href="{{ $style.Permalink }}" integrity="{{ $style.Data.Integrity }}" media="screen"> {{- end }} diff --git a/layouts/partials/head/favicons.html b/layouts/partials/head/favicons.html index 2e77ade..e1c93d0 100644 --- a/layouts/partials/head/favicons.html +++ b/layouts/partials/head/favicons.html @@ -1,3 +1,3 @@ {{ with .Site.Params.favicon }} -<link rel="shortcut icon" href="{{ . | absURL }}"> +<link rel="shortcut icon" href="{{ . | relURL }}"> {{ end }} diff --git a/layouts/partials/js/owlCarousel.html b/layouts/partials/js/owlCarousel.html index 62d16e9..5ffb506 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 }} -<script src="{{ $bundleOwlCarousel.RelPermalink }}" integrity="{{ $bundleOwlCarousel.Data.Integrity }}"></script> +<script src="{{ $bundleOwlCarousel.Permalink }}" integrity="{{ $bundleOwlCarousel.Data.Integrity }}"></script> diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 4f1044c..c266ac4 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -37,7 +37,7 @@ {{ else }} <!-- use default menu --> {{ if not $isHome }} - <a class="navbar-item" href="{{ "/" | absLangURL }}">{{ i18n "nav_main" . }}</a> + <a class="navbar-item" href="{{ "/" | relLangURL }}">{{ i18n "nav_main" . }}</a> {{ end }} {{ with .Site.GetPage "/home" }} |