From 25540b4b8d5b4238bf40746e2372e7d650de584a Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Wed, 7 Nov 2018 10:27:45 +0800
Subject: [PATCH 01/19] button color

---
 source/less/_article.less | 10 +++++-----
 source/less/_main.less    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/less/_article.less b/source/less/_article.less
index 10078f9..74cefc6 100755
--- a/source/less/_article.less
+++ b/source/less/_article.less
@@ -184,10 +184,9 @@
         margin: 0px 2px;
         vertical-align: center;
         border-radius: 2px;
-        border: 1px solid fade(@theme_bg_code, 30%);
+        border: 1px solid fade(@theme_bg_code, 50%);
         font-size: @fontsize_base * .8;
-
-        background: fade(@theme_bg_code, 10%);
+        background: @theme_bg_code;
         @media(max-width: @on_phone){
           font-size: @fontsize_base * .8 * .95;
         }
@@ -210,10 +209,10 @@
             border-radius: @border_radius/2;
             .enable-trans();
             &:hover {
-              background: darken(@theme_bg_navbar, 10%);
+              background: darken(@theme_bg_quote, 10%);
             }
             &:active {
-              // background: darken(@theme_bg_navbar, 20%);
+              // background: darken(@theme_bg_quote, 20%);
             }
         }
 
@@ -227,6 +226,7 @@
         margin-top: @gap;
         background: darken(fade(@theme_bg_main, 50%), 5%);
         &.article-tags {
+            padding-top: 2*@gap;
             background: transparent;
         }
         word-spacing: @gap;
diff --git a/source/less/_main.less b/source/less/_main.less
index 28d922e..5be9e2a 100755
--- a/source/less/_main.less
+++ b/source/less/_main.less
@@ -47,10 +47,10 @@
                 border-radius: @border_radius/2;
                 .enable-trans();
                 &:hover {
-                  background: darken(@theme_bg_navbar, 10%);
+                  background: darken(@theme_bg_quote, 10%);
                 }
                 &:active {
-                  // background: lighten(@theme_bg_navbar, 20%);
+                  // background: lighten(@theme_bg_quote, 20%);
                 }
             }
             blockquote{

From 2d8fb1399f36fb704e92cae841010d97b651ff66 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Wed, 7 Nov 2018 10:49:21 +0800
Subject: [PATCH 02/19] update

---
 source/less/_article.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/less/_article.less b/source/less/_article.less
index 74cefc6..e99db2c 100755
--- a/source/less/_article.less
+++ b/source/less/_article.less
@@ -360,7 +360,7 @@
   }
   .gutter{
     width: 24px;
-    padding: 0 @gap/2;
+    padding: 0 12px;
     text-align: right;
     border-width: 0;
     margin-left: 0;

From 9382e0cc60e3dc91bdbbb129d7a5ef82542dd7f5 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Wed, 7 Nov 2018 12:17:50 +0800
Subject: [PATCH 03/19] fontawesome 5.5.0

---
 layout/_partial/head.ejs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
index 827e9e1..c766501 100755
--- a/layout/_partial/head.ejs
+++ b/layout/_partial/head.ejs
@@ -27,7 +27,8 @@
   <link rel="shortcut icon" href="<%= config.shortcut_icon %>" />
   <link rel="icon" href="<%= config.favicon %>" />
   <link href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet">
-  <link href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+  <!-- <link href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> -->
+  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
   <link href='//cdn.bootcss.com/node-waves/0.7.5/waves.min.css' rel='stylesheet'>
   <%- css('style.css') %>
   <script>

From 75edcedd0e01cf54bd4c7985aed8772a3a15d912 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Wed, 7 Nov 2018 14:41:04 +0800
Subject: [PATCH 04/19] update

---
 layout/_partial/article.ejs   |  4 ++--
 layout/_partial/footer.ejs    |  2 +-
 layout/_partial/header.ejs    |  6 +++---
 layout/_partial/post.ejs      |  2 +-
 layout/_widget/author.ejs     |  2 +-
 layout/_widget/categories.ejs |  2 +-
 layout/_widget/links.ejs      | 10 +++++++---
 layout/_widget/music.ejs      |  2 +-
 layout/_widget/tagcloud.ejs   |  2 +-
 layout/_widget/toc.ejs        |  2 +-
 source/less/_widget.less      | 10 ++++++++++
 11 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
index 7098515..9f21bba 100755
--- a/layout/_partial/article.ejs
+++ b/layout/_partial/article.ejs
@@ -8,7 +8,7 @@
             <% } %>
         </h1>
         <time>
-            <i class="fa fa-calendar fa-fw" aria-hidden="true"></i>&nbsp;<%= date(post.date, config.date_format) %>&nbsp;&nbsp;
+            <i class="fa fa-calendar-alt fa-fw" aria-hidden="true"></i>&nbsp;<%= date(post.date, config.date_format) %>&nbsp;&nbsp;
             <i class="fa fa-eye fa-fw" aria-hidden="true"></i>&nbsp;<span id="busuanzi_value_page_pv"><i class="fa fa-spinner fa-spin fa-fw" aria-hidden="true"></i></span>
         </time>
         <%- partial('categories',{post:post}) %>
@@ -29,7 +29,7 @@
         <% } %>
         <section class='meta'>
           <time itemprop="dateUpdated" datetime="<%- moment(post.updated).format() %>" content="<%- date(post.updated, config.date_format) %>">
-            <i class="fa fa-pencil-square fa-fw" aria-hidden="true"></i>
+            <i class="fa fa-edit fa-fw" aria-hidden="true"></i>
             本文最后更新于：<%- date(post.updated, config.date_format) %>
           </time>
         </section>
diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs
index 98910ba..f41b070 100755
--- a/layout/_partial/footer.ejs
+++ b/layout/_partial/footer.ejs
@@ -3,7 +3,7 @@
         <div class="social-wrapper">
           <% (config.social||[]).forEach(function(value){ %>
               <% if (value.url && value.icon) { %>
-                  <a href="<%= value.url %>" class="social fa <%= value.icon %> flat-box" target="_blank" rel="external"></a>
+                  <a href="<%= value.url %>" class="social <%- value.icon %> flat-box" target="_blank" rel="external"></a>
               <%}%>
           <%})%>
         </div>
diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
index f0a4b4c..1fce798 100755
--- a/layout/_partial/header.ejs
+++ b/layout/_partial/header.ejs
@@ -12,7 +12,7 @@
     					<% (config.nav_menu || []).forEach(function(value){ %>
     						<li>
     							<a class='nav-<%=value.slug%> flat-box' href='<%=url_for(value.url)%>'>
-    								<i class='fa <%=value.icon%> fa-'></i>&nbsp;<%=value.name%>
+    								<i class='<%=value.icon%> fa-fw'></i>&nbsp;<%=value.name%>
   								</a>
   							</li>
         			<%})%>
@@ -33,7 +33,7 @@
 				<% if (config.search.enable === true) { %>
 					<li class='s-search'><a class="fa fa-search fa-fw" href='javascript:void(0)'></span></a></li>
 				<% } %>
-				<li class='s-menu'><a class="fa fa-navicon fa-fw" href='javascript:void(0)'></a></li>
+				<li class='s-menu'><a class="fa fa-bars fa-fw" href='javascript:void(0)'></a></li>
 			</ul>
 		</div>
 
@@ -54,7 +54,7 @@
               <% (config.nav_menu || []).forEach(function(value){ %>
                   <li>
                       <a class='nav-<%=value.slug%> flat-box nav flat-box' href='<%=url_for(value.url)%>'>
-                      <i class='fa <%=value.icon%> fa-fw'></i>&nbsp;<%=value.name%></a>
+                      <i class='<%=value.icon%> fa-fw'></i>&nbsp;<%=value.name%></a>
                   </li>
               <%})%>
        <% } %>
diff --git a/layout/_partial/post.ejs b/layout/_partial/post.ejs
index 17c017b..1648c81 100755
--- a/layout/_partial/post.ejs
+++ b/layout/_partial/post.ejs
@@ -10,7 +10,7 @@
             </a>
         </h2>
         <time>
-            <i class="fa fa-calendar fa-fw" aria-hidden="true"></i>&nbsp;<%= date(post.date, config.date_format) %>
+            <i class="fa fa-calendar-alt fa-fw" aria-hidden="true"></i>&nbsp;<%= date(post.date, config.date_format) %>
         </time>
         <%- partial('categories',{post:post}) %>
     </section>
diff --git a/layout/_widget/author.ejs b/layout/_widget/author.ejs
index 5cd2cb8..0432d5a 100755
--- a/layout/_widget/author.ejs
+++ b/layout/_widget/author.ejs
@@ -22,7 +22,7 @@
             <div class="social-wrapper">
               <% (config.social||[]).forEach(function(value){ %>
                 <% if (value.url && value.icon) { %>
-                    <a href="<%= value.url %>" class="social flat-box" target="_blank" rel="external"><i class="social fa <%= value.icon %>" aria-hidden="true"></i></a>
+                    <a href="<%= value.url %>" class="social flat-box" target="_blank" rel="external"><i class="social <%= value.icon %>" aria-hidden="true"></i></a>
                 <%}%>
               <%})%>
             </div>
diff --git a/layout/_widget/categories.ejs b/layout/_widget/categories.ejs
index 34bd3df..aa8355d 100755
--- a/layout/_widget/categories.ejs
+++ b/layout/_widget/categories.ejs
@@ -1,5 +1,5 @@
 <section class='m_widget categories'>
