Pawlik
/
meghna-hugo
關註 1
收藏 0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 1 Wiki Activity
瀏覽代碼

Merge branch 'master' into use-lozad-for-all-webp-img

tags/v1.0.0
divinerites 4 年之前
父節點
ffbcd05bc3 39e30adc92
當前提交
fedcdb0cba
No account linked to committer's email address
共有 24 個文件被更改，包括 80 次插入 和 81 次删除
分割檢視 顯示文件統計
  1. 1
    1
      exampleSite/config.toml
  2. 2
    2
      layouts/404.html
  3. 2
    2
      layouts/_default/baseof.html
  4. 3
    3
      layouts/_default/list.html
  5. 1
    1
      layouts/_default/single.html
  6. 5
    5
      layouts/author/single.html
  7. 4
    4
      layouts/partials/about.html
  8. 1
    1
      layouts/partials/banner.html
  9. 4
    4
      layouts/partials/blog.html
  10. 5
    5
      layouts/partials/contact.html
  11. 1
    1
      layouts/partials/cta.html
  12. 1
    1
      layouts/partials/feature.html
  13. 9
    9
      layouts/partials/footer.html
  14. 1
    1
      layouts/partials/funfacts.html
  15. 6
    6
      layouts/partials/head.html
  16. 4
    4
      layouts/partials/map.html
  17. 9
    10
      layouts/partials/navigation.html
  18. 3
    3
      layouts/partials/portfolio.html
  19. 3
    3
      layouts/partials/preloader.html
  20. 4
    4
      layouts/partials/pricing.html
  21. 4
    4
      layouts/partials/service.html
  22. 3
    3
      layouts/partials/skill.html
  23. 3
    3
      layouts/partials/team.html
  24. 1
    1
      layouts/partials/testimonial.html

+ 1
- 1
exampleSite/config.toml 查看文件

@@ -148,4 +148,4 @@ languageCode = "fr-fr"
contentDir = "content/french"
weight = 2
home = "Accueil"
copyright = "copyright et copie; 2020 [gethugothemes] (https://gethugothemes.com) tous droits réservés"
copyright = "copyright © 2020 [gethugothemes](https://gethugothemes.com) tous droits réservés"

+ 2
- 2
layouts/404.html 查看文件

@@ -8,10 +8,10 @@
<div class="col-12 text-center">
<h1>404</h1>
<h2>Page Not Found</h2>
<a class="btn btn-main" href="{{ .Site.BaseURL | relLangURL }}">Back to home</a>
<a class="btn btn-main" href="{{ site.BaseURL | relLangURL }}">Back to home</a>
</div>
</div>
</div>
</section>

{{ end }}
{{ end }}

+ 2
- 2
layouts/_default/baseof.html 查看文件

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-us{{ end }}">
<html lang="{{ with site.LanguageCode }}{{ . }}{{ else }}en-us{{ end }}">
{{ partial "head.html" . }}

<body id="body" data-spy="scroll" data-target=".navbar" data-offset="55">
@@ -10,4 +10,4 @@
{{- partial "footer.html" . -}}
</body>

</html>
</html>

+ 3
- 3
layouts/_default/list.html 查看文件

@@ -9,8 +9,8 @@
<div class="col-12">
{{"<!-- section title -->" | safeHTML}}
<div class="title text-center wow fadeInDown">
<h2>{{ with i18n "blogTitle" }} {{ index (split . " ") 0 }} {{ end }}<span class="color">
{{ with i18n "blogTitle" }} {{ index (split . " ") 1 }} {{ end }}</span></h2>
<h2>{{ with i18n "blogTitle" }} {{ index (split . " ") 0 | safeHTML }} {{ end }}<span class="color">
{{ with i18n "blogTitle" }} {{ index (split . " ") 1 | safeHTML }} {{ end }}</span></h2>
<div class="border-meghna"></div>
</div>
</div>
@@ -27,4 +27,4 @@
</section>
{{"<!-- /blog -->" | safeHTML}}

{{ end }}
{{ end }}

+ 1
- 1
layouts/_default/single.html 查看文件

