diff options
author | Layton Chen <layton.chen@outlook.com> | 2020-10-28 11:55:51 +0300 |
---|---|---|
committer | Layton Chen <layton.chen@outlook.com> | 2020-10-28 11:55:51 +0300 |
commit | e42c103267717a21ff6bae6622fa7178a394c72d (patch) | |
tree | d7be82c773faa58985a912f897da39390325fcca | |
parent | a57ff37058f95c29bbbea727e8109d6cbc58dbfe (diff) | |
parent | 43a576e782a27050f246b5cc6afe119ca1364646 (diff) |
Merge branch 'master' into dev
-rw-r--r-- | layouts/_default/list.html | 2 | ||||
-rw-r--r-- | layouts/gallery/list.html | 4 | ||||
-rw-r--r-- | layouts/index.html | 2 | ||||
-rw-r--r-- | layouts/partials/footer.html | 2 | ||||
-rw-r--r-- | layouts/partials/head.html | 12 | ||||
-rw-r--r-- | layouts/partials/info.html | 6 | ||||
-rw-r--r-- | layouts/partials/nav.html | 14 | ||||
-rw-r--r-- | layouts/zone/list.html | 4 |
8 files changed, 23 insertions, 23 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index f6dc82f..8cfc7e5 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -11,7 +11,7 @@ </div> </div> <div class="layui-col-md6 layui-col-sm12 layui-col-xs12" style="text-align:center;"> - <img src="/self/img/undraw_chat_bot_kli5.png" class="list-title-pic"> + <img src="{{ "/self/img/undraw_chat_bot_kli5.png" | relURL }}" class="list-title-pic"> </div> </div> </div> diff --git a/layouts/gallery/list.html b/layouts/gallery/list.html index 0489649..cbfb487 100644 --- a/layouts/gallery/list.html +++ b/layouts/gallery/list.html @@ -11,7 +11,7 @@ </div> </div> <div class="layui-col-md5 layui-col-sm6 layui-col-xs12" style="text-align:center;"> - <img src="/self/img/undraw_quiz_nlyh.png" class="list-title-pic"> + <img src="{{ "/self/img/undraw_quiz_nlyh.png" | relURL }}" class="list-title-pic"> </div> </div> </div> @@ -27,4 +27,4 @@ </main> -{{end}}
\ No newline at end of file +{{end}} diff --git a/layouts/index.html b/layouts/index.html index 5d6db6c..eaf2f8b 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -7,7 +7,7 @@ <div class="layui-container"> <div class="layui-row about"> <div class="layui-col-xs12 layui-col-sm4 layui-col-md4 about_left"> - <img class="lazyload about_portrait" data-src="{{ .Site.Params.portrait | default "self/img/avater.jpg" }}" /> + <img class="lazyload about_portrait" data-src="{{ .Site.Params.portrait | default "/self/img/avater.jpg" | relURL }}" /> <h1> {{ .Site.Params.author | default "Authors"}} </h1> <h2> {{ .Site.Params.description | default "Intro"}} </h2> diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 6967213..cd41ebb 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -20,4 +20,4 @@ <div class="layui-container"> <p class="copyright">{{ .Site.Params.copyright | default "© All rights reserved. Powered by <a href='https://gohugo.io' style='color:#FFFFFF'>Hugo</a> and <a href='https://github.com/ertuil/erblog' style='color:#FFFFFF'>Erblog</a>." | safeHTML }}</p> </div> -</footer>
\ No newline at end of file +</footer> diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 6d1460a..e6feaac 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -13,7 +13,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0" /> {{ if .Site.Params.favicon }} - <link rel="icon" href="{{ .Site.Params.favicon | absURL }}"> + <link rel="icon" href="{{ .Site.Params.favicon | relURL }}"> {{ end }} {{ with .OutputFormats.Get "RSS" }} @@ -48,12 +48,12 @@ <script src="https://cdn.jsdelivr.net/npm/mathjax@3.0.5/es5/tex-mml-chtml.js" integrity="sha256-HGLuEfFcsUJGhvB8cQ8nr0gai9EucOOaIxFw7qxmd+w=" crossorigin="anonymous"></script> {{ end }} - <link rel="stylesheet" href="/layui/css/layui.css"> - <link rel="stylesheet" href="/self/css/default.css"> - <script src="/layui/layui.js"></script> + <link rel="stylesheet" href="{{ "/layui/css/layui.css" | relURL }}"> + <link rel="stylesheet" href="{{ "/self/css/default.css" | relURL }}"> + <script src=" {{ "/layui/layui.js" | relURL }}"></script> - <link rel="stylesheet" async href="/self/css/markdown.min.css"> - <link rel="stylesheet" async href="/self/css/gallery.css"> + <link rel="stylesheet" async href="{{ "/self/css/markdown.min.css" | relURL }}"> + <link rel="stylesheet" async href="{{ "/self/css/gallery.css" | relURL }}"> <!-- <link rel="stylesheet" async href="/font-awesome-4.7.0/css/font-awesome.min.css"> --> <!-- <script src="/self/js/lazysizes.min.js" async></script> --> diff --git a/layouts/partials/info.html b/layouts/partials/info.html index 33ed77f..96ad6cc 100644 --- a/layouts/partials/info.html +++ b/layouts/partials/info.html @@ -11,7 +11,7 @@ {{end}} {{ range $tag := .Params.categories }} - <a href="{{ "categories/" | relLangURL }}{{ $tag | urlize | lower }}/"> + <a href="{{ "/categories/" | relLangURL }}{{ $tag | urlize | lower }}/"> <span class="layui-badge {{with $.Site.Params.badge}}layui-bg-{{.}}{{end}}" style="vertical-align: 2px;">{{ $tag }}</span> </a> {{ end }} @@ -21,9 +21,9 @@ {{end}} {{ range $tag := .Params.tags }} - <a href="{{ "tags/" | relLangURL }}{{ $tag | urlize | lower }}/"> + <a href="{{ "/tags/" | relLangURL }}{{ $tag | urlize | lower }}/"> <span class="layui-badge {{with $.Site.Params.badge}}layui-bg-{{.}}{{end}}" style="vertical-align: 2px;">{{ $tag }}</span> </a> {{ end }} -</h3>
\ No newline at end of file +</h3> diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index d3c102f..d815b3c 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -1,18 +1,18 @@ <header class="layui-header layui-bg-cyan"> {{if .Site.Params.logo}} - <a href=""><img src="{{.Site.Params.logo}}" class="layui-nav-img" style="margin-left:10px;margin-top:-10px"></a> + <a href=""><img src="{{.Site.Params.logo | relURL }}" class="layui-nav-img" style="margin-left:10px;margin-top:-10px"></a> {{end}} - <a class="nav-self-logo" href="/"> + <a class="nav-self-logo" href="{{ "/" | relURL }}"> {{.Site.Title}} </a> <ul class="layui-nav layui-layout-right layui-bg-cyan" lay-filter=""> <!-- For Desktop --> <!--<li class="layui-nav-item" id="nav_big"><a href="/">Home</a></li>--> - <li class="layui-nav-item" id="nav_big"><a href="/post/">Posts</a></li> - <!-- <li class="layui-nav-item" id="nav_big"><a href="/gallery/">Gallery</a></li> --> + <li class="layui-nav-item" id="nav_big"><a href="{{ "/post/" | relURL }}">Posts</a></li> + <!-- <li class="layui-nav-item" id="nav_big"><a href="{{ "/gallery/" | relURL }}">Gallery</a></li> --> {{ if .Site.Menus.main }} {{ range sort .Site.Menus.main }} @@ -28,8 +28,8 @@ <dl class="layui-nav-child"> <!--<dd><a href="/">Home</a></dd>--> - <dd><a href="/post/">Posts</a></dd> - <!--<dd><a href="/gallery/">Gallery</a></dd>--> + <dd><a href="{{ "/post/" | relURL }}">Posts</a></dd> + <!--<dd><a href="{{ "/gallery/" | relURL }}">Gallery</a></dd>--> {{ if .Site.Menus.main }} {{ range sort .Site.Menus.main }} @@ -45,4 +45,4 @@ layui.use('element', function(){ var element = layui.element; }); -</script>
\ No newline at end of file +</script> diff --git a/layouts/zone/list.html b/layouts/zone/list.html index b9077eb..d44207a 100644 --- a/layouts/zone/list.html +++ b/layouts/zone/list.html @@ -10,7 +10,7 @@ </div> </div> <div class="layui-col-md5 layui-col-sm6 layui-col-xs12" style="text-align:center;"> - <img src="/self/img/undraw_online_media_62jb.png" class="list-title-pic"> + <img src="{{ "/self/img/undraw_online_media_62jb.png" | relURL }}" class="list-title-pic"> </div> </div> </div> @@ -65,4 +65,4 @@ </main> -{{end}}
\ No newline at end of file +{{end}} |