Merge branch 'release/1.0.2'

CHANGELOG.md

@@ -1,5 +1,12 @@
 #### I decide to make a change log for this project from 2019. Just want remember all of us's coding footprint.
 
+v1.0.2 - May 18, 2021
+
+* optimize code line number width
+* fixed nav menu active background style
+* upgrade tag cloud, see: https://github.com/D0n9X1n/hexo-tag-cloud
+* update 404 default page styles
+
 v1.0.1 - Jua 16, 2021
 
 * optimize source loading time

_config.yml

@@ -54,10 +54,11 @@ cover_description: 一个关注技术与人文的IT博客
 
 # cover sns info
 sns:
-  github: https://github.com/tangkunyin
-  twitter: https://twitter.com/tangkunyin
-  instagram: https://www.instagram.com/mtangsir/
   telegram: https://t.me/kunyintang
+  twitter: https://twitter.com/tangkunyin
+  github: https://github.com/tangkunyin
+  stack-overflow: https://stackoverflow.com/users/6133063/tangkunyin
+
 
 # page pop qrcode
 donateImg: /images/donate-qr.png
@@ -85,7 +86,7 @@ analytics:
 ## Google AdSense.
 adsense:
   auto: true
-  client_id:
+  client_id:  
   page_tb_id:
   archive_id:
   tags_id:
@@ -98,14 +99,14 @@ adsense:
 ##                  | Gitment（Introduction: https://imsun.net/posts/gitment-introduction/）
 ##                  | gitalk  (Official website: https://gitalk.github.io/)
 comments:
-  enable: true
+  enable: false
   disqus_shortname:
   gitalk:
     on: true
     clientID:
     clientSecret:
-    owner: 
-    repo: 
+    owner:
+    repo:
     admin: ['your name']
     perPage: 6
     pagerDirection: 'last'
@@ -124,4 +125,7 @@ mathjax:
    enable: false
 
 ## Baidu ziyuan auto-commit. see https://ziyuan.baidu.com/
-baidu_auto_push: true
+baidu_auto_push: false
+
+## MIIT Info. see https://beian.miit.gov.cn/#/Integrated/index
+miit_license: ## 例：京ICP备xxxxx号

layout/_partial/footer.ejs

@@ -13,6 +13,9 @@
             ，<%= __('theme_by') %>&nbsp&nbsp<a href="https://github.com/tangkunyin/hexo-theme-jsimple" target="_blank" rel="bookmark">JSimple</a>
             ，<%= __('author') %>&nbsp<a href="<%= theme.webmaster.home %>" target="_blank" rel="friend"><%= theme.webmaster.name %></a>
             ，Hosted by <a href="https://pages.github.com/" target="_blank" rel="nofollow">GitHub Pages</a>
+            <% if(theme.miit_license) {  %>
+            ，<a href="https://beian.miit.gov.cn/" target="_blank"><%= theme.miit_license %></a> <img src="/images/gong-an.png" style="width:15px;height:16px">
+            <% } %>
         </p>
     </div>
 </footer>

layout/tags.ejs

@@ -12,12 +12,17 @@
         </div>
         <%- partial('_widget/ads/adSense') %>
         <div class="post-content markdown-body" itemprop="articleBody">
-            <ul class="tag-list">
-                <% site.tags.sort('name').map(function(tag){  %>
-                <li><a href="<%- url_for(tag.path) %>"><%= tag.name %>(<%= tag.length %>)</a></li>
-                <% }) %>
-            </ul>
+            <% if (site.tags.length) { %>
+            <script type="text/javascript" charset="utf-8" src="<%- url_for('/js/tagcloud.js') %>"></script>
+            <script type="text/javascript" charset="utf-8" src="<%- url_for('/js/tagcanvas.js') %>"></script>
+            <div class="widget-wrap">
+                <div id="myCanvasContainer" class="widget tagcloud">
+                <canvas width="250" height="250" id="resCanvas" style="width:100%">
+                    <%- tagcloud() %>
+                </canvas>
+                </div>
+            </div>
+            <% } %>
         </div>