@@ -17,7 +17,7 @@
<div class="post-single-content">
{{ .Content }}
</div>
{{ if .Site.Params.post_share }}
{{ if site.Params.post_share }}
{{ partial "post-share.html" . }}
{{ end }}
<!-- comments -->

+ 5
- 5
layouts/author/single.html 查看文件

@@ -7,8 +7,8 @@
<div class="row">
<div class="col-lg-10 mx-auto">
<div class="title text-center">
<h2>{{ with i18n "aboutAuthor" }} {{ index (split . " ") 0 }} {{ end }}<span class="color">
{{ with i18n "aboutAuthor" }} {{ index (split . " ") 1 }} {{ end }} </span></h2>
<h2>{{ with i18n "aboutAuthor" }} {{ index (split . " ") 0 | safeHTML }} {{ end }}<span class="color">
{{ with i18n "aboutAuthor" }} {{ index (split . " ") 1 | safeHTML }} {{ end }} </span></h2>
<div class="border-meghna"></div>
</div>
<div class="content text-center">
@@ -45,12 +45,12 @@
<div class="row">
<div class="col-lg-12">
<div class="title text-center">
<h2>{{ with i18n "authorsPosts" }} {{ index (split . " ") 0 }} {{ end }}<span class="color">
{{ with i18n "authorsPosts" }} {{ index (split . " ") 1 }} {{ end }}</h2>
<h2>{{ with i18n "authorsPosts" }} {{ index (split . " ") 0 | safeHTML }} {{ end }}<span class="color">
{{ with i18n "authorsPosts" }} {{ index (split . " ") 1 | safeHTML }} {{ end }}</h2>
<div class="border-meghna"></div>
</div>
</div>
{{ range where .Site.RegularPages "Params.author" .Title }}
{{ range where site.RegularPages "Params.author" .Title }}
{{ .Render "article" }}
{{ end }}
</div>

+ 4
- 4
layouts/partials/about.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.about.about.enable }}
{{ with $data.about.about }}
@@ -9,8 +9,8 @@
<div class="col-lg-12">
{{"<!-- section title -->" | safeHTML}}
<div class="title text-center wow fadeIn" data-wow-duration="1500ms">
<h2> {{ with .title }} {{ index (split . " ") 0 }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 }} {{ end }} </span></h2>
<h2> {{ with .title }} {{ index (split . " ") 0 | safeHTML }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 | safeHTML }} {{ end }} </span></h2>
<div class="border-meghna"></div>
</div>
</div>
@@ -36,4 +36,4 @@
</section>
{{"<!-- /about -->" | safeHTML}}
{{ end }}
{{ end }}
{{ end }}

+ 1
- 1
layouts/partials/banner.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.banner.banner.enable }}
{{ with $data.banner.banner }}

+ 4
- 4
layouts/partials/blog.html 查看文件

@@ -1,4 +1,4 @@
{{ if gt .Site.RegularPages 0}}
{{ if gt site.RegularPages 0}}
{{"<!-- Start Blog Section -->" | safeHTML}}
<section id="blog" class="section">
<div class="container">
@@ -6,14 +6,14 @@
<div class="col-lg-12">
{{"<!-- section title -->" | safeHTML}}
<div class="title text-center wow fadeInDown">
<h2>{{ with i18n "blogTitle" }} {{ index (split . " ") 0 }} {{ end }}<span class="color">
{{ with i18n "blogTitle" }} {{ index (split . " ") 1 }} {{ end }}</span></h2>
<h2>{{ with i18n "blogTitle" }} {{ index (split . " ") 0 | safeHTML }} {{ end }}<span class="color">
{{ with i18n "blogTitle" }} {{ index (split . " ") 1 | safeHTML }} {{ end }}</span></h2>
<div class="border-meghna"></div>
</div>
</div>
{{"<!-- /section title -->" | safeHTML}}

{{ range first 3 (where .Site.RegularPages "Section" "==" "blog")}}
{{ range first 3 (where site.RegularPages "Section" "==" "blog")}}
{{ .Render "article"}}
{{ end }}


