Merge pull request #10 from theme-kaze/devel

🔖  new version: 1.0.5

.github/workflows/release.yml

@@ -22,6 +22,4 @@ jobs:
           npm install
           npm publish
         env:
-          NODE_AUTH_TOKEN: '${{ secrets.npm_token }}'
-
-
+          NODE_AUTH_TOKEN: '${{ secrets.npm_token }}'

_config.yml

@@ -43,6 +43,12 @@ toc:
   showListNumber: false
   maxDepth: 6
   minDepth: 1
+
+copyright:
+  enable: true
+  writer: # if writer is empty we will use config.author as writer
+  declare: 本博客所有文章除特别声明外，均采用<a target="_blank" rel="noopener" href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh">CC BY-NC-SA 4.0 协议</a>。转载请注明出处！
+  style: warning # the style uses note warning | danger | primary | info | success
 #------------------------
 # Footer
 #------------------------

layout/_partial/footer.ejs

@@ -1,8 +1,8 @@
 <footer class="footer">
   <div class="footer-container">
-    <div class="copyright">
-      <div>
-        <span id="copyYear">Copyright ©
+    <div>
+      <div class="footer-dsc">
+        <span>Copyright ©
           <% if(theme.footer.copyYear) { %>
           <%- theme.footer.copyYear %> -
           <% } %>

layout/_partial/nav.ejs

@@ -11,6 +11,6 @@
     <% for(const menu in theme.menus) { %>
     <a href="<%= theme.menus[menu] %>" class="navbar-menu-item"><%- __(menu + '.title') %> </a>
     <% } %>
-    <a class="navbar-menu-item" id="dark"><i class="iconfont icon-weather"></i></a>
+    <a class="navbar-menu-item darknavbar" id="dark"><i class="iconfont icon-weather"></i></a>
   </div>
 </nav>

layout/_partial/scrollbutton.ejs

@@ -6,4 +6,7 @@
 </a>
 <a role="button" id="popbutton" class="basebutton">
   <i class="iconfont icon-expand button-icon"></i>
+</a>
+<a role="button" id="darkbutton" class="basebutton darkwidget">
+  <i class="iconfont icon-weather button-icon"></i>
 </a>

layout/post.ejs

@@ -44,6 +44,15 @@
   <div id="section" class="post-content">
     <%- page.content %>
   </div>
+  <div>
+  <% if(theme.copyright.enable) { %>
+  <div class="post-note note-<%= theme.copyright.style || "warning" %> copyright" style="margin-top: 42px">
+    <p><span style="font-weight: bold;">作者：</span><a target="_blank" rel="nofollow noopener noreferrer" href="<%= config.url + '/about' %>"><%= theme.copyright.writer || theme.author || config.author%></a></p>
+    <p><span style="font-weight: bold;">文章链接：</span><a target="_blank" rel="nofollow noopener noreferrer" href="<%= page.permalink %>"><%= page.permalink %></a></p>
+    <p><span style="font-weight: bold;">版权声明：</span><%- theme.copyright.declare %></p>
+  </div>
+  <% } %>
+  </div>
 </article>
 <%- partial('_partial/pagination',{ 
   prev_label: __("prev_post.title"), next_label:__("next_post.title"),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-kaze",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "hexo-theme-kaze",
   "main": "index.js",
   "scripts": {

source/css/_base/reset.styl

@@ -118,4 +118,7 @@ pre
   background-clip: padding-box
 ::-webkit-scrollbar-thumb
   background-color: $divider-color
-  border-radius: 0.3rem
+  border-radius: 0.3rem
+@media (max-width : 742px)
+  #dark
+    display: none

source/css/_pages/rewrite.styl

@@ -1,7 +1,7 @@
 .comment-card
   .comment-card-title
-    color: $ml-font-color
-    margin-bottom: 12px
+    font-size: $ml-font-size
+    margin-bottom: 16px
 .widget-title
   font-size: $lg-font-size
   font-weight: bold

source/css/_pages/widgets/button.styl

@@ -30,6 +30,13 @@
   right: 32px
   .button-icon
     font-size: $sm-font-size
+#darkbutton
+  display: none
+  opacity: 0
+  bottom: 32px
+  right: 32px
+  .button-icon
+    font-size: $md-font-size
 .postbutton
   cursor: pointer
   background-color: var(--link-color)

source/css/_pages/widgets/footer.styl

@@ -11,11 +11,8 @@
     color: var(--info-text-color)
     display: block
     justify-content: space-between
-    .copyright
-      display: flex
-      justify-content: center
-      margin-bottom: 6px
     .footer-dsc
+      margin-bottom: 6px
       display: flex
       justify-content: center
     a

source/css/_pages/widgets/post.styl

@@ -49,6 +49,14 @@ mjx-container
   border-left-style: solid
   p
     margin-bottom: 0
+.copyright
+  a
+    color: var(--text-color)
+    font-weight: bold
+  p 
+    + p
+      margin-top: 8px
+
 .note-default
   background-color: var(--blockquote-color)
   border-left-color: var(--border-color)

source/js/main.js

@@ -26,7 +26,14 @@ see theme at https://github.com/0x4qE/hexo-theme-Kaze
 `);
 // darkmode.js
 // reverse button
-const darkControlButton = document.getElementById('dark');
+const scrollWidth = document.body.scrollWidth || document.documentElement.scrollWidth;
+let darkControlButton = null;
+if (scrollWidth <= 742) {
+  darkControlButton = document.querySelector('.darkwidget');
+} else {
+  darkControlButton = document.querySelector('.darknavbar');
+}
+
 darkControlButton.addEventListener('click', () => {
   setDarkmode(reverseDarkModeSetting());
 });
@@ -80,6 +87,24 @@ const reversePopButton = () => {
       }, 100);
     }
   }
+  const darkButton = document.querySelector('.darkwidget');
+  if (scrollWidth <= 742) {
+    if (darkButton.style.display === 'flex') {
+      darkButton.style.bottom = '32px';
+      darkButton.style.opacity = '0';
+      darkButton.style.transform = 'none';
+      setTimeout(() => {
+        darkButton.style.display = 'none';
+      }, 100);
+    } else {
+      darkButton.style.display = 'flex';
+      reverseButton.style.transform = 'rotate(90deg)';
+      setTimeout(() => {
+        darkButton.style.bottom = '138px';
+        darkButton.style.opacity = '1';
+      }, 100);
+    }
+  } 
 };
 setTimeout(() => {
   document.getElementById('popbutton').onclick = reversePopButton;