Merge pull request #35 from EvanNotFound/dev

v0.4.5

_config.yml

@@ -194,7 +194,6 @@ comment:
   waline:
     serverUrl:  # Waline server url(vercel) example: https://example.example.com
     lang: zh-CN # Waline language, default: zh-CN. See: https://waline.js.org/guide/client/i18n.html
-    dark: auto # Waline dark mode, default: auto. See: https://waline.js.org/reference/component.html#dark
 
   # Gitalk
   # See: https://github.com/gitalk/gitalk
@@ -211,6 +210,12 @@ comment:
     env_id: # Vercel or Tencent Cloud Function environment ID
     region: # environment region. If select Guangzhou, fill in "ap-guangzhou". (optional)
 
+# ---------------------------------------------------------------------------------------
+# Friend Links page
+# ---------------------------------------------------------------------------------------
+friend_links:
+  columns: 2 # number of columns. 2 or 3
+
 # ---------------------------------------------------------------------------------------
 # RSS
 # Dependencies: hexo-generator-feed
@@ -257,4 +262,4 @@ footer:
 # ---------------------------------------------------------------------------------------
 # Redefine Theme version (Please don't modify)
 # ---------------------------------------------------------------------------------------
-version: 0.4.4
+version: 0.4.5

layout/_partial/comment/waline.ejs

@@ -6,7 +6,6 @@
 ) { %>
  
     <div id="waline"></div>
-    <link rel="stylesheet" href="//evan.beee.top/css/waline.css"/>
     <script <%= theme.pjax.enable === true ? 'data-pjax' : '' %> 
         src="//evan.beee.top/js/waline.js"></script>
     <script <%= theme.pjax.enable === true ? 'data-pjax' : '' %>>
@@ -15,7 +14,7 @@
                 el: '#waline',
                 serverURL: '<%= theme.comment.waline.serverUrl %>',
                 lang: '<%= theme.comment.waline.lang %>',
-                dark: '<%= theme.comment.waline.dark %>',
+                dark: 'body[class~="dark-mode"]',
                 requiredMeta: ['nick','mail'], // cannot customize by theme config, change it yourself
             });
         }

layout/_partial/friends-link.ejs

@@ -1,4 +1,4 @@
-<h1 style="margin: 15px 5px;"><%- __('links') %></h1>
+<h1 style="margin: 10px 5px 30px 5px;"><%- __('links') %></h1>
 <div class="friends-link-container">
     <ul class="friends-link-list">
         <% for (const f of theme.links) { %>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-redefine",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "private": false,
   "description": "\"Redefine\" hexo theme is a simple & fast & pure theme, but with no compromise.",
   "scripts": {

scripts/helpers/export-config.js

@@ -46,6 +46,7 @@ hexo.extend.helper.register('export_config', function () {
     pjax: theme.pjax,
     lazyload: theme.lazyload,
     version: theme.version,
+    friend_links: theme.friend_links,
   }
 
   return `<script id="hexo-configurations">

source/css/common/codeblock/code-block.styl

@@ -40,8 +40,8 @@ disable-user-select() {
 if (hexo-config('code_block.style') == 'mac') {
   .highlight-container[data-rel]{
     background var(--second-background-color)
-    border-radius 14px
-    box-shadow var(--shadow-color-2) 0px 6px 24px 0px, var(--shadow-color-1) 0px 0px 0px 1px
+    border-radius 18px
+    box-shadow var(--redefine-box-shadow)
     padding-top 20px
     margin-top 10px
 

source/css/common/redefine-theme.styl

@@ -1,7 +1,7 @@
 $redefine-container-border-radius = 18px
 
 hover-style(isTransform, scaleX, scaleY) {
-  box-shadow var(--shadow-color-2) 0px 6px 24px 0px, var(--shadow-color-1) 0px 0px 0px 1px
+  box-shadow var(--redefine-box-shadow)
 
   if (isTransform) {
     transition-t("transform", "0", "0.2", "linear")
@@ -13,7 +13,7 @@ hover-style(isTransform, scaleX, scaleY) {
     }
 
     if (hexo-config('style.hover.shadow')) {
-      box-shadow var(--shadow-color-2) 0px 6px 24px 0px, var(--shadow-color-1) 0px 0px 0px 1px, var(--shadow-color-1) 0px 0px 0px 1px inset
+      box-shadow var(--redefine-box-shadow-hover)
     }
   }
 }

source/css/common/variables.styl

@@ -186,6 +186,9 @@ root-color(mode) {
   --note-purple-title-bg : mode == 'light' ? $note-purple-title-bg : $dark-note-purple-title-bg
 
   --first-screen-text-color mode == 'light' ? $first-screen-text-color : $first-screen-text-color-dark
+
+  --redefine-box-shadow : var(--shadow-color-2) 0px 6px 24px 0px, var(--shadow-color-1) 0px 0px 0px 1px
+  --redefine-box-shadow-hover : var(--shadow-color-2) 0px 6px 24px 0px, var(--shadow-color-1) 0px 0px 0px 1px, var(--shadow-color-1) 0px 0px 0px 1px inset
 }
 
 

source/css/layout/_partial/comment/comment.styl

@@ -1,8 +1,6 @@
-//@import "waline-config.styl"
-
 if (hexo-config('comment.enable') == true && hexo-config('comment.use') != "") {
-  if (hexo-config('comment.use') == "valine") {
-    @require "./valine.styl"
+  if (hexo-config('comment.use') == "waline") {
+    @require "./waline.styl"
 
   } else if (hexo-config('comment.use') == "gitalk") {
     @require "./gitalk.styl"