+ 5
- 5
layouts/partials/contact.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.contact.contact.enable }}
{{ with $data.contact.contact }}
@@ -9,8 +9,8 @@
<div class="col-lg-12">
{{"<!-- section title -->" | safeHTML}}
<div class="title text-center wow fadeIn" data-wow-duration="500ms">
<h2>{{ with .title }} {{ index (split . " ") 0 }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 }} {{ end }}</span></h2>
<h2>{{ with .title }} {{ index (split . " ") 0 | safeHTML }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 | safeHTML }} {{ end }}</span></h2>
<div class="border-meghna"></div>
</div>
</div>
@@ -20,7 +20,7 @@
<div class="contact-info col-lg-6 wow fadeInUp" data-wow-duration="500ms">
<h3>{{ .subtitle | markdownify }}</h3>
<p> {{ .content | markdownify }} </p>
{{ if .contact_form.enable }}
<div class="contact-details">
{{ range .contact_list }}
@@ -71,4 +71,4 @@
</section>
{{"<!-- /contact -->" | safeHTML}}
{{ end }}
{{ end }}
{{ end }}

+ 1
- 1
layouts/partials/cta.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.cta.cta.enable}}
{{ with $data.cta.cta}}

+ 1
- 1
layouts/partials/feature.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.feature.feature.enable }}
{{ with $data.feature.feature }}

+ 9
- 9
layouts/partials/footer.html 查看文件

@@ -7,7 +7,7 @@
{{"<!-- Footer Social Links -->" | safeHTML}}
<div class="social-icon">
<ul class="list-inline">
{{ range .Site.Params.social }}
{{ range site.Params.social }}
<li class="list-inline-item"><a href="{{ .link | safeURL }}"><i class="{{ .icon }}"></i></a></li>
{{ end }}
</ul>
@@ -15,11 +15,11 @@

{{"<!-- copyright -->" | safeHTML}}
<div class="copyright text-center">
<a href="{{ .Site.BaseURL | absLangURL }}">
<img src="{{ .Site.Params.logo | absURL }}" alt="{{ .Site.Title }}" />
<a href="{{ site.Home.Permalink }}">
<img src="{{ site.Params.logo | absURL }}" alt="{{ site.Title }}" />
</a>
<br>
<p>{{ .Site.Params.copyright | markdownify }}</p>
<p>{{ site.Params.copyright | markdownify }}</p>
</div>
</div>
</div>
@@ -28,15 +28,15 @@
{{"<!-- /footer -->" | safeHTML}}

{{ "<!-- Google Map API -->" | safeHTML }}
{{ if .Site.Params.map.enable }}
<script src="{{ .Site.Params.map.gmap_api | safeURL }}"></script>
{{ if site.Params.map.enable }}
<script src="{{ site.Params.map.gmap_api | safeURL }}"></script>
{{ end }}

{{ "<!-- JS Plugins -->" | safeHTML }}
{{ range .Site.Params.plugins.js}}
{{ range site.Params.plugins.js}}
<script src="{{ .link | absURL }}"></script>
{{ end }}

{{ "<!-- Main Script -->" | safeHTML }}
{{ $script := resources.Get "js/script.js" | minify}}
<script src="{{ $script.Permalink }}"></script>
{{ $script := resources.Get "js/script.js" | minify | fingerprint "sha384"}
<script src="{{ $script.Permalink }}" integrity="{{ $script.Data.Integrity }}"></script>

+ 1
- 1
layouts/partials/funfacts.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.funfacts.funfacts.enable }}
{{ with $data.funfacts.funfacts }}

+ 6
- 6
layouts/partials/head.html 查看文件

@@ -4,19 +4,19 @@

{{ "<!-- mobile responsive meta -->" | safeHTML }}
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}">
{{ with .Site.Params.author }}
<meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{ with site.Params.description }}{{ . }}{{ end }}{{ end }}">
{{ with site.Params.author }}
<meta name="author" content="{{ . }}">{{ end }}
{{ hugo.Generator }}

{{ "<!-- plugins -->" | safeHTML }}
{{ range .Site.Params.plugins.css }}
{{ range site.Params.plugins.css }}
<link rel="stylesheet" href="{{ .link | absURL }}">
{{ end }}