-    <div class='header'><i class="fa fa-sitemap fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;分类</div>
+    <div class='header'><i class="fas fa-folder-open fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;分类</div>
     <div class='content'>
         <% if (site.categories.length){ %>
             <ul class="entry">
diff --git a/layout/_widget/links.ejs b/layout/_widget/links.ejs
index a9a93dc..14f1982 100755
--- a/layout/_widget/links.ejs
+++ b/layout/_widget/links.ejs
@@ -1,11 +1,15 @@
 <section class='m_widget links'>
-    <div class='header'><i class="fa fa-handshake-o fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;友链</div>
+    <div class='header'><i class="fas fa-handshake fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;友链</div>
     <div class='content'>
         <ul class="entry" id="links">
             <% (config.widgets.links||[]).forEach(function(item){ %>
                 <li><a class="flat-box" target="_blank" rel="external nofollow noopener noreferrer" href="<%= url_for(item.url) %>">
                     <div class='name'>
-                        <i class="fa fa-user-circle-o fa-fw" aria-hidden="true"></i>
+                        <% if(item.avatar) { %>
+                            <img src="<%= item.avatar %>">
+                        <% } else { %>
+                            <i class="fa fa-user-circle fa-fw" aria-hidden="true"></i>
+                        <% } %>
                         &nbsp;&nbsp;<%= item.name %>
                     </div>
                 </a></li>
@@ -13,7 +17,7 @@
             <% if(config.email) { %>
                 <li><a class="flat-box" target="_blank" rel="external nofollow noopener noreferrer" href="mailto:<%= config.email %>?subject=交换友链&body=你好，我想和你交换友链，我已经将【<%= config.title %>】添加至我的博客的友链中。我的博客链接是：">
                     <div class='name'>
-                        <i class="fa fa-plus fa-fw" aria-hidden="true"></i>
+                        <i class="fa fa-envelope fa-fw" aria-hidden="true"></i>
                         &nbsp;&nbsp;联系博主交换友链
                     </div>
                 </a></li>
diff --git a/layout/_widget/music.ejs b/layout/_widget/music.ejs
index f46e1c1..dcb9dbd 100755
--- a/layout/_widget/music.ejs
+++ b/layout/_widget/music.ejs
@@ -1,5 +1,5 @@
 <section class='m_widget music'>
-    <div class='header'><i class="fa fa-headphones fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;音乐</div>
+    <div class='header'><i class="fas fa-headphones-alt fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;音乐</div>
     <div class='content'>
         <iframe frameborder="no" border="0" marginwidth="0" marginheight="0" width=100% height=450 src="//music.163.com/outchain/player?type=0&id=<%= config.widgets.musicid %>&auto=0&height=450"></iframe>
     </div>
diff --git a/layout/_widget/tagcloud.ejs b/layout/_widget/tagcloud.ejs
index 98f52b9..4cfbb17 100755
--- a/layout/_widget/tagcloud.ejs
+++ b/layout/_widget/tagcloud.ejs
@@ -1,6 +1,6 @@
 <% if (site.tags.length){ %>
     <section class='m_widget tagcloud'>
-        <div class="header"><i class="fa fa-tags fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;标签</div>
+        <div class="header"><i class="fas fa-tags fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;标签</div>
         <div class='content'>
             <%- tagcloud(site.tags, {
                 min_font: 14,
diff --git a/layout/_widget/toc.ejs b/layout/_widget/toc.ejs
index 75d0c8c..2a9fcc1 100755
--- a/layout/_widget/toc.ejs
+++ b/layout/_widget/toc.ejs
@@ -1,6 +1,6 @@
 <% if(page.content && page.toc!==false && toc(page.content).length > 0){ %>
     <section class='m_widget toc-wrapper'>
-        <div class="header"><i class="fa fa-list fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;目录</div>
+        <div class="header"><i class="fas fa-list fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;目录</div>
         <div class='content'>
             <%- toc(page.content, {list_number: false}) %>
         </div>
diff --git a/source/less/_widget.less b/source/less/_widget.less
index 44e5f9b..2546609 100755
--- a/source/less/_widget.less
+++ b/source/less/_widget.less
@@ -172,5 +172,15 @@
 .m_widget.links{
     .content{
         padding: @gap/2 0;
+        .name{
+          img{
+            display: inline;
+            border-radius: 100%;
+            vertical-align: middle;
+            height: 18px;
+            width: 18px;
+            margin-bottom: 4px;
+          }
+        }
     }
 }

From 5bfe4257ee283a7719cafdf5268fdb57706059f5 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Wed, 7 Nov 2018 15:05:32 +0800
Subject: [PATCH 05/19] update

---
 layout/_partial/article.ejs |  7 +------
 layout/_partial/header.ejs  |  2 +-
 layout/_widget/links.ejs    | 17 ++++++-----------
 source/less/_widget.less    | 10 ++++++++++
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
index 9f21bba..f4d817e 100755
--- a/layout/_partial/article.ejs
+++ b/layout/_partial/article.ejs
@@ -124,12 +124,7 @@
                     <% if (config.valine.enable && config.valine.appId && config.valine.appKey){ %>
                         <h4><i class="fa fa-comments fa-fw" aria-hidden="true"></i>&nbsp;Valine评论</h4>
                         <div class="subtitle">
-                          <h6><b>文明评论，请勿灌水。</b>为了便于区分，请您在留言时至少填写一下 <b>昵称</b> 啊。<br>
-                          与主题相关的内容及评论测试请到 <a href="https://xaoxuu.com/wiki/material-x/">https://xaoxuu.com/wiki/material-x/</a> 留言，
-                          <% if (config.about_url){ %>
-                              其它想要对作者说的话可以到 <a href="<%= config.about_url %>"><%= config.about_url %></a> 留言。
-                          <% } %>
-                          留言时填写邮箱可以在被回复时收到邮件提醒，也可以显示Gravatar头像，网址填写个人主页或者博客的作用是别人点击你的昵称会跳转到你的博客，为你增加访问量。</h6>
+                          <h6><b>文明评论，请勿灌水。</b>为了便于区分和接收回复提醒，请您在留言时填写一下<b>昵称</b>和<b>邮箱</b>。</h6>
                         <div>
                         <section id="comments">
                             <div id="valine_container" class="valine_thread">
diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
index 1fce798..603007e 100755
--- a/layout/_partial/header.ejs
+++ b/layout/_partial/header.ejs
@@ -42,7 +42,7 @@
 			<ul class='switcher h-list'>
 				<li class='s-comment'><a class="fa fa-comments fa-fw flat-box" href='javascript:void(0)'></a></li>
 				<li class='s-top'><a class="fa fa-arrow-up fa-fw flat-box" href='javascript:void(0)'></a></li>
-				<li class='s-toc'><a class="fa fa-list-ul fa-fw flat-box" href='javascript:void(0)'></a></li>
+				<li class='s-toc'><a class="fa fa-list fa-fw flat-box" href='javascript:void(0)'></a></li>
 			</ul>
 		</div>
 	</div>
diff --git a/layout/_widget/links.ejs b/layout/_widget/links.ejs
index 14f1982..4ea4a3c 100755
--- a/layout/_widget/links.ejs
+++ b/layout/_widget/links.ejs
@@ -1,5 +1,9 @@
 <section class='m_widget links'>
-    <div class='header'><i class="fas fa-handshake fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;友链</div>
+    <div class='header'><div><i class="fas fa-handshake fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;友链</div>
+    <% if(config.email) { %>
+        <a class="addlink" title="联系博主添加友链" target="_blank" rel="external nofollow noopener noreferrer" href="mailto:<%= config.email %>?subject=交换友链&body=你好，我想和你交换友链，我已经将【<%= config.title %>】添加到我的博客的友链中。我的博客链接是："><i class="fas fa-plus fa-fw"></i></a>
+    <%} %>
+    </div>
     <div class='content'>
         <ul class="entry" id="links">
             <% (config.widgets.links||[]).forEach(function(item){ %>
@@ -8,21 +12,12 @@
                         <% if(item.avatar) { %>
                             <img src="<%= item.avatar %>">
                         <% } else { %>
-                            <i class="fa fa-user-circle fa-fw" aria-hidden="true"></i>
+                            <i class="fas fa-user-circle fa-fw" aria-hidden="true"></i>
                         <% } %>
                         &nbsp;&nbsp;<%= item.name %>
                     </div>
                 </a></li>
             <% }) %>
-            <% if(config.email) { %>
-                <li><a class="flat-box" target="_blank" rel="external nofollow noopener noreferrer" href="mailto:<%= config.email %>?subject=交换友链&body=你好，我想和你交换友链，我已经将【<%= config.title %>】添加至我的博客的友链中。我的博客链接是：">
-                    <div class='name'>
-                        <i class="fa fa-envelope fa-fw" aria-hidden="true"></i>
-                        &nbsp;&nbsp;联系博主交换友链
-                    </div>
-                </a></li>
-            <%} %>
-
         </ul>
 
     </div>
diff --git a/source/less/_widget.less b/source/less/_widget.less
index 2546609..04ae810 100755
--- a/source/less/_widget.less
+++ b/source/less/_widget.less
@@ -170,6 +170,16 @@
     }
 }
 .m_widget.links{
+    .header{
+      display: flex;
+      justify-content: space-between;
+        .addlink{
+          color: @theme_text_in_header;
+          &:hover {
+              color: darken(@theme_text_highlight, 25%);
+          }
+        }
+    }
     .content{
         padding: @gap/2 0;
         .name{

From 1017a9e5766a19a6351fedc03e5f98b524229220 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Wed, 7 Nov 2018 15:08:49 +0800
Subject: [PATCH 06/19] config

---
 _config.yml | 61 +++++++++++++++--------------------------------------
 1 file changed, 17 insertions(+), 44 deletions(-)

diff --git a/_config.yml b/_config.yml
index 3bd344a..393421e 100755
--- a/_config.yml
+++ b/_config.yml
@@ -2,21 +2,21 @@
 # 导航栏
 nav_menu:
   - name: 主页
-    slug: about
-    icon: fa-home
-    url: /
+    slug:
+    icon: fas fa-home
+    url: https://xaoxuu.com/
   - name: 项目
-    slug: projects
-    icon: fa-cube
-    url: https://xaoxuu.com/proj
+    slug:
+    icon: fas fa-flask
+    url: https://xaoxuu.com/projects/
   - name: 博客
     slug: home
-    icon: fa-rss
+    icon: fas fa-rss
     url: /
   - name: 归档
     slug: archives
-    icon: fa-archive
-    url: /archives
+    icon: fas fa-archive
+    url: /archives/
 
 # 右边的小窗口，不想显示哪一项的注释掉对应的即可
 widgets:
@@ -24,8 +24,8 @@ widgets:
   author:
     enable: true
     avatar: https://xaoxuu.com/assets/img/avatar.jpg # 头像，如果config中已经设置avatar了，这里可以不用写
-    title: 某知名博主 # 博客名、头衔等等，居中显示
-    motto: 某知名博主的座右铭啊哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈。 # 格言座右铭等等
+    title: # 博客名、头衔等等，居中显示
+    motto: # 格言座右铭等等
     social: true # 是否显示社交信息（内容同页脚的社交信息）
   # 显示文章分类
   categories: true
@@ -36,50 +36,23 @@ widgets:
   # 显示友链
   links:
   - name: xaoxuu's blog
+    avatar: https://xaoxuu.com/assets/img/avatar.jpg
     url: https://blog.xaoxuu.com
   # 显示目录（在文章中设置toc:false可以隐藏单篇文章的目录）
   toc: true
 
 # 页脚社交信息
 social:
-  - icon: fa-envelope
+  - icon: fas fa-envelope
     url: mailto:me@xaoxuu.com
-  - icon: fa-github
+  - icon: fab fa-github
     url: https://github.com/xaoxuu
-  - icon: fa-instagram
-    url:
-  - icon: fa-google-plus
+  - icon: fab fa-instagram
     url:
-  - icon: fa-twitter
+  - icon: fab fa-twitter
     url:
-  - icon: fa-music
+  - icon: fas fa-music
     url: https://music.163.com/#/user/home?id=63035382
-  - icon: fa-rss
-    url: atom
-  - icon: fa-telegram
-    url:
-  - icon: fa-vimeo
-    url:
-  - icon: fa-gitlab
-    url:
-  - icon: fa-linkedin
-    url:
-  - icon: fa-snapchat
-    url:
-  - icon: fa-steam
-    url:
-  - icon: fa-spotify
-    url:
-  - icon: fa-tumblr
-    url:
-  - icon: fa-youtube
-    url:
-  - icon: fa-weibo
-    url:
-  - icon: fa-weixin
-    url:
-  - icon: fa-qq
-    url:
 
 
 # 推荐文章

From 614f58f87bf046b06e2b1e1559c13a72e7adbc79 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Wed, 7 Nov 2018 16:55:02 +0800
Subject: [PATCH 07/19] =?UTF-8?q?code=20=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/less/_defines.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/less/_defines.less b/source/less/_defines.less
index af56d89..b59f540 100755
--- a/source/less/_defines.less
+++ b/source/less/_defines.less
@@ -57,7 +57,7 @@
 // 大部分文字字体
 @fontfamily_base: 'Ubuntu', Menlo, Monaco, Helvetica, "Hiragino Sans GB", "Hiragino Sans GB W3", Source Han Sans CN Regular, WenQuanYi Micro Hei, "Microsoft YaHei", Arial, sans-serif;
 // 代码字体
-@fontfamily_code: Menlo, Monaco, @fontfamily_base;
+@fontfamily_code: Menlo, Monaco, "Lucida Console", monospace, "Microsoft YaHei", Helvetica, Arial, sans-serif;
 // LOGO字体
 @fontfamily_logo: @fontfamily_base;
 // end: 字体 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

From 7a16a6a04d9cfd0a2d6dfdc7e6aa06e15a4bb33d Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Thu, 8 Nov 2018 10:30:49 +0800
Subject: [PATCH 08/19] update

---
 layout/_partial/article.ejs    | 76 +++++++++++++++++++++-------------
 layout/_partial/categories.ejs |  5 ++-
 layout/_partial/post.ejs       |  2 +-
 source/less/_article.less      | 17 ++++----
 source/less/_defines.less      |  2 +-
 source/less/_main.less         | 72 +++++++++++++++++++++-----------
 6 files changed, 109 insertions(+), 65 deletions(-)

diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
index f4d817e..d3ab239 100755
--- a/layout/_partial/article.ejs
+++ b/layout/_partial/article.ejs
@@ -7,10 +7,13 @@
                 <%= date(post.date, config.date_format) %>
             <% } %>
         </h1>
-        <time>
-            <i class="fa fa-calendar-alt fa-fw" aria-hidden="true"></i>&nbsp;<%= date(post.date, config.date_format) %>&nbsp;&nbsp;
-            <i class="fa fa-eye fa-fw" aria-hidden="true"></i>&nbsp;<span id="busuanzi_value_page_pv"><i class="fa fa-spinner fa-spin fa-fw" aria-hidden="true"></i></span>
+        <time class="time">
+            <i class="fas fa-calendar-alt fa-fw" aria-hidden="true"></i>
+            <%= date(post.date, config.date_format) %>
         </time>
+        <div class="browse"><i class="fas fa-eye fa-fw" aria-hidden="true"></i>
+          <span id="busuanzi_value_page_pv"><i class="fas fa-spinner fa-spin fa-fw" aria-hidden="true"></i></span>
+        </div>
         <%- partial('categories',{post:post}) %>
     </section>
 
@@ -20,26 +23,31 @@
             <%- post.content %>
         </div>
 
-        <% if (post.tags && post.tags && post.tags.each) { %>
-            <div class="article-tags tags">
-                <% post.tags.each(function(item){ %>
-                    <a href="<%- url_for(item.path) %>"><i class="fa fa-tag fa-fw" aria-hidden="true"></i>&nbsp;<%=item.name %></a>
-                <%})%>
-            </div>
-        <% } %>
         <section class='meta'>
-          <time itemprop="dateUpdated" datetime="<%- moment(post.updated).format() %>" content="<%- date(post.updated, config.date_format) %>">
-            <i class="fa fa-edit fa-fw" aria-hidden="true"></i>
-            本文最后更新于：<%- date(post.updated, config.date_format) %>
-          </time>
+            <time class="time" itemprop="dateUpdated" datetime="<%- moment(post.updated).format() %>" content="<%- date(post.updated, config.date_format) %>">
+                <i class="fas fa-edit fa-fw" aria-hidden="true"></i>
+                本文最后更新于：<%- date(post.updated, config.date_format) %>
+            </time>
+            <% if (post.tags && post.tags && post.tags.each) { %>
+                <%
+                var items = [];
+                post.tags.each(function(item){
+                    items.push('<a class="tag" href="'+url_for(item.path)+'">' + item.name + '</a>');
+                });
+                %>
+                <div class="article-tags tags">
+                    <i class="fas fa-tags fa-fw" aria-hidden="true"></i>
+                    <%- items.join(', ') %>
+                </div>
+            <% } %>
         </section>
 
         <% if(post.prev || post.next){ %>
             <div class="prev-next">
                 <% if(post.prev){ %>
-                    <section class="prev" >
+                    <section class="prev">
                         <span class="art-item-left">
-                            <h6><i class="fa fa-chevron-left" aria-hidden="true"></i>&nbsp;上一篇</h6>
+                            <h6><i class="fas fa-chevron-left" aria-hidden="true"></i>&nbsp;上一篇</h6>
                             <h4>
                                 <a href="<%=url_for(post.prev.path)%>" rel="prev" title="<%=post.prev.title%>">
                                   <% if(post.prev.title){ %>
@@ -49,11 +57,16 @@
                                   <% } %>
                                 </a>
                             </h4>
-                            <% if (post.prev.tags && post.prev.tags.length) { %>
+                            <% if (post.prev.tags && post.prev.tags && post.prev.tags.each) { %>
+                                <%
+                                var items = [];
+                                post.prev.tags.each(function(item){
+                                    items.push('<a class="tag" href="'+url_for(item.path)+'">' + item.name + '</a>');
+                                });
+                                %>
                                 <h6 class="tags">
-                                    <% post.prev.tags.each(function(item){ %>
-                                        <i class="fa fa-tag fa-fw"></i><%=item.name %>
-                                    <%})%>
+                                    <i class="fas fa-tags fa-fw" aria-hidden="true"></i>
+                                    <%- items.join(', ') %>
                                 </h6>
                             <% } %>
                         </span>
@@ -62,7 +75,7 @@
                 <% if(post.next){ %>
                     <section class="next">
                         <span class="art-item-right" aria-hidden="true">
-                            <h6>下一篇&nbsp;<i class="fa fa-chevron-right" aria-hidden="true"></i></h6>
+                            <h6>下一篇&nbsp;<i class="fas fa-chevron-right" aria-hidden="true"></i></h6>
                             <h4>
                                 <a href="<%=url_for(post.next.path)%>" rel="prev" title="<%=post.next.title%>">
                                     <% if(post.next.title){ %>
@@ -72,11 +85,16 @@
                                     <% } %>
                                 </a>
                             </h4>
-                            <% if (post.next.tags && post.next.tags.length) { %>
+                            <% if (post.next.tags && post.next.tags && post.next.tags.each) { %>
+                                <%
+                                var items = [];
+                                post.next.tags.each(function(item){
+                                    items.push('<a class="tag" href="'+url_for(item.path)+'">' + item.name + '</a>');
+                                });
+                                %>
                                 <h6 class="tags">
-                                    <% post.next.tags.each(function(item){ %>
-                                        <i class="fa fa-tag fa-fw"></i><%=item.name %>
-                                    <%})%>
+                                    <i class="fas fa-tags fa-fw" aria-hidden="true"></i>
+                                    <%- items.join(', ') %>
                                 </h6>
                             <% } %>
                         </span>
@@ -103,7 +121,7 @@
             <% if (post.comments) { %>
 
                 <% if (config.disqus_shortname) { %>
-                    <h4><i class="fa fa-comments fa-fw" aria-hidden="true"></i>&nbsp;Disqus评论</h4>
+                    <h4><i class="fas fa-comments fa-fw" aria-hidden="true"></i>&nbsp;Disqus评论</h4>
                     <section id="comments">
                         <div id="disqus_thread">
                             ⚠️  无法加载评论系统，请确保您的网络能够正常访问 <a href="https://disqus.com">Disqus</a> 。
@@ -112,7 +130,7 @@
                 <% } %>
 
                 <% if (config.livere_uid){ %>
-                    <h4><i class="fa fa-comments fa-fw" aria-hidden="true"></i>&nbsp;LiveRe评论</h4>
+                    <h4><i class="fas fa-comments fa-fw" aria-hidden="true"></i>&nbsp;LiveRe评论</h4>
                     <section id="comments">
                         <div id="lv-container" data-id="city" data-uid="<%= config.livere_uid %>">
                             <noscript>为正常使用来必力评论功能请激活JavaScript</noscript>
@@ -122,13 +140,13 @@
 
                 <% if (config.valine){ %>
                     <% if (config.valine.enable && config.valine.appId && config.valine.appKey){ %>
-                        <h4><i class="fa fa-comments fa-fw" aria-hidden="true"></i>&nbsp;Valine评论</h4>
+                        <h4><i class="fas fa-comments fa-fw" aria-hidden="true"></i>&nbsp;Valine评论</h4>
                         <div class="subtitle">
                           <h6><b>文明评论，请勿灌水。</b>为了便于区分和接收回复提醒，请您在留言时填写一下<b>昵称</b>和<b>邮箱</b>。</h6>
                         <div>
                         <section id="comments">
                             <div id="valine_container" class="valine_thread">
-                                </i><i class="fa fa-spinner fa-spin fa-fw"></i>
+                                </i><i class="fas fa-spinner fa-spin fa-fw"></i>
                             </div>
                         </section>
                         <script src="//cdn1.lncld.net/static/js/3.0.4/av-min.js"></script>
diff --git a/layout/_partial/categories.ejs b/layout/_partial/categories.ejs
index e8c31fa..d841558 100755
--- a/layout/_partial/categories.ejs
+++ b/layout/_partial/categories.ejs
@@ -2,10 +2,11 @@
     <%
     var cats = [];
     post.categories.forEach(function(cat){
-        cats.push('<a href="'+url_for(cat.path)+'">' + cat.name + '</a>');
+        cats.push('<a class="categories" href="'+url_for(cat.path)+'">' + cat.name + '</a>');
     });
     %>
     <div class='cats'>
-        <%- cats.join(', ') %>
+        <i class="fas fa-folder-open fa-fw" aria-hidden="true"></i>
+        <%- cats.join(' / ') %>
     </div>
 <% } %>
diff --git a/layout/_partial/post.ejs b/layout/_partial/post.ejs
index 1648c81..d6d2fe8 100755
--- a/layout/_partial/post.ejs
+++ b/layout/_partial/post.ejs
@@ -9,7 +9,7 @@
                 <% } %>
             </a>
         </h2>
-        <time>
+        <time class="time">
             <i class="fa fa-calendar-alt fa-fw" aria-hidden="true"></i>&nbsp;<%= date(post.date, config.date_format) %>
         </time>
         <%- partial('categories',{post:post}) %>
diff --git a/source/less/_article.less b/source/less/_article.less
index e99db2c..b486ead 100755
--- a/source/less/_article.less
+++ b/source/less/_article.less
@@ -156,8 +156,8 @@
         background: fade(@theme_bg_quote, 10%);
         margin: 1em 0;
         padding: @gap;
-        border-left: @border_radius solid @theme_bg_quote;
-        border-radius: @border_radius;
+        border-left: @border_radius_code_block solid @theme_bg_quote;
+        border-radius: @border_radius_code_block;
         .enable-trans();
         footer {
             strong {
@@ -226,11 +226,12 @@
         margin-top: @gap;
         background: darken(fade(@theme_bg_main, 50%), 5%);
         &.article-tags {
-            padding-top: 2*@gap;
-            background: transparent;
+            // padding-top: 2*@gap;
+            // background: transparent;
         }
         word-spacing: @gap;
         a {
+          color: @theme_text_main;
             position: relative;
             display: inline-block;
             word-spacing: 0;
@@ -239,7 +240,6 @@
             //   margin-left: @gap/2;
             // }
             .enable-trans();
-            color: @color_grey;
             &:hover {
                 color: @theme_text_highlight;
                 background: transparent;
@@ -300,6 +300,7 @@
             }
             h6{
                 margin: 0;
+                word-spacing: normal;
             }
             .enable-trans();
             // border: 1px solid transparent;
@@ -309,8 +310,8 @@
             .tags{
                 background: transparent;
                 padding: 0;
-                    margin-top: @gap/2;
-                    margin-bottom: 0;
+                margin-top: @gap/2;
+                margin-bottom: 0;
             }
             &:first-child{
                 margin-left: 0;
@@ -410,7 +411,7 @@
       content: "SWIFT";
   }
   &.objc .code:before{
-      content: "OBJC";
+      content: "OBJECTIVE-C";
   }
   &.c .code:before{
       content: "C";
diff --git a/source/less/_defines.less b/source/less/_defines.less
index b59f540..459fb74 100755
--- a/source/less/_defines.less
+++ b/source/less/_defines.less
@@ -128,7 +128,7 @@
 // 0px: 极端，2px：硬朗，4px：常规，8px：圆润，16px：温柔
 @border_radius: 8px; // 圆角半径，可以根据心情随时调整风格
 @border_radius_line: 4px; // 线的宽度和滚动条的宽度
-@border_radius_code_block: 8px; // 代码块的圆角
+@border_radius_code_block: 8px; // 引用、代码块的圆角
 // end: 圆角 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
diff --git a/source/less/_main.less b/source/less/_main.less
index 5be9e2a..c066f9c 100755
--- a/source/less/_main.less
+++ b/source/less/_main.less
@@ -209,10 +209,15 @@
               box-shadow: @boxshadow_card_normal;
             }
         }
+        .tags a{
+          color: fade(@theme_text_main, 70%);
+        }
         .meta {
+            color: fade(@theme_text_main, 70%);
             margin-bottom: 0.5*@gap;
+            font-size: @fontsize_small * .95;
             &:first-child{
-                margin-bottom: 2*@gap;
+                margin-bottom: 1.5*@gap;
             }
             .title {
                 left: 0;
@@ -238,39 +243,58 @@
                     }
                 }
             }
-            time,
-            .cats {
+            .tags{
                 display: inline-block;
+                background: transparent;
+                word-spacing: normal;
+            }
+            .time,
+            .cats,
+            .browse,
+            .tags {
                 font-size: @fontsize_small * .95;
+                color: fade(@theme_text_main, 70%);
+                display: inline-block;
+                background: fade(@theme_bg_quote, 10%);
+                margin-right: 4px;
+                margin-bottom: 8px;
+                padding: 2px 8px 2px 6px;
+                border-radius: 0.5*@border_radius_code_block;
+                border-left: 0.5*@border_radius_code_block solid @theme_bg_quote;
+                a{
+                    .enable-trans();
+                    &:hover {
+                        color: @theme_text_highlight;
+                        text-decoration: underline;
+                    }
+                    &:active {
+                        color: darken(@theme_text_highlight, 25%);
+                    }
+                }
+                .categories {
+                    font-weight: bold;
+                    color: @theme_text_link;
+                }
+                .tag{
+                    color: fade(@theme_text_main, 70%);
+                }
 
             }
             .cats {
-                &:before {
-                    display: inline-block;
-                    margin: 0 5px;
-                    @border-width: 8px;
-                    content: '';
-                    border-top: @border-width/2 solid transparent;
-                    border-bottom: @border-width/2 solid transparent;
-                    border-left: @border-width solid @theme_text_link;
-                }
                 a {
                     font-weight: bold;
-                        color: @theme_text_link;
-                        .enable-trans();
-                        &:hover {
-                            color: @theme_text_highlight;
-                            text-decoration: underline;
-                        }
-                        &:active {
-                            color: darken(@theme_text_highlight, 25%);
-                        }
+                    color: @theme_text_link;
+                    .enable-trans();
+                    &:hover {
+                        color: @theme_text_highlight;
+                        text-decoration: underline;
+                    }
+                    &:active {
+                        color: darken(@theme_text_highlight, 25%);
+                    }
                 }
 
             }
-            time {
-                color: lighten(@color_grey, 20%);
-            }
         }
         .full-width,.highlight{
             margin-left: 0*@gap;

From c568498893d3512cc52ebdad39bcdbe9eec0fce0 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Thu, 8 Nov 2018 10:34:42 +0800
Subject: [PATCH 09/19] update fa

---
 layout/_partial/archive.ejs                |  6 +++---
 layout/_partial/footer.ejs                 |  2 +-
 layout/_partial/header.ejs                 | 14 +++++++-------
 layout/_partial/post.ejs                   |  4 ++--
 layout/_partial/post/recommended_posts.ejs |  2 +-
 layout/_widget/author.ejs                  |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/layout/_partial/archive.ejs b/layout/_partial/archive.ejs
index eb04ef2..b428090 100755
--- a/layout/_partial/archive.ejs
+++ b/layout/_partial/archive.ejs
@@ -18,7 +18,7 @@
             <article class="post revealno-title">
                 <section class="meta">
                     <h2 class="title" style="color:#EF503A">
-                        <span class="fa fa-exclamation-triangle"></span>
+                        <span class="fas fa-exclamation-triangle"></span>
                         还剩最后一步就成功了
                     </h2>
                     <p>
@@ -43,7 +43,7 @@
             <% if (page.prev != 0) { %>
                 <a class="prev" rel="prev" href="<%= url_for(page.prev_link) %>">
                     <section class="post prev" >
-                        <i class="fa fa-chevron-left" aria-hidden="true"></i>&nbsp;上一页&nbsp;
+                        <i class="fas fa-chevron-left" aria-hidden="true"></i>&nbsp;上一页&nbsp;
                     </section>
                 </a>
             <% } %>
@@ -53,7 +53,7 @@
             <% if (page.next != 0) { %>
                 <a class="next" rel="next" href="<%= url_for(page.next_link) %>">
                     <section class="post next">
-                        &nbsp;下一页&nbsp;<i class="fa fa-chevron-right" aria-hidden="true"></i>
+                        &nbsp;下一页&nbsp;<i class="fas fa-chevron-right" aria-hidden="true"></i>
                     </section>
                 </a>
             <% } %>
diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs
index f41b070..aa1234e 100755
--- a/layout/_partial/footer.ejs
+++ b/layout/_partial/footer.ejs
@@ -11,7 +11,7 @@
     <br>
     <div>博客内容遵循 <a target="_blank" href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh" class="licenses">知识共享 署名 - 非商业性 - 相同方式共享 4.0 国际协议</a></div>
     <div>本站使用 <a href="https://xaoxuu.com/wiki/material-x/" target="_blank" class="codename">Material X</a> 作为主题，
-		总访问量为 <span id="busuanzi_value_site_pv"><i class="fa fa-spinner fa-spin fa-fw" aria-hidden="true"></i></span> 次。
+		总访问量为 <span id="busuanzi_value_site_pv"><i class="fas fa-spinner fa-spin fa-fw" aria-hidden="true"></i></span> 次。
     </div>
 </footer>
 <!-- 根据页面mathjax变量决定是否加载MathJax数学公式js -->
diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
index 603007e..dc28360 100755
--- a/layout/_partial/header.ejs
+++ b/layout/_partial/header.ejs
@@ -2,7 +2,7 @@
 	<div class='wrapper'>
 		<div class="nav-main container container--flex">
 			<a class="logo flat-box" href='<%= url_for("/") %>' >
-				<!-- <i class="fa fa-home"></i> -->
+				<!-- <i class="fas fa-home"></i> -->
 				<%- config.title %>
 			</a>
 
@@ -25,24 +25,24 @@
 				<div class="m_search">
 					<form name="searchform" class="form u-search-form">
 						<input type="text" class="input u-search-input" placeholder="Search" />
-						<span class="icon"><i class="fa fa-search fa-fw"></i></span>
+						<span class="icon"><i class="fas fa-search fa-fw"></i></span>
 					</form>
 				</div>
 			<% } %>
 			<ul class='switcher h-list'>
 				<% if (config.search.enable === true) { %>
-					<li class='s-search'><a class="fa fa-search fa-fw" href='javascript:void(0)'></span></a></li>
+					<li class='s-search'><a class="fas fa-search fa-fw" href='javascript:void(0)'></span></a></li>
 				<% } %>
-				<li class='s-menu'><a class="fa fa-bars fa-fw" href='javascript:void(0)'></a></li>
+				<li class='s-menu'><a class="fas fa-bars fa-fw" href='javascript:void(0)'></a></li>
 			</ul>
 		</div>
 
 		<div class='nav-sub container container--flex'>
 			<a class="logo flat-box"></a>
 			<ul class='switcher h-list'>
-				<li class='s-comment'><a class="fa fa-comments fa-fw flat-box" href='javascript:void(0)'></a></li>
-				<li class='s-top'><a class="fa fa-arrow-up fa-fw flat-box" href='javascript:void(0)'></a></li>
-				<li class='s-toc'><a class="fa fa-list fa-fw flat-box" href='javascript:void(0)'></a></li>
+				<li class='s-comment'><a class="fas fa-comments fa-fw flat-box" href='javascript:void(0)'></a></li>
+				<li class='s-top'><a class="fas fa-arrow-up fa-fw flat-box" href='javascript:void(0)'></a></li>
+				<li class='s-toc'><a class="fas fa-list fa-fw flat-box" href='javascript:void(0)'></a></li>
 			</ul>
 		</div>
 	</div>
diff --git a/layout/_partial/post.ejs b/layout/_partial/post.ejs
index d6d2fe8..b94c8e5 100755
--- a/layout/_partial/post.ejs
+++ b/layout/_partial/post.ejs
@@ -10,7 +10,7 @@
             </a>
         </h2>
         <time class="time">
-            <i class="fa fa-calendar-alt fa-fw" aria-hidden="true"></i>&nbsp;<%= date(post.date, config.date_format) %>
+            <i class="fas fa-calendar-alt fa-fw" aria-hidden="true"></i>&nbsp;<%= date(post.date, config.date_format) %>
         </time>
         <%- partial('categories',{post:post}) %>
     </section>
@@ -26,7 +26,7 @@
         <% if (post.tags && post.tags.length) { %>
             <div class="full-width auto-padding tags">
                 <% post.tags.each(function(item){ %>
-                    <a href="<%- url_for(item.path) %>"><i class="fa fa-tag fa-fw"></i>&nbsp;<%=item.name %></a>
+                    <a href="<%- url_for(item.path) %>"><i class="fas fa-tag fa-fw"></i>&nbsp;<%=item.name %></a>
                 <%})%>
             </div>
         <% } %>
diff --git a/layout/_partial/post/recommended_posts.ejs b/layout/_partial/post/recommended_posts.ejs
index 5e3f2cf..947aea1 100644
--- a/layout/_partial/post/recommended_posts.ejs
+++ b/layout/_partial/post/recommended_posts.ejs
@@ -1,7 +1,7 @@
 <% var post_list = recommended_posts(page, site) %>
 <% if(post_list.length > 0) { %>
     <div class="recommended_posts">
-        <h4><i class="fa fa-bookmark fa-fw" aria-hidden="true"></i>&nbsp;你可能感兴趣的文章</h4>
+        <h4><i class="fas fa-bookmark fa-fw" aria-hidden="true"></i>&nbsp;你可能感兴趣的文章</h4>
         <ul>
             <% post_list.forEach(function(link) { %>
                 <li><a href="<%= link.permalink %>"><%= link.title %></a></li>
diff --git a/layout/_widget/author.ejs b/layout/_widget/author.ejs
index 0432d5a..38015f1 100755
--- a/layout/_widget/author.ejs
+++ b/layout/_widget/author.ejs
@@ -12,7 +12,7 @@
                 <% } %>
                 <% if (config.widgets.author.motto){ %>
                     <div>
-                        <i class="fa fa-quote-left fa-3x fa-pull-left" aria-hidden="true"></i>
+                        <i class="fas fa-quote-left fa-3x fa-pull-left" aria-hidden="true"></i>
                         <%= config.widgets.author.motto %>
                     </div>
                 <% } %>

From 9ebf96f7396f6a73e8c4783353649e7309244fc8 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Thu, 8 Nov 2018 10:36:58 +0800
Subject: [PATCH 10/19] update

---
 layout/_partial/article.ejs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
index d3ab239..8dacaf8 100755
--- a/layout/_partial/article.ejs
+++ b/layout/_partial/article.ejs
@@ -28,7 +28,7 @@
                 <i class="fas fa-edit fa-fw" aria-hidden="true"></i>
                 本文最后更新于：<%- date(post.updated, config.date_format) %>
             </time>
-            <% if (post.tags && post.tags && post.tags.each) { %>
+            <% if (post.tags && post.tags.length && post.tags.each) { %>
                 <%
                 var items = [];
                 post.tags.each(function(item){
@@ -57,7 +57,7 @@
                                   <% } %>
                                 </a>
                             </h4>
-                            <% if (post.prev.tags && post.prev.tags && post.prev.tags.each) { %>
+                            <% if (post.prev.tags && post.prev.tags.length && post.prev.tags.each) { %>
                                 <%
                                 var items = [];
                                 post.prev.tags.each(function(item){
@@ -85,7 +85,7 @@
                                     <% } %>
                                 </a>
                             </h4>
-                            <% if (post.next.tags && post.next.tags && post.next.tags.each) { %>
+                            <% if (post.next.tags && post.next.tags.length && post.next.tags.each) { %>
                                 <%
                                 var items = [];
                                 post.next.tags.each(function(item){

From c583b86ec9479516188624db727c671788e007eb Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Thu, 8 Nov 2018 11:16:46 +0800
Subject: [PATCH 11/19] update

---
 layout/_partial/article.ejs | 16 +++++++---------
 layout/_partial/header.ejs  |  8 ++------
 source/less/_header.less    |  9 +++++----
 source/less/_main.less      | 14 +++++++++-----
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
index 8dacaf8..4670d21 100755
--- a/layout/_partial/article.ejs
+++ b/layout/_partial/article.ejs
@@ -1,12 +1,10 @@
 <article id="<%= post.layout %>-<%= post.slug %>" class="post white-box article-type-<%= post.layout %>" itemscope itemprop="blogPost">
     <section class='meta'>
-        <h1 class="title">
-            <% if(post.title){ %>
-                <%= post.title %>
-            <% } else if (post.date) { %>
-                <%= date(post.date, config.date_format) %>
-            <% } %>
-        </h1>
+        <% if(post.title){ %>
+            <h1 class="title"><%= post.title %></h1>
+        <% } else if (post.date) { %>
+            <h1 class="title"><%= date(post.date, config.date_format) %></h1>
+        <% } %>
         <time class="time">
             <i class="fas fa-calendar-alt fa-fw" aria-hidden="true"></i>
             <%= date(post.date, config.date_format) %>
@@ -25,7 +23,7 @@
 
         <section class='meta'>
             <time class="time" itemprop="dateUpdated" datetime="<%- moment(post.updated).format() %>" content="<%- date(post.updated, config.date_format) %>">
-                <i class="fas fa-edit fa-fw" aria-hidden="true"></i>
+                <i class="fas fa-pen fa-fw" aria-hidden="true"></i>
                 本文最后更新于：<%- date(post.updated, config.date_format) %>
             </time>
             <% if (post.tags && post.tags.length && post.tags.each) { %>
@@ -35,7 +33,7 @@
                     items.push('<a class="tag" href="'+url_for(item.path)+'">' + item.name + '</a>');
                 });
                 %>
-                <div class="article-tags tags">
+                <div class="tags">
                     <i class="fas fa-tags fa-fw" aria-hidden="true"></i>
                     <%- items.join(', ') %>
                 </div>
diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
index dc28360..fb96a21 100755
--- a/layout/_partial/header.ejs
+++ b/layout/_partial/header.ejs
@@ -1,11 +1,7 @@
 <header class="l_header">
 	<div class='wrapper'>
 		<div class="nav-main container container--flex">
-			<a class="logo flat-box" href='<%= url_for("/") %>' >
-				<!-- <i class="fas fa-home"></i> -->
-				<%- config.title %>
-			</a>
-
+			<a class="logo flat-box" href='<%= url_for("/") %>' ><%- config.title %></a>
 				<div class='menu'>
 					<ul class='h-list'>
             <% if (config.nav_menu) { %>
@@ -41,7 +37,7 @@
 			<a class="logo flat-box"></a>
 			<ul class='switcher h-list'>
 				<li class='s-comment'><a class="fas fa-comments fa-fw flat-box" href='javascript:void(0)'></a></li>
-				<li class='s-top'><a class="fas fa-arrow-up fa-fw flat-box" href='javascript:void(0)'></a></li>
+				<li class='s-top'><a class="fas fa-arrow-circle-up fa-fw flat-box" href='javascript:void(0)'></a></li>
 				<li class='s-toc'><a class="fas fa-list fa-fw flat-box" href='javascript:void(0)'></a></li>
 			</ul>
 		</div>
diff --git a/source/less/_header.less b/source/less/_header.less
index cb1bc34..94e1d22 100755
--- a/source/less/_header.less
+++ b/source/less/_header.less
@@ -15,10 +15,12 @@
         .enable-trans();
     }
     .wrapper.sub{
+        .enable-trans();
         transform: translateY(-@height_navbar);
         .logo{
             // padding-left: 0;
             @media(max-width: @on_phone){
+                .enable-trans();
                 padding-left: @gap;
                 padding-right: 0;
                 font-size: @fontsize_base;
@@ -223,18 +225,17 @@
         line-height: 1.8em;
         padding: 8px @gap+6px;
     }
-    width: @width_sidebar;
     position: fixed;
-    top: @height_navbar + @gap;
+    top: @height_navbar + 2*@gap;
     right: 0;
-    width: @width_sidebar;
+    width: 100% - 0.5*@gap;
     z-index:9999 + 1;
     line-height: 2 * @gap;
     background: white;
     border-right: 0;
     box-shadow: @boxshadow_card_raised;
     border-radius: @border_radius;
-    transform: translate3d(@width_sidebar, -0, 0);
+    transform: translate3d(100%, -0, 0);
     .enable-trans();
     &:hover {
         box-shadow: @boxshadow_card_raised;
diff --git a/source/less/_main.less b/source/less/_main.less
index c066f9c..bf7e0e7 100755
--- a/source/less/_main.less
+++ b/source/less/_main.less
@@ -214,10 +214,12 @@
         }
         .meta {
             color: fade(@theme_text_main, 70%);
+            margin-top: 2*@gap;
             margin-bottom: 0.5*@gap;
             font-size: @fontsize_small * .95;
             &:first-child{
-                margin-bottom: 1.5*@gap;
+                margin-top: 0;
+                margin-bottom: 1*@gap;
             }
             .title {
                 left: 0;
@@ -253,15 +255,16 @@
             .browse,
             .tags {
                 font-size: @fontsize_small * .95;
+                line-height: 24px;
                 color: fade(@theme_text_main, 70%);
                 display: inline-block;
                 background: fade(@theme_bg_quote, 10%);
-                margin-right: 4px;
-                margin-bottom: 8px;
+                margin: 0 4px 8px 0px;
                 padding: 2px 8px 2px 6px;
                 border-radius: 0.5*@border_radius_code_block;
                 border-left: 0.5*@border_radius_code_block solid @theme_bg_quote;
                 a{
+                    color: fade(@theme_text_main, 70%);
                     .enable-trans();
                     &:hover {
                         color: @theme_text_highlight;
@@ -272,8 +275,9 @@
                     }
                 }
                 .categories {
-                    font-weight: bold;
-                    color: @theme_text_link;
+                    // font-weight: bold;
+                    color: fade(@theme_text_main, 50%);
+                    // color: @theme_text_link;
                 }
                 .tag{
                     color: fade(@theme_text_main, 70%);

From 76019efac447727e074a56c4140ba7b1b055d4d3 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Thu, 8 Nov 2018 11:28:35 +0800
Subject: [PATCH 12/19] header

---
 source/js/search.js      | 82 ++++++++++++++++++++--------------------
 source/less/_header.less |  4 +-
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/source/js/search.js b/source/js/search.js
index 72b1f60..5486a62 100755
--- a/source/js/search.js
+++ b/source/js/search.js
@@ -8,7 +8,7 @@ var SearchService = "";
    */
   SearchService = function(options) {
     var self = this;
-    
+
     self.config = $.extend({
       per_page: 10,
       selectors: {
@@ -70,7 +70,7 @@ var SearchService = "";
       self.dom.modal_ajax_content.removeClass('loaded');
       self.startLoading();
     };
-    
+
     self.afterQuery = function() {
       self.dom.modal_body.scrollTop(0);
       self.dom.modal_ajax_content.addClass('loaded');
@@ -109,19 +109,19 @@ var SearchService = "";
       self.dom.modal_error.html(errMsg);
       self.dom.modal_error.show();
     };
-    
+
     self.nextPage = function() {
       if (self.nav.next !== -1) {
         self.search(self.nav.next);
       }
     };
-    
+
     self.prevPage = function() {
       if (self.nav.prev !== -1) {
         self.search(self.nav.prev);
       }
     };
-    
+
     /**
      * Generate html for one result
      * @param url : (string) url
@@ -134,12 +134,12 @@ var SearchService = "";
       html +=   "<a class='result' href='" +url+ "'>";
       html +=     "<span class='title'>" +title+ "</span>";
       html +=     "<span class='digest'>" +digest+ "</span>";
-      html +=     "<span class='icon icon-chevron-thin-right'></span>";
+      html +=     "<span class='fas fa-chevron-thin-right'></span>";
       html +=   "</a>";
       html += "</li>";
       return html;
     };
-    
+
     /**
      * Close the modal, resume body scrolling
      * no param
@@ -149,7 +149,7 @@ var SearchService = "";
       self.dom.container.fadeOut();
       self.dom.body.removeClass('modal-active');
     };
-    
+
     /**
      * Searchform submit event handler
      * @param queryText : (string) the query text
@@ -161,19 +161,19 @@ var SearchService = "";
         self.search(1);
       }
     };
-    
+
     /**
      * Start loading bar animation
      * no param
      */
     self.startLoading = function() {
       self.dom.modal_loading_bar.show();
-      self.loadingTimer = setInterval(function() { 
+      self.loadingTimer = setInterval(function() {
         self.percentLoaded = Math.min(self.percentLoaded+5,95);
         self.dom.modal_loading_bar.css('width', self.percentLoaded+'%');
       }, 100);
     };
-    
+
     /**
      * Stop loading bar animation
      * no param
@@ -212,7 +212,7 @@ var SearchService = "";
       self.dom.btn_prev.off('click');
       self.dom.container.remove();
     };
-    
+
     /**
      * Load template and register event handlers
      * no param
@@ -233,7 +233,7 @@ var SearchService = "";
     self.init();
   };
 
-  var template = '<div id="u-search"><div class="modal"> <header class="modal-header" class="clearfix"><form id="u-search-modal-form" class="u-search-form" name="uSearchModalForm"> <input type="text" id="u-search-modal-input" class="u-search-input" /> <button type="submit" id="u-search-modal-btn-submit" class="u-search-btn-submit"> <span class="icon icon-search"></span> </button></form> <a class="btn-close"> <span class="icon icon-close"></span> </a><div class="modal-loading"><div class="modal-loading-bar"></div></div> </header> <main class="modal-body"><ul class="modal-results modal-ajax-content"></ul> </main> <footer class="modal-footer clearfix"><div class="modal-metadata modal-ajax-content"> <strong class="range"></strong> of <strong class="total"></strong></div><div class="modal-error"></div> <div class="logo"></div> <a class="nav btn-next modal-ajax-content"> <span class="text">NEXT</span> <span class="icon icon-chevron-right"></span> </a> <a class="nav btn-prev modal-ajax-content"> <span class="icon icon-chevron-left"></span> <span class="text">PREV</span> </a> </footer></div><div class="modal-overlay"></div></div>';
+  var template = '<div id="u-search"><div class="modal"> <header class="modal-header" class="clearfix"><form id="u-search-modal-form" class="u-search-form" name="uSearchModalForm"> <input type="text" id="u-search-modal-input" class="u-search-input" /> <button type="submit" id="u-search-modal-btn-submit" class="u-search-btn-submit"> <span class="fas fa-search"></span> </button></form> <a class="btn-close"> <span class="fas fa-times"></span> </a><div class="modal-loading"><div class="modal-loading-bar"></div></div> </header> <main class="modal-body"><ul class="modal-results modal-ajax-content"></ul> </main> <footer class="modal-footer clearfix"><div class="modal-metadata modal-ajax-content"> <strong class="range"></strong> of <strong class="total"></strong></div><div class="modal-error"></div> <div class="logo"></div> <a class="nav btn-next modal-ajax-content"> <span class="text">NEXT</span> <span class="fas fa-chevron-right"></span> </a> <a class="nav btn-prev modal-ajax-content"> <span class="fas fa-chevron-left"></span> <span class="text">PREV</span> </a> </footer></div><div class="modal-overlay"></div></div>';
 })(jQuery);
 
 var AlgoliaSearch;
@@ -250,7 +250,7 @@ var AlgoliaSearch;
     var self = this;
     var endpoint = "https://" +self.config.appId+ "-dsn.algolia.net/1/indexes/" +self.config.indexName;
     self.addLogo('algolia');
-    
+
     /**
      * Generate result list html
      * @param data : (array) result items
@@ -268,7 +268,7 @@ var AlgoliaSearch;
       });
       return html;
     };
-    
+
     /**
      * Generate metadata after a successful query
      * @param data : (object) the raw search response data
@@ -303,7 +303,7 @@ var AlgoliaSearch;
         self.dom.btn_prev.hide();
       }
     };
-    
+
     /**
      * Send a GET request
      * @param queryText : (string) the query text
@@ -319,7 +319,7 @@ var AlgoliaSearch;
         "x-algolia-api-key": self.config.apiKey
       }, function(data, status) {
         if (status === 'success' && data.hits && data.hits.length > 0) {
-          var results = self.buildResultList(data.hits); 
+          var results = self.buildResultList(data.hits);
           self.dom.modal_results.html(results);
         }
         else {
@@ -331,7 +331,7 @@ var AlgoliaSearch;
         }
       });
     };
-    
+
     return self;
   };
 
@@ -351,7 +351,7 @@ var AzureSearch;
     var endpoint = "https://" +self.config.serviceName+ ".search.windows.net/indexes/" +self.config.indexName+ "/docs?api-version=2015-02-28";
     self.nav.current = 1;
     self.addLogo('azure');
-    
+
     /**
      * Generate result list html
      * @param data : (array) result items
@@ -369,7 +369,7 @@ var AzureSearch;
       });
       return html;
     };
-    
+
     /**
      * Generate metadata after a successful query
      * @param data : (object) the raw response data
@@ -405,7 +405,7 @@ var AzureSearch;
         self.dom.btn_prev.hide();
       }
     };
-    
+
     /**
      * Send a GET request
      * @param queryText : (string) the query text
@@ -476,7 +476,7 @@ var BaiduSearch;
       });
       return html;
     };
-    
+
     /**
      * Generate metadata after a successful query
      * @param data : (object) the raw google custom search response data
@@ -537,7 +537,7 @@ var BaiduSearch;
     };
 
     self.loadScript();
-    
+
     return self;
   };
 
@@ -546,7 +546,7 @@ var GoogleCustomSearch = "";
 
 (function($) {
   'use strict';
-  
+
   /**
    * Search by Google Custom Search Engine JSON API
    * @param options : (object)
@@ -571,7 +571,7 @@ var GoogleCustomSearch = "";
       });
       return html;
     };
-    
+
     /**
      * Generate metadata after a successful query
      * @param data : (object) the raw google custom search response data
@@ -605,7 +605,7 @@ var GoogleCustomSearch = "";
         self.dom.btn_prev.hide();
       }
     };
-    
+
     /**
      * Send a GET request
      * @param queryText : (string) the query text
@@ -621,8 +621,8 @@ var GoogleCustomSearch = "";
         num: self.config.per_page
       }, function(data, status) {
         if (status === 'success' && data.items && data.items.length > 0) {
-          var results = self.buildResultList(data.items); 
-          self.dom.modal_results.html(results);       
+          var results = self.buildResultList(data.items);
+          self.dom.modal_results.html(results);
         }
         else {
           self.onQueryError(queryText, status);
@@ -633,7 +633,7 @@ var GoogleCustomSearch = "";
         }
       });
     };
-    
+
     return self;
   };
 })(jQuery);
@@ -641,7 +641,7 @@ var HexoSearch;
 
 (function($) {
   'use strict';
-  
+
   /**
   * Search by Hexo generator json content
   * @param options : (object)
@@ -652,7 +652,7 @@ var HexoSearch;
     self.config.endpoint = ROOT + ((options||{}).endpoint || "content.json");
     self.config.endpoint = self.config.endpoint.replace("//","/"); //make sure the url is correct
     self.cache = "";
-    
+
     /**
      * Search queryText in title and content of a post
      * Credit to: http://hahack.com/codes/local-search-engine-for-hexo/
@@ -705,7 +705,7 @@ var HexoSearch;
       }
       return foundMatch;
     };
-    
+
     /**
      * Generate result list html
      * @param data : (array) result items
@@ -719,7 +719,7 @@ var HexoSearch;
       });
       return html;
     };
-    
+
     /**
      * Generate metadata after a successful query
      * @param data : (object) the raw google custom search response data
@@ -727,7 +727,7 @@ var HexoSearch;
     self.buildMetadata = function(data) {
       self.dom.modal_footer.hide();
     };
-    
+
     /**
      * Send a GET request
      * @param queryText : (string) the query text
@@ -743,16 +743,16 @@ var HexoSearch;
           start: startIndex,
           num: self.config.per_page
         }, function(data, status) {
-          if (status !== 'success' || 
-              !data || 
-              (!data.posts && !data.pages) || 
+          if (status !== 'success' ||
+              !data ||
+              (!data.posts && !data.pages) ||
               (data.posts.length < 1 && data.pages.length < 1)
             ) {
             self.onQueryError(queryText, status);
           }
           else {
             self.cache = data;
-            var results = ""; 
+            var results = "";
             results += self.buildResultList(data.pages, queryText);
             results += self.buildResultList(data.posts, queryText);
             self.dom.modal_results.html(results);
@@ -764,7 +764,7 @@ var HexoSearch;
         });
       }
       else {
-        var results = ""; 
+        var results = "";
         results += self.buildResultList(self.cache.pages, queryText);
         results += self.buildResultList(self.cache.posts, queryText);
         self.dom.modal_results.html(results);
@@ -774,8 +774,8 @@ var HexoSearch;
         }
       }
     };
-    
+
     return self;
   };
 
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/source/less/_header.less b/source/less/_header.less
index 94e1d22..166e8f8 100755
--- a/source/less/_header.less
+++ b/source/less/_header.less
@@ -228,14 +228,14 @@
     position: fixed;
     top: @height_navbar + 2*@gap;
     right: 0;
-    width: 100% - 0.5*@gap;
+    width: ~"calc(100% - 2*@{gap})";
     z-index:9999 + 1;
     line-height: 2 * @gap;
     background: white;
     border-right: 0;
     box-shadow: @boxshadow_card_raised;
     border-radius: @border_radius;
-    transform: translate3d(100%, -0, 0);
+    transform: translate3d(~"calc(100% + 2*@{gap})", -0, 0);
     .enable-trans();
     &:hover {
         box-shadow: @boxshadow_card_raised;

From 81c6b81cbb6eeb9199f3afcd4d4b33a1a9f330ed Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Thu, 8 Nov 2018 11:35:26 +0800
Subject: [PATCH 13/19] fix bug of search

---
 source/js/app.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/js/app.js b/source/js/app.js
index 7106e7e..bfa0416 100755
--- a/source/js/app.js
+++ b/source/js/app.js
@@ -9,6 +9,11 @@ var customSearch;
 		const $elem = elem.href ? $(elem.getAttribute('href')) : $(elem);
 		$('html, body').animate({ 'scrollTop': $elem.offset().top - correction }, 400);
 	};
+  document.onkeydown = function() {
+    if (event.keyCode == 9) {
+      return false;
+    }
+  }
 
 	function setHeader() {
 		if (!window.subData) return;

From 4a8b7f83f84da3f97719ea676591ff434f6667e7 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Thu, 8 Nov 2018 14:23:06 +0800
Subject: [PATCH 14/19] read more button

---
 layout/_partial/post.ejs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/layout/_partial/post.ejs b/layout/_partial/post.ejs
index b94c8e5..a502def 100755
--- a/layout/_partial/post.ejs
+++ b/layout/_partial/post.ejs
@@ -19,7 +19,10 @@
         <%- post.excerpt || post.content %>
         <% if (post.excerpt) { %>
             <div class="readmore">
-                <a href="<%- url_for(post.path) %>" class="flat-box">READ MORE</a>
+                <a href="<%- url_for(post.path) %>" class="flat-box">
+                    <i class="fas fa-book-open fa-fw" aria-hidden="true"></i>
+                    阅读全文
+                </a>
             </div>
         <% } %>
 

From b0c05dd36d5b60c0afeb212dce20a0a3b0c010e4 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Thu, 8 Nov 2018 14:39:11 +0800
Subject: [PATCH 15/19] valine name

---
 source/less/_main.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/less/_main.less b/source/less/_main.less
index bf7e0e7..21e0b94 100755
--- a/source/less/_main.less
+++ b/source/less/_main.less
@@ -93,7 +93,8 @@
                 }
                 a{
                     &.vnick{
-                        color: @color_vue;
+                        color: #ff9800;
+                        font-weight: bold;
                         &:hover {
                             color: @theme_text_highlight;
                             text-decoration: underline;

From 86bbdc94f8428ec90de3871d6e656d0af97e2ae3 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Fri, 9 Nov 2018 20:19:50 +0800
Subject: [PATCH 16/19] update

---
 source/less/_defines.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/less/_defines.less b/source/less/_defines.less
index 459fb74..3919eec 100755
--- a/source/less/_defines.less
+++ b/source/less/_defines.less
@@ -145,9 +145,9 @@
 // 卡片标题栏背景
 @theme_bg_card_header: @theme_bg_navbar;
 // 代码的背景色
-@theme_bg_code: fade(@color_mac_minimize, 10%);
+@theme_bg_code: fade(@color_ax_blue, 10%);
 // 代码块的背景色
-@theme_bg_code_block: fade(@color_mac_minimize, 10%);
+@theme_bg_code_block: fade(@color_ax_blue, 10%);
 // 引用的颜色以及分类、归档的 hover 时颜色
 @theme_bg_quote: @theme_base_tint;
 // 文字颜色 ----------------

From efa8407db934c446b019c3df34de8ee2803db3c6 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Fri, 9 Nov 2018 20:21:16 +0800
Subject: [PATCH 17/19] update

---
 layout/_partial/scripts.ejs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layout/_partial/scripts.ejs b/layout/_partial/scripts.ejs
index da18031..92d3c28 100755
--- a/layout/_partial/scripts.ejs
+++ b/layout/_partial/scripts.ejs
@@ -73,7 +73,8 @@
                 placeholder: "<%= config.valine.placeholder %>",
                 pageSize:'<%= config.valine.pageSize %>',
                 avatar:'<%= config.valine.avatar %>',
-                lang:'<%= config.valine.lang %>'
+                lang:'<%= config.valine.lang %>',
+                highlight:'<%= config.valine.highlight %>'
             })
             </script>
         <% } %>

From bd265c940d4f36ae7fceb487cbd5c8a77d4cc8e5 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Mon, 12 Nov 2018 10:26:49 +0800
Subject: [PATCH 18/19] google fonts

---
 _config.yml               | 3 +++
 layout/_partial/head.ejs  | 6 +++++-
 source/less/_defines.less | 5 +++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/_config.yml b/_config.yml
index 393421e..0be0715 100755
--- a/_config.yml
+++ b/_config.yml
@@ -1,4 +1,7 @@
 # >> 主题配置 ---------------------------------------------------------------------
+# 字体 在这里选好你需要的字体：https://fonts.google.com，然后在_defines.less中修改font_family。
+google_fonts: 'Ubuntu|Ubuntu+Mono'
+
 # 导航栏
 nav_menu:
   - name: 主页
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
index c766501..a9fba3a 100755
--- a/layout/_partial/head.ejs
+++ b/layout/_partial/head.ejs
@@ -26,7 +26,11 @@
 
   <link rel="shortcut icon" href="<%= config.shortcut_icon %>" />
   <link rel="icon" href="<%= config.favicon %>" />
-  <link href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet">
+  <% if (config.google_fonts){ %>
+    <link href="https://fonts.googleapis.com/css?family=<%= config.google_fonts %>" rel="stylesheet">
+  <% } else { %>
+    <link href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet">
+  <% } %>
   <!-- <link href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> -->
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
   <link href='//cdn.bootcss.com/node-waves/0.7.5/waves.min.css' rel='stylesheet'>
diff --git a/source/less/_defines.less b/source/less/_defines.less
index 3919eec..09dcc50 100755
--- a/source/less/_defines.less
+++ b/source/less/_defines.less
@@ -55,9 +55,10 @@
 
 // start: 字体 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // 大部分文字字体
-@fontfamily_base: 'Ubuntu', Menlo, Monaco, Helvetica, "Hiragino Sans GB", "Hiragino Sans GB W3", Source Han Sans CN Regular, WenQuanYi Micro Hei, "Microsoft YaHei", Arial, sans-serif;
+@fontfamily_base: 'Ubuntu', "Source Sans Pro", "Helvetica Neue", Helvetica, "Hiragino Sans GB", "Hiragino Sans GB W3", Menlo, Monaco, Source Han Sans CN Regular, WenQuanYi Micro Hei, "Microsoft YaHei", Arial, sans-serif;
 // 代码字体
-@fontfamily_code: Menlo, Monaco, "Lucida Console", monospace, "Microsoft YaHei", Helvetica, Arial, sans-serif;
+// mac自带Menlo字体，windows用户需要在config中添加以下字段来加载在线字体：google_fonts: 'Ubuntu|Ubuntu+Mono'
+@fontfamily_code: Menlo, 'Ubuntu Mono', Monaco, "Lucida Console", 'Source Code Pro', "Microsoft YaHei", Helvetica, Arial, sans-serif, 'Ubuntu', monospace;
 // LOGO字体
 @fontfamily_logo: @fontfamily_base;
 // end: 字体 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

From 2fa0554eddc62c6a503dc25a83c5b83fb5cce2e7 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Mon, 12 Nov 2018 23:43:43 +0800
Subject: [PATCH 19/19] update

---
 layout/_partial/side.ejs      |  6 +--
 layout/_widget/author.ejs     |  7 +--
 layout/_widget/categories.ejs |  4 +-
 layout/_widget/links.ejs      | 11 ++--
 layout/_widget/music.ejs      |  5 +-
 layout/_widget/tagcloud.ejs   |  4 +-
 layout/_widget/toc.ejs        |  5 +-
 source/less/_main.less        |  4 +-
 source/less/_toc.less         | 51 +++++++++++-------
 source/less/_widget.less      | 98 ++++++++++++++++++++---------------
 10 files changed, 114 insertions(+), 81 deletions(-)

diff --git a/layout/_partial/side.ejs b/layout/_partial/side.ejs
index 64a39f7..21c00c4 100755
--- a/layout/_partial/side.ejs
+++ b/layout/_partial/side.ejs
@@ -8,13 +8,13 @@
     <% if (config.widgets.tagcloud){ %>
         <%- partial('../_widget/tagcloud') %>
     <% } %>
+    <% if (config.widgets.toc){ %>
+        <%- partial('../_widget/toc') %>
+    <% } %>
     <% if (config.widgets.musicid){ %>
         <%- partial('../_widget/music') %>
     <% } %>
     <% if (config.widgets.links){ %>
         <%- partial('../_widget/links') %>
     <% } %>
-    <% if (config.widgets.toc){ %>
-        <%- partial('../_widget/toc') %>
-    <% } %>
 <% } %>
diff --git a/layout/_widget/author.ejs b/layout/_widget/author.ejs
index 38015f1..6c7b43a 100755
--- a/layout/_widget/author.ejs
+++ b/layout/_widget/author.ejs
@@ -2,7 +2,7 @@
     <section class='m_widget author'>
         <% if(config.widgets.author.avatar || config.avatar) { %>
             <div class='header'>
-                <img class='avatar' src='<%= url_for(config.widgets.author.avatar || config.avatar) %>' />
+                <img class='avatar' src='<%= url_for(config.widgets.author.avatar || config.avatar) %>'/>
             </div>
         <%} %>
         <% if (config.widgets.author.title || config.widgets.author.motto){ %>
@@ -11,10 +11,7 @@
                     <h2><%= config.widgets.author.title %></h2>
                 <% } %>
                 <% if (config.widgets.author.motto){ %>
-                    <div>
-                        <i class="fas fa-quote-left fa-3x fa-pull-left" aria-hidden="true"></i>
-                        <%= config.widgets.author.motto %>
-                    </div>
+                    <p><%= config.widgets.author.motto %></p>
                 <% } %>
             </div>
         <% } %>
diff --git a/layout/_widget/categories.ejs b/layout/_widget/categories.ejs
index aa8355d..1b11fe0 100755
--- a/layout/_widget/categories.ejs
+++ b/layout/_widget/categories.ejs
@@ -1,5 +1,7 @@
 <section class='m_widget categories'>
-    <div class='header'><i class="fas fa-folder-open fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;分类</div>
+    <header class='header'>
+        <div><i class="fas fa-folder-open fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;分类</div>
+    </header>
     <div class='content'>
         <% if (site.categories.length){ %>
             <ul class="entry">
diff --git a/layout/_widget/links.ejs b/layout/_widget/links.ejs
index 4ea4a3c..bc94ba6 100755
--- a/layout/_widget/links.ejs
+++ b/layout/_widget/links.ejs
@@ -1,9 +1,10 @@
 <section class='m_widget links'>
-    <div class='header'><div><i class="fas fa-handshake fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;友链</div>
-    <% if(config.email) { %>
-        <a class="addlink" title="联系博主添加友链" target="_blank" rel="external nofollow noopener noreferrer" href="mailto:<%= config.email %>?subject=交换友链&body=你好，我想和你交换友链，我已经将【<%= config.title %>】添加到我的博客的友链中。我的博客链接是："><i class="fas fa-plus fa-fw"></i></a>
-    <%} %>
-    </div>
+    <header class='header'>
+        <div><i class="fas fa-handshake fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;友链</div>
+        <% if(config.email) { %>
+            <a class="rightBtn" title="联系博主添加友链" target="_blank" rel="external nofollow noopener noreferrer" href="mailto:<%= config.email %>?subject=交换友链&body=你好，我想和你交换友链，我已经将【<%= config.title %>】添加到我的博客的友链中。我的博客链接是："><i class="fas fa-plus fa-fw"></i></a>
+        <%} %>
+    </header>
     <div class='content'>
         <ul class="entry" id="links">
             <% (config.widgets.links||[]).forEach(function(item){ %>
diff --git a/layout/_widget/music.ejs b/layout/_widget/music.ejs
index dcb9dbd..730dd34 100755
--- a/layout/_widget/music.ejs
+++ b/layout/_widget/music.ejs
@@ -1,5 +1,8 @@
 <section class='m_widget music'>
-    <div class='header'><i class="fas fa-headphones-alt fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;音乐</div>
+    <header class='header'>
+        <div><i class="fas fa-headphones-alt fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;音乐</div>
+        <a class="rightBtn" title="打开博主的网易云音乐主页" target="_blank" rel="external nofollow noopener noreferrer" href="https://music.163.com/#/playlist?id=<%= config.widgets.musicid %>"><i class="fas fa-external-link-square-alt fa-fw"></i></a>
+    </header>
     <div class='content'>
         <iframe frameborder="no" border="0" marginwidth="0" marginheight="0" width=100% height=450 src="//music.163.com/outchain/player?type=0&id=<%= config.widgets.musicid %>&auto=0&height=450"></iframe>
     </div>
diff --git a/layout/_widget/tagcloud.ejs b/layout/_widget/tagcloud.ejs
index 4cfbb17..b941c33 100755
--- a/layout/_widget/tagcloud.ejs
+++ b/layout/_widget/tagcloud.ejs
@@ -1,6 +1,8 @@
 <% if (site.tags.length){ %>
     <section class='m_widget tagcloud'>
-        <div class="header"><i class="fas fa-tags fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;标签</div>
+        <header class="header">
+            <div><i class="fas fa-tags fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;标签</div>
+        </header>
         <div class='content'>
             <%- tagcloud(site.tags, {
                 min_font: 14,
diff --git a/layout/_widget/toc.ejs b/layout/_widget/toc.ejs
index 2a9fcc1..f8d4b2e 100755
--- a/layout/_widget/toc.ejs
+++ b/layout/_widget/toc.ejs
@@ -1,6 +1,9 @@
 <% if(page.content && page.toc!==false && toc(page.content).length > 0){ %>
     <section class='m_widget toc-wrapper'>
-        <div class="header"><i class="fas fa-list fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;目录</div>
+        <header class="header">
+            <div><i class="fas fa-list fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;目录</div>
+            <div class='wrapper'><a class="s-toc rightBtn" title="固定到顶部" target="_blank" rel="external nofollow noopener noreferrer" href="javascript:void(0)"><i class="fas fa-thumbtack fa-fw"></i></a></div>
+        </header>
         <div class='content'>
             <%- toc(page.content, {list_number: false}) %>
         </div>
diff --git a/source/less/_main.less b/source/less/_main.less
index 21e0b94..5cf4015 100755
--- a/source/less/_main.less
+++ b/source/less/_main.less
@@ -276,8 +276,8 @@
                     }
                 }
                 .categories {
-                    // font-weight: bold;
-                    color: fade(@theme_text_main, 50%);
+                    font-weight: normal;
+                    color: fade(@theme_text_main, 70%);
                     // color: @theme_text_link;
                 }
                 .tag{
diff --git a/source/less/_toc.less b/source/less/_toc.less
index 394beef..d8090c9 100755
--- a/source/less/_toc.less
+++ b/source/less/_toc.less
@@ -1,25 +1,50 @@
 .m_widget.toc-wrapper{
+    z-index: 1;
     overflow: auto;
     border-radius: @border_radius;
     position: sticky;
     top: @height_navbar + 1*@gap;
+    // bottom: @gap;
+    // max-height: ~"calc(100% - 2 * @{gap} - @{height_navbar})";
+    // max-height: 600px;
     .enable-trans();
+    .header{
+        position: sticky;
+        width: 100%;
+        top: 0;
+    }
     .content{
         padding: @gap/2 0;
+        padding-top: 0; // 适合白色导航栏背景
+        a {
+            border-left: 4px solid transparent;
+            &:hover{
+                color: fade(@theme_text_main, 100%);
+                border-left: 4px solid @theme_bg_quote;
+            }
+            &:active{
+                border-left: 8px solid @theme_bg_quote;
+            }
+            &.active{
+                color: fade(@theme_text_main, 100%);
+                border-left: 4px solid @theme_bg_quote;
+                background: fade(@theme_bg_quote, 10%);
+            }
+        }
     }
     &.active{
         position: fixed;
         box-shadow: @boxshadow_card_raised;
+        .header{
+            .s-toc{
+              display: none;
+            }
+        }
     }
 
-    .header{
-        position: sticky;
-        width: 100%;
-        top: 0;
-    }
     @media(max-width: @on_phone){
         position: fixed;
-        width: 100% - 0.5 * @gap;
+        width: ~"calc(100% - 2 * @{gap})";
         top: @height_navbar + @gap;
         left: @gap;
         box-shadow: @boxshadow_card_raised;
@@ -35,20 +60,6 @@
         color: fade(@theme_text_main, 60%);
         font-size: @fontsize_small;
         display: inline-block;
-        border-left: 4px solid transparent;
-        &:hover{
-            color: fade(@theme_text_main, 100%);
-            border-left: 4px solid @theme_bg_quote;
-        }
-        &:active{
-            border-left: 8px solid @theme_bg_quote;
-        }
-        &.active{
-            color: fade(@theme_text_main, 100%);
-            border-left: 4px solid @theme_bg_quote;
-            background: fade(@theme_bg_quote, 10%);
-        }
-
     }
     ol{
         .toc-item.toc-level-1 {
diff --git a/source/less/_widget.less b/source/less/_widget.less
index 04ae810..01bf816 100755
--- a/source/less/_widget.less
+++ b/source/less/_widget.less
@@ -1,4 +1,5 @@
 .m_widget{
+    z-index: 0;
     &:extend(.z-depth-main);
     background: @theme_bg_card;
     margin-top: @gap;
@@ -27,6 +28,8 @@
     width: @width_sidebar;
     max-height: ~"calc(100% - @{height_navbar} - 4 * @{gap})";
     .header{
+        display: flex;
+        justify-content: space-between;
         border-top-left-radius: @border_radius;
         border-top-right-radius: @border_radius;
         @media(max-width: @on_phone) {
@@ -36,44 +39,51 @@
         color: @theme_text_in_header;
         font-weight: bold;
         line-height: 1.5em;
-        // padding: 8px @gap; // 适合深色导航栏背景
-        padding: 14px @gap 2px @gap; // 适合白色导航栏背景
-      	// letter-spacing: .08em;
-
+        padding: 8px @gap;
+        padding-top: 14px; // 适合白色导航栏背景
+        padding-bottom: 14px; // 适合白色导航栏背景
+        .rightBtn{
+          color: @theme_text_in_header;
+          &:hover {
+              color: darken(@theme_text_highlight, 25%);
+          }
+        }
     }
     .content{
         text-align: justify;
         padding: @gap/2;
-        max-height: ~"calc(100% - @{height_navbar} - 2.5 * @{gap})";
+        // padding-top: 0; // 适合白色导航栏背景
+        max-height: ~"calc(100% - @{height_navbar} - 12.5 * @{gap})";
+        ul.entry > li > a{
+           padding: 0 @gap;
+           line-height:@height_cell;
+           height: @height_cell;
+           display: flex;
+           justify-content: space-between;
+           align-content: center;
+           border-left: 2px solid transparent;
+           .enable-trans();
+           .name{
+               flex:auto;
+               &:extend(.txt-ellipsis);
+               color: fade(@theme_text_main,70%);
+           }
+           .badge{
+               flex:none;
+               font-size: @fontsize_small;
+               color: fade(@theme_text_main, 50%);
+           }
+           &:hover{
+               border-left: 4px solid @theme_bg_quote;
+               background: fade(@theme_bg_quote, 10%);
+           }
+           &:active{
+               border-left: 8px solid @theme_bg_quote;
+           }
+       }
     }
 
-     ul.entry > li > a{
-        padding: 0 @gap;
-        line-height:@height_cell;
-        height: @height_cell;
-        display: flex;
-        justify-content: space-between;
-        align-content: center;
-        border-left: 2px solid transparent;
-        .enable-trans();
-        .name{
-            flex:auto;
-            &:extend(.txt-ellipsis);
-            color: fade(@theme_text_main,70%);
-        }
-        .badge{
-            flex:none;
-            font-size: @fontsize_small;
-            color: fade(@theme_text_main, 50%);
-        }
-        &:hover{
-            border-left: 4px solid @theme_bg_quote;
-            background: fade(@theme_bg_quote, 10%);
-        }
-        &:active{
-            border-left: 8px solid @theme_bg_quote;
-        }
-    }
+
 }
 .m_widget.author{
     .enable-trans();
@@ -104,8 +114,14 @@
         border-top-right-radius: @border_radius;
     }
     .content{
+      p{
+        font-size: @fontsize_base;
+        text-align: center;
+      }
+        text-align: center;
         font-weight: bold;
         padding-bottom: 0;
+        padding: @gap/2 @gap 0 @gap;
         @media(max-width: @on_phone){
             padding: @gap/2 @gap;
         }
@@ -141,6 +157,7 @@
 .m_widget.categories{
     .content{
         padding: @gap/2 0;
+        padding-top: 0; // 适合白色导航栏背景
     }
 }
 
@@ -148,6 +165,7 @@
     .content{
         text-align: justify;
         padding: @gap/2 @gap;
+        padding-top: 0; // 适合白色导航栏背景
         a{
             display:inline-block;
             .enable-trans(.1s);
@@ -162,26 +180,22 @@
 .m_widget.contacts{
     .content{
         padding: @gap/2 0;
+        padding-top: 0; // 适合白色导航栏背景
     }
 }
 .m_widget.music{
+    .header{
+        padding-bottom: @gap/4; // 适合白色导航栏背景
+    }
     .content{
         padding: @gap/2;
+        padding-top: 0; // 适合白色导航栏背景
     }
 }
 .m_widget.links{
-    .header{
-      display: flex;
-      justify-content: space-between;
-        .addlink{
-          color: @theme_text_in_header;
-          &:hover {
-              color: darken(@theme_text_highlight, 25%);
-          }
-        }
-    }
     .content{
         padding: @gap/2 0;
+        padding-top: 0; // 适合白色导航栏背景
         .name{
           img{
             display: inline;