-        <p style="width: 100%; text-align: center"><img src="/images/tags-bg.png" alt="tags-bg"></p>
     </article>
-</div>
+</div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-jsimple",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Simple three column theme for Hexo.Inspired by JianShu.com",
   "license": "MIT",
   "scripts": {

source/404.html

@@ -5,27 +5,6 @@
     <title>404 - Not Found</title>
     <link rel="icon" href="/images/favicon.png">
     <style>
-        * {
-            margin: 0;
-            padding: 0;
-            outline: none;
-            font-family: \5FAE\8F6F\96C5\9ED1, 宋体;
-            -webkit-user-select: none;
-            -moz-user-select: none;
-            -ms-user-select: none;
-            -khtml-user-select: none;
-            user-select: none;
-            cursor: default;
-            font-weight: lighter;
-        }
-
-        .center {
-            margin: 0 auto;
-            color: #fff;
-            font-weight: bolder;
-            font-size: 72px;
-        }
-
         .whole {
             width: 100%;
             height: 100%;
@@ -36,12 +15,10 @@
             z-index: -1000;
             overflow: hidden;
         }
-
         .whole img {
             width: 100%;
             height: 100%;
         }
-
         .mask {
             width: 100%;
             height: 100%;
@@ -52,46 +29,22 @@
             opacity: 0.6;
             filter: alpha(opacity=60);
         }
-
         .b {
-            width: 100%;
-            text-align: center;
-            height: 400px;
-            position: absolute;
-            top: 50%;
-            margin-top: -230px
-        }
-
-        .a {
-            width: 150px;
-            height: 50px;
-            margin-top: 30px
-        }
-
-        .a a {
-            display: block;
-            float: left;
-            width: 150px;
-            height: 50px;
-            background: #fff;
-            text-align: center;
-            line-height: 50px;
-            font-size: 18px;
-            border-radius: 25px;
-            color: #333
+            width: 50%;
+            height: 300px;
+            text-align: left;
+            padding-left: 10%;
+            margin-top:20%;
+            color: #fff;
         }
-
-        .a a:hover {
-            color: #000;
-            box-shadow: #fff 0 0 20px
+        h1 {
+            font-size: 72px;
         }
-
         p {
             color: #fff;
             margin-top: 40px;
             font-size: 24px;
         }
-
         #num {
             margin: 0 5px;
             font-weight: bold;
@@ -104,7 +57,7 @@
             document.getElementById("num").innerHTML = num;
             if (num < 0) {
                 document.getElementById("num").innerHTML = 0;
-                location.href = "https://shuoit.net";
+                location.href = "/";
             }
         }
         setInterval("redirect()", 1000);
@@ -113,14 +66,13 @@
 
 <body onload="redirect();">
 <div class="whole">
-    <img src="/images/404-bg.jpg">
+    <img src="/images/404-bg.png">
     <div class="mask"></div>
 </div>
 <div class="b">
-    <h1 class="center">Ignorance is bliss.</h1>
-    <p><br><br><br><br>
-        return to home page after<span id="num"></span>seconds...
-    </p>
+    <h1>404 !</h1>
+    <h2>Page not found...</h2>
+    <p>Return to home page after<span id="num"></span>seconds</p>
 </div>
 </body>
 </html>

source/css/JSimple.css

@@ -1344,7 +1344,7 @@ body.night-mode,.night-mode .btn,body.night-mode a,.night-mode .nav-user a,#sear
     float:right;
 }
 .markdown-body .highlight .gutter {
-    width: 30px;
+    width: 50px;
 }
 .markdown-body .highlight .code {
     flex: 1;

source/js/lib/SimpleCore.js

@@ -447,7 +447,7 @@ const SimpleCore = {
             $('body').removeClass('single');
         }
         $.each($('.nav-menu a'), function (k, v) {
-            if (v.href == window.location.href) {
+            if (v.href === window.location.href || v.href === window.location.href.replace(/\/$/, '')) {
                 $(v).addClass('current');
             } else {
                 $(v).removeClass('current');