From 87fbb05e863c014b858eae042c890f1a52928df7 Mon Sep 17 00:00:00 2001 From: Dillon Date: Thu, 23 Apr 2020 16:49:30 +0800 Subject: feat(header): add Logo, pre and post config for header title (#252) --- assets/css/_page/_archive.scss | 5 ++++ assets/css/_page/_single.scss | 9 +++---- assets/css/_partial/_archive/_terms.scss | 22 ++++++++------- assets/css/_partial/_header.scss | 11 ++++++-- assets/css/_partial/_single/_code.scss | 10 +++---- assets/css/_variables.scss | 4 +-- exampleSite/config.toml | 31 ++++++++++++++++++++++ exampleSite/content/about.en.md | 2 +- exampleSite/content/about.fr.md | 2 +- exampleSite/content/about.zh-cn.md | 2 +- .../content/posts/basic-markdown-syntax.en.md | 2 +- .../content/posts/basic-markdown-syntax.fr.md | 2 +- .../content/posts/theme-documentation-basics.en.md | 13 +++++++++ .../content/posts/theme-documentation-basics.fr.md | 13 +++++++++ .../posts/theme-documentation-basics.zh-cn.md | 15 ++++++++++- layouts/_default/section.html | 2 +- layouts/partials/footer.html | 2 +- layouts/partials/head/seo.html | 2 +- layouts/partials/header.html | 26 +++++++++++++----- layouts/partials/plugin/image.html | 4 +-- layouts/shortcodes/version.html | 2 +- layouts/taxonomy/list.html | 2 +- ...e.scss_b8ba9a60a151126bfcde1421dc0b972d.content | 2 +- 23 files changed, 141 insertions(+), 44 deletions(-) diff --git a/assets/css/_page/_archive.scss b/assets/css/_page/_archive.scss index 0140e4b..2b8f466 100644 --- a/assets/css/_page/_archive.scss +++ b/assets/css/_page/_archive.scss @@ -3,6 +3,11 @@ text-align: right; } + .group-title { + margin-top: 1.5rem; + margin-bottom: 1rem; + } + @import "../_partial/_archive/terms"; @import "../_partial/_archive/tags"; } diff --git a/assets/css/_page/_single.scss b/assets/css/_page/_single.scss index 2540b13..3dd2e58 100644 --- a/assets/css/_page/_single.scss +++ b/assets/css/_page/_single.scss @@ -205,7 +205,8 @@ img { max-width: 100%; - min-height: 1.2rem; + min-height: 1.25em; + vertical-align: text-bottom; } figure { @@ -339,10 +340,8 @@ } } - .version img { - min-height: 1.2rem; - height: 1.2rem; - vertical-align: text-bottom; + .version { + height: 1.25em; } } diff --git a/assets/css/_partial/_archive/_terms.scss b/assets/css/_partial/_archive/_terms.scss index d47b1a3..ef24aa9 100644 --- a/assets/css/_partial/_archive/_terms.scss +++ b/assets/css/_partial/_archive/_terms.scss @@ -1,7 +1,3 @@ -.archive-item { - margin-left: 2rem; -} - .categories-card { margin: 0 auto; margin-top: 3rem; @@ -10,7 +6,6 @@ justify-content: space-between; flex-direction: row; flex-wrap: wrap; - padding: 0 2.5rem; line-height: 1.6rem; .card-item { @@ -32,6 +27,8 @@ font-size: 1.2rem; font-weight: bold; display: inline-block; + margin-top: 1rem; + margin-bottom: .75rem; } span { @@ -42,12 +39,19 @@ } } +.archive-item { + display: flex; + justify-content: space-between; + align-items: center; + box-sizing: border-box; + margin: .25rem 0 .25rem 1.5rem; +} + .archive-item-link { - display: inline-block; + min-width: 10%; overflow: hidden; - text-overflow: ellipsis; white-space: nowrap; - max-width: 95%; + text-overflow: ellipsis; &:hover { color: $global-link-hover-color; @@ -64,7 +68,7 @@ } .archive-item-date { - float: right; + width: 4em; text-align: right; color: $global-font-secondary-color; diff --git a/assets/css/_partial/_header.scss b/assets/css/_partial/_header.scss index 74fe1d0..9e48ece 100644 --- a/assets/css/_partial/_header.scss +++ b/assets/css/_partial/_header.scss @@ -6,6 +6,13 @@ header { .dark & { background-color: $header-background-color-dark; } + + .logo { + min-height: 1.25em; + height: 1.25em; + vertical-align: text-bottom; + padding-right: .25rem; + } } .header-wrapper { @@ -136,7 +143,7 @@ header { padding: 0 1.5rem; .header-title { - font-size: $header-title-font-size-desktop; + font-size: $header-title-font-size; } .menu { @@ -203,7 +210,7 @@ header { @include transition(margin-top 0.3s ease 0s); .header-title { - font-size: $header-title-font-size-mobile; + font-size: $header-title-font-size; max-width: 80%; } diff --git a/assets/css/_partial/_single/_code.scss b/assets/css/_partial/_single/_code.scss index 30058dd..55771d2 100644 --- a/assets/css/_partial/_single/_code.scss +++ b/assets/css/_partial/_single/_code.scss @@ -3,9 +3,9 @@ code { font-family: $code-font-family; color: $code-color; - img, .version img { - min-height: 1.2 * $code-font-size; - height: 1.2 * $code-font-size; + img { + min-height: 1.25em; + max-height: 1.25em; } .dark & { @@ -25,7 +25,7 @@ pre { .copy-button { font-size: $code-font-size; - line-height: 1.4 * $code-font-size; + line-height: 1.4em; position: absolute; top: 0; right: 0; @@ -129,7 +129,7 @@ code, pre, .highlight table, .highlight tr, .highlight td { .highlight { font-family: $code-font-family; font-size: $code-font-size; - line-height: 1.4 * $code-font-size; + line-height: 1.4em; /* Comment */ .c, /* CommentHashbang */ .ch, /* CommentMultiline */ .cm, diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss index bf16cb5..8422c43 100644 --- a/assets/css/_variables.scss +++ b/assets/css/_variables.scss @@ -58,9 +58,7 @@ $header-background-color-dark: #252627 !default; // Font style of the header title $header-title-font-family: $global-font-family !default; - -$header-title-font-size-desktop: 1.5rem !default; -$header-title-font-size-mobile: 1.5rem !default; +$header-title-font-size: 1.5rem !default; // Position of the header $header-position-desktop: if($header-normal-mode-desktop, static, fixed) !default; diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 9347d29..55272d9 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -44,6 +44,8 @@ enableEmoji = true identifier = "posts" # you can add extra information before the name (HTML format is supported), such as icons pre = "" + # you can add extra information after the name (HTML format is supported), such as icons + post = "" name = "Posts" url = "/posts/" # title will be shown when you hover on this menu link. @@ -52,6 +54,7 @@ enableEmoji = true [[languages.en.menu.main]] identifier = "tags" pre = "" + post = "" name = "Tags" url = "/tags/" title = "" @@ -59,6 +62,7 @@ enableEmoji = true [[languages.en.menu.main]] identifier = "categories" pre = "" + post = "" name = "Categories" url = "/categories/" title = "" @@ -66,6 +70,7 @@ enableEmoji = true [[languages.en.menu.main]] identifier = "documentation" pre = "" + post = "" name = "Docs" url = "/categories/documentation/" title = "" @@ -73,6 +78,7 @@ enableEmoji = true [[languages.en.menu.main]] identifier = "about" pre = "" + post = "" name = "About" url = "/about/" title = "" @@ -212,7 +218,10 @@ enableEmoji = true [languages.zh-cn.menu] [[languages.zh-cn.menu.main]] identifier = "posts" + # 你可以在名称 (允许 HTML 格式) 之前添加其他信息, 例如图标 pre = "" + # 你可以在名称 (允许 HTML 格式) 之后添加其他信息, 例如图标 + post = "" name = "所有文章" url = "/posts/" title = "" @@ -220,6 +229,7 @@ enableEmoji = true [[languages.zh-cn.menu.main]] identifier = "tags" pre = "" + post = "" name = "标签" url = "/tags/" title = "" @@ -227,6 +237,7 @@ enableEmoji = true [[languages.zh-cn.menu.main]] identifier = "categories" pre = "" + post = "" name = "分类" url = "/categories/" title = "" @@ -241,6 +252,7 @@ enableEmoji = true [[languages.zh-cn.menu.main]] identifier = "about" pre = "" + post = "" name = "关于" url = "/about/" title = "" @@ -381,6 +393,7 @@ enableEmoji = true [[languages.fr.menu.main]] identifier = "posts" pre = "" + post = "" name = "Postes" url = "/posts/" title = "" @@ -388,6 +401,7 @@ enableEmoji = true [[languages.fr.menu.main]] identifier = "tags" pre = "" + post = "" name = "Balises" url = "/tags/" title = "" @@ -395,6 +409,7 @@ enableEmoji = true [[languages.fr.menu.main]] identifier = "categories" pre = "" + post = "" name = "Catégories" url = "/categories/" title = "" @@ -402,6 +417,7 @@ enableEmoji = true [[languages.fr.menu.main]] identifier = "documentation" pre = "" + post = "" name = "Docs" url = "/categories/documentation/" title = "" @@ -556,6 +572,21 @@ enableEmoji = true # mobile header mode ("fixed", "normal", "auto") # 移动端导航栏模式 ("fixed", "normal", "auto") mobileMode = "auto" + # Header title config + # 页面头部导航栏标题配置 + [params.header.title] + # URL of the LOGO + # LOGO 的 URL + logo = "" + # title name + # 标题名称 + name = "LoveIt" + # you can add extra information before the name (HTML format is supported), such as icons + # 你可以在名称 (允许 HTML 格式) 之前添加其他信息, 例如图标 + pre = " " + # you can add extra information after the name (HTML format is supported), such as icons + # 你可以在名称 (允许 HTML 格式) 之后添加其他信息, 例如图标 + post = "" # Footer config # 页面底部信息配置 diff --git a/exampleSite/content/about.en.md b/exampleSite/content/about.en.md index 10fc4b9..354a5be 100644 --- a/exampleSite/content/about.en.md +++ b/exampleSite/content/about.en.md @@ -15,7 +15,7 @@ math: [![GitHub stars](https://img.shields.io/github/stars/dillonzq/LoveIt?style=social)](https://github.com/dillonzq/LoveIt) [![GitHub forks](https://img.shields.io/github/forks/dillonzq/LoveIt?style=social)](https://github.com/dillonzq/LoveIt/fork) -[LoveIt :(far fa-heart):](https://github.com/dillonzq/LoveIt) is a **clean**, **elegant** but **advanced** blog theme for [Hugo](https://gohugo.io/) developed by [Dillon](https://dillonzq.com). +[:(far fa-kiss-wink-heart): LoveIt](https://github.com/dillonzq/LoveIt) is a **clean**, **elegant** but **advanced** blog theme for [Hugo](https://gohugo.io/) developed by [Dillon](https://dillonzq.com). It is based on the original [LeaveIt Theme](https://github.com/liuzc/LeaveIt/) and [KeepIt Theme](https://github.com/liuzc/LeaveIt/). diff --git a/exampleSite/content/about.fr.md b/exampleSite/content/about.fr.md index 639f39e..be537bb 100644 --- a/exampleSite/content/about.fr.md +++ b/exampleSite/content/about.fr.md @@ -20,7 +20,7 @@ Sorry, this article has not been completely translated into **French**. Welcome to take the time to propose a translation by [making a PR](https://github.com/dillonzq/LoveIt/pulls) to the theme! {{< /admonition >}} -[LoveIt :(far fa-heart):](https://github.com/dillonzq/LoveIt) is a **clean**, **elegant** but **advanced** blog theme for [Hugo](https://gohugo.io/) developed by [Dillon](https://dillonzq.com). +[:(far fa-kiss-wink-heart): LoveIt](https://github.com/dillonzq/LoveIt) is a **clean**, **elegant** but **advanced** blog theme for [Hugo](https://gohugo.io/) developed by [Dillon](https://dillonzq.com). It is based on the original [LeaveIt Theme](https://github.com/liuzc/LeaveIt/) and [KeepIt Theme](https://github.com/liuzc/LeaveIt/). diff --git a/exampleSite/content/about.zh-cn.md b/exampleSite/content/about.zh-cn.md index ac6f93a..c1e2471 100644 --- a/exampleSite/content/about.zh-cn.md +++ b/exampleSite/content/about.zh-cn.md @@ -15,7 +15,7 @@ math: [![GitHub stars](https://img.shields.io/github/stars/dillonzq/LoveIt?style=social)](https://github.com/dillonzq/LoveIt) [![GitHub forks](https://img.shields.io/github/forks/dillonzq/LoveIt?style=social)](https://github.com/dillonzq/LoveIt/fork) -[LoveIt :(far fa-heart):](https://github.com/dillonzq/LoveIt) 是一个由 [Dillon](https://dillonzq.com) 开发的**简洁**、**优雅**且**高效**的 [Hugo](https://gohugo.io/) 博客主题。 +[:(far fa-kiss-wink-heart): LoveIt](https://github.com/dillonzq/LoveIt) 是一个由 [Dillon](https://dillonzq.com) 开发的**简洁**、**优雅**且**高效**的 [Hugo](https://gohugo.io/) 博客主题。 它的原型基于 [LeaveIt 主题](https://github.com/liuzc/LeaveIt/) 和 [KeepIt 主题](https://github.com/liuzc/LeaveIt/)。 diff --git a/exampleSite/content/posts/basic-markdown-syntax.en.md b/exampleSite/content/posts/basic-markdown-syntax.en.md index d290703..9b4144f 100644 --- a/exampleSite/content/posts/basic-markdown-syntax.en.md +++ b/exampleSite/content/posts/basic-markdown-syntax.en.md @@ -416,7 +416,7 @@ The rendered output looks like this: ### Task Lists -Task lists allow you to create a list of items with checkboxes. To create a task list, add dashes (`-`) and brackets with a space (`[ ]`) in front of task list items. To select a checkbox, add an x in between the brackets (`[x]`). +Task lists allow you to create a list of items with checkboxes. To create a task list, add dashes (`-`) and brackets with a space (`[ ]`) before task list items. To select a checkbox, add an x in between the brackets (`[x]`). ```markdown - [x] Write the press release diff --git a/exampleSite/content/posts/basic-markdown-syntax.fr.md b/exampleSite/content/posts/basic-markdown-syntax.fr.md index 20c56af..4ae431f 100644 --- a/exampleSite/content/posts/basic-markdown-syntax.fr.md +++ b/exampleSite/content/posts/basic-markdown-syntax.fr.md @@ -421,7 +421,7 @@ The rendered output looks like this: ### Task Lists -Task lists allow you to create a list of items with checkboxes. To create a task list, add dashes (`-`) and brackets with a space (`[ ]`) in front of task list items. To select a checkbox, add an x in between the brackets (`[x]`). +Task lists allow you to create a list of items with checkboxes. To create a task list, add dashes (`-`) and brackets with a space (`[ ]`) before task list items. To select a checkbox, add an x in between the brackets (`[x]`). ```markdown - [x] Write the press release diff --git a/exampleSite/content/posts/theme-documentation-basics.en.md b/exampleSite/content/posts/theme-documentation-basics.en.md index a5a7966..6f45922 100644 --- a/exampleSite/content/posts/theme-documentation-basics.en.md +++ b/exampleSite/content/posts/theme-documentation-basics.en.md @@ -92,6 +92,8 @@ theme = "LoveIt" identifier = "posts" # you can add extra information before the name (HTML format is supported), such as icons pre = "" + # you can add extra information after the name (HTML format is supported), such as icons + post = "" name = "Posts" url = "/posts/" # title will be shown when you hover on this menu link @@ -100,6 +102,7 @@ theme = "LoveIt" [[menu.main]] identifier = "tags" pre = "" + post = "" name = "Tags" url = "/tags/" title = "" @@ -107,6 +110,7 @@ theme = "LoveIt" [[menu.main]] identifier = "categories" pre = "" + post = "" name = "Categories" url = "/categories/" title = "" @@ -742,6 +746,7 @@ defaultContentLanguage = "en" [[languages.en.menu.main]] identifier = "posts" pre = "" + post = "" name = "Posts" url = "/posts/" title = "" @@ -749,6 +754,7 @@ defaultContentLanguage = "en" [[languages.en.menu.main]] identifier = "tags" pre = "" + post = "" name = "Tags" url = "/tags/" title = "" @@ -756,6 +762,7 @@ defaultContentLanguage = "en" [[languages.en.menu.main]] identifier = "categories" pre = "" + post = "" name = "Categories" url = "/categories/" title = "" @@ -772,6 +779,7 @@ defaultContentLanguage = "en" [[languages.zh-cn.menu.main]] identifier = "posts" pre = "" + post = "" name = "文章" url = "/posts/" title = "" @@ -779,6 +787,7 @@ defaultContentLanguage = "en" [[languages.zh-cn.menu.main]] identifier = "tags" pre = "" + post = "" name = "标签" url = "/tags/" title = "" @@ -786,6 +795,7 @@ defaultContentLanguage = "en" [[languages.zh-cn.menu.main]] identifier = "categories" pre = "" + post = "" name = "分类" url = "/categories/" title = "" @@ -799,6 +809,7 @@ defaultContentLanguage = "en" [[languages.fr.menu.main]] identifier = "posts" pre = "" + post = "" name = "Postes" url = "/posts/" title = "" @@ -806,6 +817,7 @@ defaultContentLanguage = "en" [[languages.fr.menu.main]] identifier = "tags" pre = "" + post = "" name = "Balises" url = "/tags/" title = "" @@ -814,6 +826,7 @@ defaultContentLanguage = "en" identifier = "categories" name = "Catégories" pre = "" + post = "" url = "/categories/" title = "" weight = 3 diff --git a/exampleSite/content/posts/theme-documentation-basics.fr.md b/exampleSite/content/posts/theme-documentation-basics.fr.md index f2b7e92..419a24c 100644 --- a/exampleSite/content/posts/theme-documentation-basics.fr.md +++ b/exampleSite/content/posts/theme-documentation-basics.fr.md @@ -97,6 +97,8 @@ theme = "LoveIt" identifier = "posts" # you can add extra information before the name (HTML format is supported), such as icons pre = "" + # you can add extra information after the name (HTML format is supported), such as icons + post = "" name = "Posts" url = "/posts/" # title will be shown when you hover on this menu link @@ -105,6 +107,7 @@ theme = "LoveIt" [[menu.main]] identifier = "tags" pre = "" + post = "" name = "Tags" url = "/tags/" title = "" @@ -112,6 +115,7 @@ theme = "LoveIt" [[menu.main]] identifier = "categories" pre = "" + post = "" name = "Categories" url = "/categories/" title = "" @@ -747,6 +751,7 @@ defaultContentLanguage = "en" [[languages.en.menu.main]] identifier = "posts" pre = "" + post = "" name = "Posts" url = "/posts/" title = "" @@ -754,6 +759,7 @@ defaultContentLanguage = "en" [[languages.en.menu.main]] identifier = "tags" pre = "" + post = "" name = "Tags" url = "/tags/" title = "" @@ -761,6 +767,7 @@ defaultContentLanguage = "en" [[languages.en.menu.main]] identifier = "categories" pre = "" + post = "" name = "Categories" url = "/categories/" title = "" @@ -777,6 +784,7 @@ defaultContentLanguage = "en" [[languages.zh-cn.menu.main]] identifier = "posts" pre = "" + post = "" name = "文章" url = "/posts/" title = "" @@ -784,6 +792,7 @@ defaultContentLanguage = "en" [[languages.zh-cn.menu.main]] identifier = "tags" pre = "" + post = "" name = "标签" url = "/tags/" title = "" @@ -791,6 +800,7 @@ defaultContentLanguage = "en" [[languages.zh-cn.menu.main]] identifier = "categories" pre = "" + post = "" name = "分类" url = "/categories/" title = "" @@ -804,6 +814,7 @@ defaultContentLanguage = "en" [[languages.fr.menu.main]] identifier = "posts" pre = "" + post = "" name = "Postes" url = "/posts/" title = "" @@ -811,6 +822,7 @@ defaultContentLanguage = "en" [[languages.fr.menu.main]] identifier = "tags" pre = "" + post = "" name = "Balises" url = "/tags/" title = "" @@ -819,6 +831,7 @@ defaultContentLanguage = "en" identifier = "categories" name = "Catégories" pre = "" + post = "" url = "/categories/" title = "" weight = 3 diff --git a/exampleSite/content/posts/theme-documentation-basics.zh-cn.md b/exampleSite/content/posts/theme-documentation-basics.zh-cn.md index 498de03..9f58df8 100644 --- a/exampleSite/content/posts/theme-documentation-basics.zh-cn.md +++ b/exampleSite/content/posts/theme-documentation-basics.zh-cn.md @@ -95,6 +95,8 @@ theme = "LoveIt" identifier = "posts" # 你可以在名称 (允许 HTML 格式) 之前添加其他信息, 例如图标 pre = "" + # 你可以在名称 (允许 HTML 格式) 之后添加其他信息, 例如图标 + post = "" name = "文章" url = "/posts/" # 当你将鼠标悬停在此菜单链接上时, 将显示的标题 @@ -103,6 +105,7 @@ theme = "LoveIt" [[menu.main]] identifier = "tags" pre = "" + post = "" name = "标签" url = "/tags/" title = "" @@ -110,6 +113,7 @@ theme = "LoveIt" [[menu.main]] identifier = "categories" pre = "" + post = "" name = "分类" url = "/categories/" title = "" @@ -745,6 +749,7 @@ defaultContentLanguage = "zh-cn" [[languages.en.menu.main]] identifier = "posts" pre = "" + post = "" name = "Posts" url = "/posts/" title = "" @@ -752,6 +757,7 @@ defaultContentLanguage = "zh-cn" [[languages.en.menu.main]] identifier = "tags" pre = "" + post = "" name = "Tags" url = "/tags/" title = "" @@ -759,6 +765,7 @@ defaultContentLanguage = "zh-cn" [[languages.en.menu.main]] identifier = "categories" pre = "" + post = "" name = "Categories" url = "/categories/" title = "" @@ -775,6 +782,7 @@ defaultContentLanguage = "zh-cn" [[languages.zh-cn.menu.main]] identifier = "posts" pre = "" + post = "" name = "文章" url = "/posts/" title = "" @@ -782,6 +790,7 @@ defaultContentLanguage = "zh-cn" [[languages.zh-cn.menu.main]] identifier = "tags" pre = "" + post = "" name = "标签" url = "/tags/" title = "" @@ -789,6 +798,7 @@ defaultContentLanguage = "zh-cn" [[languages.zh-cn.menu.main]] identifier = "categories" pre = "" + post = "" name = "分类" url = "/categories/" title = "" @@ -802,6 +812,7 @@ defaultContentLanguage = "zh-cn" [[languages.fr.menu.main]] identifier = "posts" pre = "" + post = "" name = "Postes" url = "/posts/" title = "" @@ -809,14 +820,16 @@ defaultContentLanguage = "zh-cn" [[languages.fr.menu.main]] identifier = "tags" pre = "" + post = "" name = "Balises" url = "/tags/" title = "" weight = 2 [[languages.fr.menu.main]] identifier = "categories" - name = "Catégories" pre = "" + post = "" + name = "Catégories" url = "/categories/" title = "" weight = 3 diff --git a/layouts/_default/section.html b/layouts/_default/section.html index 89ebcba..0bed0b0 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -12,7 +12,7 @@ {{- /* Paginate */ -}} {{- $pages := .Pages.GroupByDate "2006" -}} {{- range (.Site.Params.section.paginate | default .Site.Params.paginate | .Paginate $pages).PageGroups -}} -

{{ .Key }}

+

{{ .Key }}

{{- range .Pages -}}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index f7bb398..533789c 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -12,7 +12,7 @@ {{- if ne .Site.Params.footer.hugo false -}}
{{- $hugo := printf `Hugo` hugo.Version -}} - {{- printf (T "poweredBySome") $hugo | safeHTML }} | {{ T "theme" }} - LoveIt + {{- printf (T "poweredBySome") $hugo | safeHTML }} | {{ T "theme" }} - LoveIt
{{- end -}} diff --git a/layouts/partials/head/seo.html b/layouts/partials/head/seo.html index 72f05b7..214958a 100644 --- a/layouts/partials/head/seo.html +++ b/layouts/partials/head/seo.html @@ -88,7 +88,7 @@ {{- with $params.seo.publisher -}} "publisher": { "@type": "Organization", - "name": "{{ .name }}", + "name": {{ .name | safeHTML }}, "logo": { "@type": "ImageObject", "url": "{{ .logo.url | absURL }}", diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 777191a..7982345 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -2,8 +2,15 @@
- - {{- .Site.Title -}} + + {{- with .Site.Params.header.title -}} + {{- with .logo -}} + {{- partial "plugin/image.html" (dict "src" . "alt" $.Site.Title "class" "logo") -}} + {{- end -}} + {{- .pre | safeHTML }}{{ .name }}{{ .post | safeHTML -}} + {{- else -}} + {{- .Site.Title -}} + {{- end -}}
@@ -16,7 +23,7 @@ {{- $url = .URL | relLangURL -}} {{- end -}} - {{- .Pre | safeHTML }}{{ .Name -}} + {{- .Pre | safeHTML }} {{ .Name }} {{ .Post | safeHTML -}} {{- end -}} @@ -67,8 +74,15 @@
- - {{- .Site.Title -}} + + {{- with .Site.Params.header.title -}} + {{- with .logo -}} + {{- partial "plugin/image.html" (dict "src" . "alt" $.Site.Title "class" "logo") -}} + {{- end -}} + {{- .pre | safeHTML }}{{ .name }}{{ .post | safeHTML -}} + {{- else -}} + {{- .Site.Title -}} + {{- end -}}