{{"<!-- Main Stylesheet -->"|safeHTML}}
{{ $styles := resources.Get "css/style.css" | minify}}
<link rel="stylesheet" href="{{ $styles.Permalink }}" media="screen">
{{ $styles := resources.Get "css/style.css" | minify | fingerprint "sha384" }}
<link rel="stylesheet" href="{{ $styles.Permalink }}" integrity="{{ $styles.Data.Integrity }}" media="screen">

{{"<!-- Custom stylesheet - for your changes -->" |safeHTML}}
<link rel="stylesheet" href="{{ `css/custom.css` | relURL}}" media="screen">
@@ -25,7 +25,7 @@
<link rel="shortcut icon" href="{{ `images/favicon.png` | absURL }}" type="image/x-icon">
<link rel="icon" href="{{ `images/favicon.png` | absURL }}" type="image/x-icon">

{{ with .Site.Params.google_analytics_id }}
{{ with site.Params.google_analytics_id }}
{{ "<!-- Global Site Tag (gtag.js) - Google Analytics -->" | safeHTML }}
<script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
<script>

+ 4
- 4
layouts/partials/map.html 查看文件

@@ -1,11 +1,11 @@
{{ if .Site.Params.map.enable }}
{{ with .Site.Params.map }}
{{ if site.Params.map.enable }}
{{ with site.Params.map }}
{{"<!-- Google Map -->" | safeHTML}}
<div class="google-map">
<div id="map" data-latitude="{{ .map_latitude }}"
data-longitude="{{ .map_longitude }}"
data-marker="{{ .map_marker | absURL }}"
data-marker-name="{{ $.Site.Title }}"></div>
data-marker-name="{{ $site.Title }}"></div>
</div>
{{ end }}
{{ end }}
{{ end }}

+ 9
- 10
layouts/partials/navigation.html 查看文件

@@ -2,10 +2,10 @@
<div class="container">
<nav class="navbar navbar-expand-lg navbar-dark">
<a class="navbar-brand p-0" href="{{ .Site.BaseURL | relLangURL }}">
{{ if .Site.Params.logo }}
{{ if site.Params.logo }}
<img class="lozad img-fluid" data-src="{{ site.Params.logo | absURL }}" alt="{{ .Site.Title }}">
{{ else }}
{{ .Site.Title }}
{{ site.Title }}
{{ end }}
</a>

@@ -15,31 +15,30 @@

<div class="collapse navbar-collapse" id="navigation">
<ul class="navbar-nav ml-auto">
<li class="nav-item"><a class="nav-link" href="#body">{{ .Site.Params.home }}</a></li>
<li class="nav-item"><a class="nav-link" href="#body">{{ site.Params.home }}</a></li>
{{ if .IsHome }}
{{ range .Site.Menus.main }}
{{ range site.Menus.main }}
<li class="nav-item"><a class="nav-link" href="#{{ .URL }}">{{ i18n .Name }}</a></li>
{{ end }}

{{ else }}

{{ range .Site.Menus.main }}
<li class="nav-item"><a class="nav-link" href="{{ $.Site.BaseURL | relLangURL }}#{{ .URL }}">{{ i18n .Name }}</a>
{{ range site.Menus.main }}
<li class="nav-item"><a class="nav-link" href="{{ $site.BaseURL | relLangURL }}#{{ .URL }}">{{ i18n .Name }}</a>
</li>
{{ end }}
{{ end }}


{{ range .Site.Menus.static }}
{{ range site.Menus.static }}
<li class="nav-item"><a class="nav-link" target="_blank" href="{{ .URL }}">{{ i18n .Name }}</a>
</li>
{{ end }}

</ul>
<!-- Language List -->
{{- if .Site.IsMultiLingual }}
{{- if site.IsMultiLingual }}
<select id="select-language" onchange="location = this.value;">
{{ $siteLanguages := .Site.Languages}}
{{ $siteLanguages := site.Languages}}
{{ $pageLang := .Page.Lang}}
{{ range .Page.AllTranslations }}
{{ $translation := .}}

