feat(header): add Logo, pre and post config for header title (#252)

pogor-dev · Apr 23, 2020 · 87fbb05 · 87fbb05
1 parent 919f559
commit 87fbb05
Show file tree

Hide file tree

Showing 23 changed files with 141 additions and 44 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,27 +54,31 @@ enableEmoji = true
       [[languages.en.menu.main]]
         identifier = "tags"
         pre = ""
+        post = ""
         name = "Tags"
         url = "/tags/"
         title = ""
         weight = 2
       [[languages.en.menu.main]]
         identifier = "categories"
         pre = ""
+        post = ""
         name = "Categories"
         url = "/categories/"
         title = ""
         weight = 3
       [[languages.en.menu.main]]
         identifier = "documentation"
         pre = ""
+        post = ""
         name = "Docs"
         url = "/categories/documentation/"
         title = ""
         weight = 4
       [[languages.en.menu.main]]
         identifier = "about"
         pre = ""
+        post = ""
         name = "About"
         url = "/about/"
         title = ""
@@ -212,21 +218,26 @@ enableEmoji = true
     [languages.zh-cn.menu]
       [[languages.zh-cn.menu.main]]
         identifier = "posts"
+        # 你可以在名称 (允许 HTML 格式) 之前添加其他信息, 例如图标
         pre = ""
+        # 你可以在名称 (允许 HTML 格式) 之后添加其他信息, 例如图标
+        post = ""
         name = "所有文章"
         url = "/posts/"
         title = ""
         weight = 1
       [[languages.zh-cn.menu.main]]
         identifier = "tags"
         pre = ""
+        post = ""
         name = "标签"
         url = "/tags/"
         title = ""
         weight = 2
       [[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,27 +393,31 @@ enableEmoji = true
       [[languages.fr.menu.main]]
         identifier = "posts"
         pre = ""
+        post = ""
         name = "Postes"
         url = "/posts/"
         title = ""
         weight = 1
       [[languages.fr.menu.main]]
         identifier = "tags"
         pre = ""
+        post = ""
         name = "Balises"
         url = "/tags/"
         title = ""
         weight = 2
       [[languages.fr.menu.main]]
         identifier = "categories"
         pre = ""
+        post = ""
         name = "Catégories"
         url = "/categories/"
         title = ""
         weight = 3
       [[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 = "<i class='far fa-kiss-wink-heart fa-fw'></i> "
+      # 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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