diff options
| author | Lutong Chen <ertuil98@foxmail.com> | 2020-03-22 05:20:22 +0300 |
|---|---|---|
| committer | Lutong Chen <ertuil98@foxmail.com> | 2020-03-22 05:20:22 +0300 |
| commit | 053ff8b6b55578b35a384569c88e30f8e2541c9a (patch) | |
| tree | ded3549e3bca5d848f14531d62eaf9e85e00b93b /layouts | |
| parent | c9439f14696231b1d661189aeacfb1a0b57ff6f6 (diff) | |
| parent | bb19c432c2df52a795df953788694817d320105d (diff) | |
Merge branch 'master' into dev
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/partials/head.html | 4 | ||||
| -rw-r--r-- | layouts/partials/nav.html | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 5da22de..737ad40 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -2,7 +2,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>{{ .Site.Title }}{{if.Title}} - {{.Title}} {{end}}</title> + <title>{{ .Site.Title }}{{if and (not .IsHome) (.Title)}} - {{.Title}} {{end}}</title> {{if .Params.tags}} @@ -50,4 +50,4 @@ <script src="/self/js/lazysizes.min.js" async></script> {{- partial "self-define-head.html" -}} -</head>
\ No newline at end of file +</head> diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index c9b4a6a..d3c102f 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -31,8 +31,10 @@ <dd><a href="/post/">Posts</a></dd> <!--<dd><a href="/gallery/">Gallery</a></dd>--> - {{ range sort .Site.Menus.main }} - <dd><a href="{{ .URL }}">{{ .Name }}</a></dd> + {{ if .Site.Menus.main }} + {{ range sort .Site.Menus.main }} + <dd><a href="{{ .URL }}">{{ .Name }}</a></dd> + {{ end }} {{ end }} </dl> </li> |