From a4fad8842260ccb167dd8416a8824cafd97c58d9 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Wed, 15 Aug 2018 09:48:08 +0800
Subject: [PATCH] update icon & sidebar

---
 _config.yml                                | 18 ++++++++++--------
 layout/_partial/article.ejs                |  2 +-
 layout/_partial/post/recommended_posts.ejs |  2 +-
 layout/_widget/categories.ejs              |  2 +-
 layout/_widget/links.ejs                   |  6 +++---
 layout/_widget/music.ejs                   |  2 +-
 layout/_widget/socials.ejs                 |  4 ++--
 layout/_widget/tagcloud.ejs                |  2 +-
 source/less/_archive.less                  | 10 +++++++---
 source/less/_article.less                  | 15 +++++----------
 10 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/_config.yml b/_config.yml
index 6ab0e59..976c33f 100755
--- a/_config.yml
+++ b/_config.yml
@@ -24,7 +24,8 @@ widgets:
   - categories # 显示分类
   - tagcloud # 显示tags
   # - socials # 显示自己的社交信息
-  # - music # 显示自己的网易云歌单
+  - music # 显示自己的网易云歌单
+  - links # 显示友链
 
 # 右边的联系信息小窗口
 contacts:
@@ -41,6 +42,13 @@ contacts:
 #   badget: "@xaoxuu"
 #   url: https://www.twitter.com/xaoxuu
 
+# 侧边栏的友链
+links:
+- name: Jarvis Wu
+  url: https://changwenwu.github.io
+- name: Justin Yang
+  url: http://lifestyle1.cn/
+
 
 # 页面底部的社交信息
 social:
@@ -60,7 +68,7 @@ social:
 
 # 推荐文章 npm install hexo-recommended-posts --save
 recommended_posts:
-  enabled: true 
+  enabled: true
 
 # Search
 search:
@@ -80,14 +88,8 @@ search:
   # baidu
   baidu_api_id:
 
-# friends link
-links:
-
-
 
 
 # Less
 less:
   compress: true
