Merge pull request #121 from tuchg/master

add  some custom options & update gitalk and add 2 options

_config.yml

@@ -44,6 +44,9 @@ config:
   menu_highlight: false # 是否开启当前菜单高亮显示
   thumbnail: false # enable posts thumbnail, options: true, false
   excerpt_link: Read More
+  #New
+  isNewTabLinks: false #是否链接打开新标签页
+  autoUnfold: true # 默认展开文章目录
 
 # Pagination
 pagination:
@@ -128,6 +131,9 @@ comment:
     repo:  #必须. GitHub repository.
     ClientID:  #必须. GitHub Application Client ID.
     ClientSecret:  #必须. GitHub Application Client Secret.
+    enableHotKey: true
+    language: zh-CN
+
   valine: # Valine. https://valine.js.org
     appid:  # your leancloud application appid
     appkey:  # your leancloud application appkey
@@ -187,6 +193,7 @@ fb_app_id:
 # profile
 profile:
   enabled: true # Whether to show profile bar
+  articleSelfBlock: false # 关闭文章下方的自我介绍
   avatar: images/avatar.jpg
   gravatar: # Gravatar email address, if you enable Gravatar, your avatar config will be overriden
   author: 昵称

layout/_partial/item-post.ejs

@@ -1,5 +1,5 @@
 <% if (type == 'link'){ %>
-<a href="<%- url_for(post.path) %>" class="collection-item" target="_blank" itemprop="url">
+<a href="<%- url_for(post.path) %>" class="collection-item" <% if (theme.config.isNewTabLinks){ %> target="_blank" <%}%>  itemprop="url">
   <time datetime="<%= date_xml(post.date) %>" itemprop="datePublished"><%= date(post.date) %></time>
   <span>&nbsp;&nbsp;&nbsp;</span> <%= post.title %>
 </a>
@@ -25,7 +25,7 @@
    <% } %>
 </article>
 <% } else { %>
-<a href="<%- url_for(post.path) %>" class="collection-item" target="_blank" itemprop="url">
+<a href="<%- url_for(post.path) %>" class="collection-item" <% if (theme.config.isNewTabLinks){ %> target="_blank" <%}%>  itemprop="url">
   <time datetime="<%= date_xml(post.date) %>" itemprop="datePublished"><%= date(post.date) %></time>
   <span>&nbsp;&nbsp;&nbsp;</span> <%= post.title %>
 </a>

layout/_partial/post/nav.ejs

@@ -14,8 +14,7 @@
     <% } %>
     <% if (!index && theme.config.toc && post.toc) { %>
     <li class="toggle-toc">
-      <a class="toggle-btn collapsed" data-toggle="collapse" href="#collapseToc" aria-expanded="false" title="<%= __('article.catalogue') %>" role="button">
-        <span>[&nbsp;</span><span><%= __('article.catalogue') %></span>
+      <a class="toggle-btn <% if(!theme.config.autoUnfold){%>  collapsed  <%}%>" data-toggle="collapse" href="#collapseToc" aria-expanded="false" title="<%= __('article.catalogue') %>" role="button">    <span>[&nbsp;</span><span><%= __('article.catalogue') %></span>
         <i class="text-collapsed icon icon-anchor"></i>
         <i class="text-in icon icon-close"></i>
         <span>]</span>

layout/_partial/sidebar-toc.ejs

@@ -1,5 +1,5 @@
 <% if (!index && theme.config.toc && post.toc) { %>
-<aside class="sidebar sidebar-toc collapse" id="collapseToc" itemscope itemtype="http://schema.org/WPSideBar">
+  <aside class="sidebar sidebar-toc collapse <% if(theme.config.autoUnfold){%>  in  <%}%>" id="collapseToc" itemscope itemtype="http://schema.org/WPSideBar">
   <div class="slimContent">
     <nav id="toc" class="article-toc">
       <h3 class="toc-title"><%= __('article.catalogue') %></h3>

layout/_script/_comment/gitalk.ejs

@@ -1,6 +1,6 @@
 <% if (typeof(script) !== 'undefined' && script) { %>
   <!-- <link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css"> -->
-  <script src="//cdn.jsdelivr.net/npm/gitalk@1.4.0/dist/gitalk.min.js"></script>
+  <script src="//cdn.jsdelivr.net/npm/gitalk@1.6.2/dist/gitalk.min.js"></script>
   <script src="//cdn.jsdelivr.net/npm/[email protected]/js/md5.min.js"></script>
   <script type="text/javascript">
   var gitalk = new Gitalk({
@@ -10,8 +10,10 @@
     owner: '<%= theme.comment.gitalk.owner %>',
     admin: ['<%= theme.comment.gitalk.admin %>'],
     id: md5(location.pathname),
-    distractionFreeMode: true
+    distractionFreeMode: true,
+    language: '<%= theme.comment.gitalk.language %>',
+    enableHotKey: '<%= theme.comment.gitalk.enableHotKey %>'
   })
   gitalk.render('comments')
   </script>
-<% } %>
+<% } %>

source/css/style.css

@@ -7895,6 +7895,11 @@ body.okayNav-loaded {
 }
 
 @media (min-width: 992px) {
+
+  .slimContent{
+    margin-top: 20px;
+  }
+
   .container {
     width: 970px;
   }