+ 3
- 3
layouts/partials/portfolio.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.portfolio.portfolio.enable }}
{{ with $data.portfolio.portfolio }}
@@ -9,8 +9,8 @@
<div class="col-xl-12">
{{"<!-- section title -->" | safeHTML}}
<div class="title text-center">
<h2>{{ with .title }} {{ index (split . " ") 0 }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 }} {{ end }}</span></h2>
<h2>{{ with .title }} {{ index (split . " ") 0 | safeHTML }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 | safeHTML }} {{ end }}</span></h2>
<div class="border-meghna"></div>
</div>
{{"<!-- /section title -->" | safeHTML}}

+ 3
- 3
layouts/partials/preloader.html 查看文件

@@ -1,9 +1,9 @@
{{ if .Site.Params.preloader.enable }}
{{ if site.Params.preloader.enable }}
{{ "<!-- preloader start -->" | safeHTML }}
<div class="preloader">
{{ with .Site.Params.preloader.preloader }}
{{ with site.Params.preloader.preloader }}
<img src="{{ . | absURL }}" alt="preloader">
{{ end }}
</div>
{{ "<!-- preloader end -->" | safeHTML }}
{{ end }}
{{ end }}

+ 4
- 4
layouts/partials/pricing.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.pricing.pricing.enable }}
{{ with $data.pricing.pricing }}
@@ -10,8 +10,8 @@
{{"<!-- section title -->" | safeHTML}}
<div class="col-lg-12">
<div class="title text-center wow fadeInDown" data-wow-duration="500ms">
<h2>{{ with .title }} {{ index (split . " ") 0 }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 }} {{ end }}</span></h2>
<h2>{{ with .title }} {{ index (split . " ") 0 | safeHTML }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 | safeHTML }} {{ end }}</span></h2>
<div class="border-meghna"></div>
</div>
</div>
@@ -48,4 +48,4 @@
</section>
{{"<!-- /pricing -->" | safeHTML}}
{{ end }}
{{ end }}
{{ end }}

+ 4
- 4
layouts/partials/service.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.service.service.enable}}
{{ with $data.service.service}}
@@ -9,8 +9,8 @@
<div class="col-lg-12">
{{"<!-- section title -->" | safeHTML }}
<div class="title text-center wow fadeIn" data-wow-duration="500ms">
<h2>{{ with .title }} {{ index (split . " ") 0 }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 }} {{ end }} </span></h2>
<h2>{{ with .title }} {{ index (split . " ") 0 | safeHTML }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 | safeHTML }} {{ end }} </span></h2>
<div class="border-meghna"></div>
</div>
</div>
@@ -34,4 +34,4 @@
</section>
{{"<!-- /service -->" | safeHTML }}
{{ end }}
{{ end }}
{{ end }}

+ 3
- 3
layouts/partials/skill.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.skill.skill.enable }}
{{ with $data.skill.skill }}
@@ -9,8 +9,8 @@
{{"<!-- section title -->" | safeHTML }}
<div class="col-lg-12">
<div class="title text-center">
<h2>{{ with .title }} {{ index (split . " ") 0 }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 }} {{ end }} </span></h2>
<h2>{{ with .title }} {{ index (split . " ") 0 | safeHTML }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 | safeHTML }} {{ end }} </span></h2>
<div class="border-meghna"></div>
</div>
</div>

+ 3
- 3
layouts/partials/team.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.team.team.enable }}
{{ with $data.team.team }}
@@ -9,8 +9,8 @@
<div class="col-lg-12">
{{"<!-- section title -->" | safeHTML}}
<div class="title text-center wow fadeInUp" data-wow-duration="500ms">
<h2>{{ with .title }} {{ index (split . " ") 0 }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 }} {{ end }}</span></h2>
<h2>{{ with .title }} {{ index (split . " ") 0 | safeHTML }} {{ end }}<span class="color">
{{ with .title }} {{ index (split . " ") 1 | safeHTML }} {{ end }}</span></h2>
<div class="border-meghna"></div>
</div>
</div>

+ 1
- 1
layouts/partials/testimonial.html 查看文件

@@ -1,4 +1,4 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
{{ $data := index site.Data site.Language.Lang }}

{{ if $data.testimonial.testimonial.enable }}
{{ with $data.testimonial.testimonial }}

Write Preview
Loading…
取消
儲存