-
-
diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
index c13344b..ff1aea7 100755
--- a/layout/_partial/article.ejs
+++ b/layout/_partial/article.ejs
@@ -71,7 +71,7 @@
 
             <% if (post.comments) { %>
                 <% if (config.livere_shortname || config.valine){ %>
-                    <h4>评论</h4>
+                    <h4><i class="fa fa-comments" aria-hidden="true"></i>&nbsp;&nbsp;评论</h4>
                 <% } %>
                 <% if (config.livere_shortname){ %>
                     <section id="comments">
diff --git a/layout/_partial/post/recommended_posts.ejs b/layout/_partial/post/recommended_posts.ejs
index 9561fbf..dbd6ff1 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>你可能感兴趣的文章</h4> 
+        <h4><i class="fa fa-bookmark" aria-hidden="true"></i>&nbsp;&nbsp;&nbsp;你可能感兴趣的文章</h4> 
         <ul>
             <% post_list.forEach(function(link) { %>
                 <li><a href="<%= link.permalink %>"><%= link.title %></a></li>
diff --git a/layout/_widget/categories.ejs b/layout/_widget/categories.ejs
index 57c86f2..5a2abfd 100755
--- a/layout/_widget/categories.ejs
+++ b/layout/_widget/categories.ejs
@@ -1,5 +1,5 @@
 <section class='m_widget categories'>
-<div class='header'>分类</div>
+<div class='header'><i class="fa fa-sitemap" 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 e28c5f0..0ed78ee 100755
--- a/layout/_widget/links.ejs
+++ b/layout/_widget/links.ejs
@@ -1,10 +1,10 @@
 <section class='m_widget links'>
-<div class='header'>Links</div>
+<div class='header'><i class="fa fa-link" aria-hidden="true"></i>&nbsp;&nbsp;友链</div>
 <div class='content'>
     <ul class="entry">
     <% (theme.links||[]).forEach(function(item){ %>
-        <li><a class="flat-box" target="_blank" href="<%= url_for(item.url) %>">
-            <div class='name'><%= item.name %></div>
+        <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" aria-hidden="true"></i>&nbsp;&nbsp;<%= item.name %></div>
         </a></li>
     <% }); %>
     </ul>
diff --git a/layout/_widget/music.ejs b/layout/_widget/music.ejs
index a66983c..207840b 100755
--- a/layout/_widget/music.ejs
+++ b/layout/_widget/music.ejs
@@ -1,5 +1,5 @@
 <section class='m_widget music'>
-<div class='header'>音乐</div>
+<div class='header'><i class="fa fa-music" aria-hidden="true"></i>&nbsp;&nbsp;音乐</div>
 <div class='content'>
     <!-- <ul class="entry"> -->
       <iframe frameborder="no" border="0" marginwidth="0" marginheight="0" width=100% height=450 src="//music.163.com/outchain/player?type=0&id=746319661&auto=0&height=450"></iframe>
diff --git a/layout/_widget/socials.ejs b/layout/_widget/socials.ejs
index df62332..381fe02 100755
--- a/layout/_widget/socials.ejs
+++ b/layout/_widget/socials.ejs
@@ -1,9 +1,9 @@
 <section class='m_widget socials'>
-<div class='header'>联系</div>
+<div class='header'><i class="fa fa-id-card" aria-hidden="true"></i>&nbsp;&nbsp;联系</div>
 <div class='content'>
     <ul class="entry">
       <% (theme.contacts||[]).forEach(function(item){ %>
-        <li><a class="flat-box" target="_blank" href="<%= url_for(item.url) %>">
+        <li><a class="flat-box" target="_blank" rel="external nofollow noopener noreferrer" href="<%= url_for(item.url) %>">
           <div class='name'><%= item.name %></div>
           <div class='badget'><%= item.badget %></div>
         </a></li>
diff --git a/layout/_widget/tagcloud.ejs b/layout/_widget/tagcloud.ejs
index 5318418..152df3f 100755
--- a/layout/_widget/tagcloud.ejs
+++ b/layout/_widget/tagcloud.ejs
@@ -1,6 +1,6 @@
 <% if (site.tags.length){ %>
 <div class="m_widget tagcloud">
-    <div class="header">标签</div>
+    <div class="header"><i class="fa fa-tags" aria-hidden="true"></i>&nbsp;&nbsp;标签</div>
     <div class='content'>
         <%- tagcloud(site.tags, {
             min_font: 14,
diff --git a/source/less/_archive.less b/source/less/_archive.less
index eece7ec..ef949f3 100755
--- a/source/less/_archive.less
+++ b/source/less/_archive.less
@@ -4,9 +4,14 @@
         position: relative;
         .archive-year {
             font-size: @base-font-size;
-            margin: 1em 0;
+            margin-top: 4em;
+            margin-bottom: 1em;
+            &:first-child{
+                margin-top: 0em;
+                padding-top: 0;
+            }
             h2 {
-              
+                margin-top: 1em;
             }
             a {
                 color: @text-color;
@@ -26,7 +31,6 @@
                 color: @text-color;
                 flex: none;
                 font-size: @small-font-size;
-                // padding-right: 10px;
                 padding: .5em .5em .5em 3em;
                 @media (max-width: @on-phone) {
                   padding: .5em .5em .5em 0;
diff --git a/source/less/_article.less b/source/less/_article.less
index e0b2324..7d2f960 100755
--- a/source/less/_article.less
+++ b/source/less/_article.less
@@ -95,10 +95,6 @@
         font-weight: normal;
         margin-top: 1.5em;
         margin-bottom: 1em;
-        &:first-child{
-            margin-top: 0;
-            padding-top: 0;
-        }
         &.title {
             left: 0;
             &:before {
@@ -109,13 +105,12 @@
     h1, h2 {
       color: @text-color-theme;
       margin-top: 2em;
-      &:first-child{
-          margin-top: 0;
-          padding-top: 0;
-      }
     }
-    h1, h2, h3 {
-
+    h3, h4, h5, h6 {
+        &:first-child{
+            margin-top: 0;
+            padding-top: 0;
+        }
     }
     h1 {
       font-size: @font-size-h1;