hexo-theme-solitude 1.13.3 → 2.0.1

package/source/css/_tags/timeline.styl

@@ -63,6 +63,9 @@ div.timenode
     border-radius 8px
     background var(--blockquote-bg)
 
+    p
+      margin 0 !important
+
     p:first-child
       margin-top 0
 

package/source/js/covercolor/local.js

@@ -26,7 +26,7 @@ const calculateColor = img => {
     const data = ctx.getImageData(0, 0, img.width, img.height).data;
     const {r, g, b} = calculateRGB(data);
     let value = rgbToHex(r, g, b);
-    return getContrastYIQ(value) === "light" ? LightenDarkenColor(value, -50) : value;
+    return getContrastYIQ(value) === "light" ? LightenDarkenColor(value, -50) : LightenDarkenColor(value, 20);
 }
 
 function calculateRGB(data) {
@@ -56,9 +56,9 @@ function LightenDarkenColor(col, amt) {
     }
 
     const num = parseInt(col, 16);
-    const r = Math.min(255, Math.max(0, (num >> 16) + amt));
-    const b = Math.min(255, Math.max(0, ((num >> 8) & 0xff) + amt));
-    const g = Math.min(255, Math.max(0, (num & 0xff) + amt));
+    const r = Math.min(255, Math.max(0, (num >> 16) + amt * 2));
+    const b = Math.min(255, Math.max(0, ((num >> 8) & 0xff) + amt * 2));
+    const g = Math.min(255, Math.max(0, (num & 0xff) + amt * 2));
 
     return `${usePound ? "#" : ""}${(g | (b << 8) | (r << 16)).toString(16).padStart(6, "0")}`;
 }
@@ -121,6 +121,12 @@ function setThemeColors(value, r = null, g = null, b = null) {
                     authorInfo[i].style.setProperty('background', 'var(--efu-white-op)');
                     authorInfo[i].style.setProperty('color', 'var(--efu-white)');
                 }
+
+                value = LightenDarkenColor(value, 50);
+                document.documentElement.style.setProperty('--efu-main', value);
+                document.documentElement.style.setProperty('--efu-main-op', value + '23');
+                document.documentElement.style.setProperty('--efu-main-op-deep', value + 'dd');
+                document.documentElement.style.setProperty('--efu-main-none', value + '00');
             }
         }
 

package/source/js/main.js

@@ -198,7 +198,7 @@ const sco = {
     },
     initConsoleState() {
         const consoleHideAside = document.querySelector("#consoleHideAside");
-        consoleHideAside.classList.toggle("on", !document.documentElement.classList.contains("hide-aside"));
+        consoleHideAside.classList.toggle("on", document.documentElement.classList.contains("hide-aside"));
     },
     changeSayHelloText() {
         const greetings = GLOBAL_CONFIG.aside.sayhello2;
@@ -464,9 +464,9 @@ const addHighlight = () => {
     const expandClass = !expand === true ? 'closed' : ''
     const $syntaxHighlight = syntax === 'highlight.js' ? document.querySelectorAll('figure.highlight') : document.querySelectorAll('pre[class*="language-"]')
     if (!(($isShowTool || limit) && $syntaxHighlight.length)) return
-    const copyEle = copy ? `<i class="solitude st-copy-fill copy-button"></i>` : '<i></i>';
-    const expandEle = `<i class="solitude st-arrow-down expand"></i>`;
-    const limitEle = limit ? `<i class="solitude st-show-line"></i>` : '<i></i>';
+    const copyEle = copy ? `<i class="solitude far fa-copy copy-button"></i>` : '<i></i>';
+    const expandEle = `<i class="solitude fas fa-angle-down expand"></i>`;
+    const limitEle = limit ? `<i class="solitude fas fa-angles-down"></i>` : '<i></i>';
     const alertInfo = (ele, text) => utils.snackbarShow(text, false, 2000)
     const copyFn = (e) => {
         const $buttonParent = e.parentNode
@@ -694,7 +694,7 @@ window.refreshFn = () => {
     if (lure) tabs.lureAddListener();
 }
 document.addEventListener('DOMContentLoaded', () => {
-    [addCopyright, sco.initConsoleState, window.refreshFn, asideStatus, () => window.onscroll = percent].forEach(fn => fn());
+    [addCopyright, window.refreshFn, asideStatus, () => window.onscroll = percent, sco.initConsoleState].forEach(fn => fn());
 });
 document.addEventListener('visibilitychange', () => {
     if (document.hidden) {

package/source/js/tw_cn.js

@@ -59,13 +59,11 @@ document.addEventListener('DOMContentLoaded', function () {
             currentEncoding = 1
             targetEncoding = 2
             translateButtonObject.lastChild.textContent = msgToTraditionalChinese
-            translateButtonObject.firstChild.className = 'solitude st-panben-line'
             utils.snackbarShow('你已切换为简体')
         } else if (targetEncoding === 2) {
             currentEncoding = 2
             targetEncoding = 1
             translateButtonObject.lastChild.textContent = msgToSimplifiedChinese
-            translateButtonObject.firstChild.className = 'solitude st-jianben-line'
             utils.snackbarShow('你已切換為繁體')
         }
         utils.saveToLocal.set(targetEncodingCookie, targetEncoding, 2)
@@ -111,7 +109,6 @@ document.addEventListener('DOMContentLoaded', function () {
         if (translateButtonObject) {
             if (currentEncoding !== targetEncoding) {
                 translateButtonObject.lastChild.textContent = targetEncoding === 1 ? msgToSimplifiedChinese : msgToTraditionalChinese
-                translateButtonObject.firstChild.className = targetEncoding === 1 ? 'solitude st-jianben-line' : 'solitude st-panben-line'
                 setLang()
                 setTimeout(translateBody, translateDelay)
             }