hexo-theme-solitude 1.1.0 → 1.1.3

package/source/css/main.css

@@ -4115,70 +4115,6 @@ blockquote.pullquote.right {
     height: 100%
 }
 
-.hide-block > .hide-button, .hide-inline > .hide-button {
-    display: inline-block;
-    padding: .3rem 1rem;
-    background: #307af6;
-    color: var(--sco-white)
-}
-
-.hide-block > .hide-button.open, .hide-inline > .hide-button.open {
-    display: none
-}
-
-.hide-block > .hide-button.open + div, .hide-inline > .hide-button.open + div {
-    display: block
-}
-
-.hide-block > .hide-button.open + span, .hide-inline > .hide-button.open + span {
-    display: inline
-}
-
-.hide-block > .hide-content, .hide-inline > .hide-content {
-    display: none
-}
-
-.hide-inline > .hide-button {
-    margin: 0 .3rem
-}
-
-.hide-inline > .hide-content {
-    margin: 0 .3rem
-}
-
-.hide-block {
-    margin: 0 0 .8rem
-}
-
-.hide-toggle {
-    margin-bottom: 1rem;
-    border: 1px solid #f0f0f0
-}
-
-.hide-toggle > .hide-button {
-    padding: .3rem .5rem;
-    background: #f0f0f0;
-    color: #1f2d3d;
-    cursor: pointer
-}
-
-.hide-toggle > .hide-button > i {
-    font-size: 1.2em;
-    transition: all .3s ease 0s
-}
-
-.hide-toggle > .hide-button.open i {
-    transform: rotate(90deg)
-}
-
-.hide-toggle > .hide-button.open + div {
-    display: block
-}
-
-.hide-toggle > .hide-content {
-    display: none;
-    margin: 1.5rem 1.2rem
-}
 
 #article-container .inline-img {
     display: inline;
@@ -4386,7 +4322,7 @@ blockquote.pullquote.right {
 
 .note:not(.no-icon)::before {
     position: absolute;
-    top: calc(50% - 15px);
+    top: calc(50% - 19px);
     left: .7rem;
     font-size: larger
 }
@@ -4452,7 +4388,7 @@ blockquote.pullquote.right {
 }
 
 .note.primary:not(.no-icon)::before {
-    content: ""
+    content: "\e060"
 }
 
 .note.primary:not(.no-icon):not(.modern)::before {
@@ -6018,6 +5954,17 @@ i.fab {
 }
 
 @media screen and (max-width: 768px) {
+    #page-header #nav a:hover span.scoicon {
+        opacity: 1 !important;
+    }
+    #page-header.not-top-img #nav a:hover {
+        align-items: flex-end !important;
+    }
+
+    #nav #site-name span{
+        padding-left: 8px
+    }
+
     #sidebar #sidebar-menus .menus_items li .site-page:hover {
         background: var(--sco-main);
         color: var(--sco-white)
@@ -6496,7 +6443,7 @@ a.console_switchbutton {
     transition: .3s;
     display: flex;
     height: 35px;
-    width: 70px;
+    min-width: 70px;
     justify-content: center;
     align-items: flex-end;
     text-shadow: none;
@@ -6504,6 +6451,13 @@ a.console_switchbutton {
     cursor: pointer
 }
 
+#nav #site-name img {
+    height: 100%
+}
+#nav #site-name:hover img {
+    opacity: 0
+}
+
 #search-button > a > span {
     display: none
 }
@@ -11299,7 +11253,8 @@ a.reward-main-btn:hover {
 
 @media screen and (max-width: 768px) {
     #quit-box {
-        display: none !important
+        z-index: 109;
+        height: calc(100vh - 380px);
     }
 }
 
@@ -12345,7 +12300,7 @@ button.el-button.tk-cancel.el-button--default.el-button--small {
         bottom: 0;
         left: 0;
         right: 0;
-        z-index: 102;
+        z-index: 1003;
         width: 100%;
         margin: auto;
         padding: 0
@@ -16327,94 +16282,4 @@ div#equipment {
 
 a.bber-reply {
     cursor: pointer
-}
-
-/*
- * ai
- */
-.post-ai {
-    background: var(--ai-post-bg);
-    border-radius: 12px;
-    padding: 12px 16px;
-    line-height: 1.3;
-    border: 1px solid #e3e8f7bd;;
-    margin-top: 10px;
-    margin-bottom: 6px;
-    transition: all .3s;
-    -webkit-transition: all .3s;
-    -moz-transition: all .3s;
-    -ms-transition: all .3s;
-    -o-transition: all .3s
-}
-
-.ai-title {
-    display: flex;
-    color: var(--sco-fontcolor);
-    border-radius: 8px;
-    align-items: center;
-    padding: 0 5px
-}
-
-.ai-title i {
-    font-weight: 800
-}
-
-.ai-title-text {
-    font-weight: 700;
-    margin-left: 8px
-}
-
-.ai-tag {
-    font-size: 12px;
-    background-color: var(--ai-tag-bg);
-    color: rgba(255, 255, 255, .9);
-    border-radius: 4px;
-    margin-left: auto;
-    line-height: 1;
-    padding: 4px 5px;
-    border: var(--ai-border)
-}
-
-.ai-explanation {
-    padding: 8px;
-    margin-top: 11px;
-    font-size: 16px;
-    line-height: 1.4;
-    border: 1px solid var(--sco-card-border);
-    border-radius: 8px;
-}
-
-.ai-btn-box {
-    font-size: 16px;
-    width: 100%;
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap
-}
-
-.ai-btn-item {
-    padding: 5px 10px;
-    margin: 10px 16px 0 5px;
-    width: fit-content;
-    line-height: 1;
-    background: var(--sco-card-btn-bg);
-    border: var(--ai-border);
-    color: var(--sco-fontcolor);
-    border-radius: 6px 6px 6px 0;
-    -webkit-border-radius: 6px 6px 6px 0;
-    -moz-border-radius: 6px 6px 6px 0;
-    -ms-border-radius: 6px 6px 6px 0;
-    -o-border-radius: 6px 6px 6px 0;
-    user-select: none;
-    transition: all .3s;
-    -webkit-transition: all .3s;
-    -moz-transition: all .3s;
-    -ms-transition: all .3s;
-    -o-transition: all .3s
-}
-
-.ai-btn-item:hover {
-    background: var(--sco-main);
-    color: var(--sco-white);
-    cursor: pointer;
 }

package/source/js/extend/covercolor/local.js

@@ -1,107 +1,113 @@
 function coverColor() {
     var path = document.getElementById("post-cover")?.src;
     if (path !== undefined) {
-      var img = new Image();
-      img.crossOrigin = "Anonymous";
-      img.src = path;
-      img.onload = function () {
-        var canvas = document.createElement("canvas");
-        canvas.width = this.width;
-        canvas.height = this.height;
-        var ctx = canvas.getContext("2d");
-        ctx.drawImage(this, 0, 0);
-        var data = ctx.getImageData(0, 0, this.width, this.height).data;
-        var r = 0, g = 0, b = 0;
-        var step = 5;
-        for (var i = 0; i < data.length; i += 4 * step) {
-          r += data[i];
-          g += data[i + 1];
-          b += data[i + 2];
+        var img = new Image();
+        img.crossOrigin = "Anonymous";
+        img.src = path;
+        img.onload = function () {
+            var canvas = document.createElement("canvas");
+            canvas.width = this.width;
+            canvas.height = this.height;
+            var ctx = canvas.getContext("2d");
+            ctx.drawImage(this, 0, 0);
+            var data = ctx.getImageData(0, 0, this.width, this.height).data;
+            var colorCounts = {};
+            var dominantColor = '';
+            var maxCount = 0;
+            var step = 5;
+            for (var i = 0; i < data.length; i += 4 * step) {
+                var r = data[i];
+                var g = data[i + 1];
+                var b = data[i + 2];
+                var color = `${r},${g},${b}`;
+
+                colorCounts[color] = (colorCounts[color] || 0) + 1;
+
+                if (colorCounts[color] > maxCount) {
+                    maxCount = colorCounts[color];
+                    dominantColor = color;
+                }
+            }
+            var rgb = dominantColor.split(',').map(c => parseInt(c, 10));
+            var value = "#" + rgb[0].toString(16) + rgb[1].toString(16) + rgb[2].toString(16);
+            if (getContrastYIQ(value) == "light") {
+                value = LightenDarkenColor(colorHex(value), -50)
+            }
+
+            document.documentElement.style.setProperty('--sco-main', value);
+            document.documentElement.style.setProperty('--sco-main-op', value + '23');
+            document.documentElement.style.setProperty('--sco-main-op-deep', value + 'dd');
+            document.documentElement.style.setProperty('--sco-main-none', value + '00');
+            initThemeColor()
+            document.getElementById("coverdiv").classList.add("loaded");
         }
-        r = Math.floor(r / (data.length / 4 / step));
-        g = Math.floor(g / (data.length / 4 / step));
-        b = Math.floor(b / (data.length / 4 / step));
-        var value = "#" + r.toString(16) + g.toString(16) + b.toString(16);
-        if (getContrastYIQ(value) == "light") {
-          value = LightenDarkenColor(colorHex(value), -50)
-        }
-
-        document.documentElement.style.setProperty('--sco-main', value);
-        document.documentElement.style.setProperty('--sco-main-op', value + '23');
-        document.documentElement.style.setProperty('--sco-main-op-deep', value + 'dd');
-        document.documentElement.style.setProperty('--sco-main-none', value + '00');
-        initThemeColor()
-        document.getElementById("coverdiv").classList.add("loaded");
-      }
     } else {
-      document.documentElement.style.setProperty('--sco-main', 'var(--sco-theme)');
-      document.documentElement.style.setProperty('--sco-main-op', 'var(--sco-theme-op)');
-      document.documentElement.style.setProperty('--sco-main-op-deep', 'var(--sco-theme-op-deep)');
-      document.documentElement.style.setProperty('--sco-main-none', 'var(--sco-theme-none)');
-      initThemeColor()
+        document.documentElement.style.setProperty('--sco-main', 'var(--sco-theme)');
+        document.documentElement.style.setProperty('--sco-main-op', 'var(--sco-theme-op)');
+        document.documentElement.style.setProperty('--sco-main-op-deep', 'var(--sco-theme-op-deep)');
+        document.documentElement.style.setProperty('--sco-main-none', 'var(--sco-theme-none)');
+        initThemeColor()
     }
-  }
-
+}
 
-  function colorHex(colorString) {
+function colorHex(colorString) {
     const hexRegex = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
     let color = colorString;
 
     if (/^(rgb|RGB)/.test(color)) {
-      const colorArr = color.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",");
-      const hexArr = colorArr.map(c => {
-        const hex = Number(c).toString(16);
-        return hex.length === 1 ? "0" + hex : hex;
-      });
-      return "#" + hexArr.join("");
-    } else if (hexRegex.test(color)) {
-      const hexDigits = color.replace(/#/, "").split("");
-      if (hexDigits.length === 6) {
-        return color;
-      } else if (hexDigits.length === 3) {
-        const hexArr = hexDigits.map(c => c + c);
+        const colorArr = color.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",");
+        const hexArr = colorArr.map(c => {
+            const hex = Number(c).toString(16);
+            return hex.length === 1 ? "0" + hex : hex;
+        });
         return "#" + hexArr.join("");
-      }
+    } else if (hexRegex.test(color)) {
+        const hexDigits = color.replace(/#/, "").split("");
+        if (hexDigits.length === 6) {
+            return color;
+        } else if (hexDigits.length === 3) {
+            const hexArr = hexDigits.map(c => c + c);
+            return "#" + hexArr.join("");
+        }
     }
     return color;
-  }
-
+}
 
 
 function colorRgb(str) {
-  const HEX_SHORT_REGEX = /^#([0-9a-fA-f]{3})$/;
-  const HEX_LONG_REGEX = /^#([0-9a-fA-f]{6})$/;
-  const HEX_SHORT_LENGTH = 4;
-
-  if (!str || typeof str !== 'string') {
-    return str;
-  }
-
-  const sColor = str.toLowerCase();
-  let hexValue = "";
-
-  if (sColor && (HEX_SHORT_REGEX.test(sColor) || HEX_LONG_REGEX.test(sColor))) {
-    hexValue = sColor.length === HEX_SHORT_LENGTH ?
-        sColor.replace(/^#(.)/g, "#$1$1") :
-        sColor;
-
-    const rgbValue = hexValue.slice(1)
-        .match(/.{2}/g)
-        .map(val => parseInt(val, 16));
-
-    return `rgb(${rgbValue[0]}, ${rgbValue[1]}, ${rgbValue[2]})`;
-  } else {
-    return sColor;
-  }
+    const HEX_SHORT_REGEX = /^#([0-9a-fA-f]{3})$/;
+    const HEX_LONG_REGEX = /^#([0-9a-fA-f]{6})$/;
+    const HEX_SHORT_LENGTH = 4;
+
+    if (!str || typeof str !== 'string') {
+        return str;
+    }
+
+    const sColor = str.toLowerCase();
+    let hexValue = "";
+
+    if (sColor && (HEX_SHORT_REGEX.test(sColor) || HEX_LONG_REGEX.test(sColor))) {
+        hexValue = sColor.length === HEX_SHORT_LENGTH ?
+            sColor.replace(/^#(.)/g, "#$1$1") :
+            sColor;
+
+        const rgbValue = hexValue.slice(1)
+            .match(/.{2}/g)
+            .map(val => parseInt(val, 16));
+
+        return `rgb(${rgbValue[0]}, ${rgbValue[1]}, ${rgbValue[2]})`;
+    } else {
+        return sColor;
+    }
 }
 
 
-  function LightenDarkenColor(col, amt) {
+function LightenDarkenColor(col, amt) {
     let usePound = false;
 
     if (col[0] === "#") {
-      col = col.slice(1);
-      usePound = true;
+        col = col.slice(1);
+        usePound = true;
     }
 
     const num = parseInt(col, 16);
@@ -110,12 +116,15 @@ function colorRgb(str) {
     const g = Math.min(255, Math.max(0, (num & 0xff) + amt));
 
     return `${usePound ? "#" : ""}${(g | (b << 8) | (r << 16)).toString(16).padStart(6, "0")}`;
-  }
+}
 
 
-  function getContrastYIQ(hexcolor) {
+function getContrastYIQ(hexcolor) {
     var colorrgb = colorRgb(hexcolor);
     var colors = colorrgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
+    if (!colors) {
+        return "light";  // or "dark", depending on your preference
+    }
     var red = colors[1];
     var green = colors[2];
     var blue = colors[3];
@@ -123,28 +132,29 @@ function colorRgb(str) {
     brightness = (red * 299) + (green * 587) + (blue * 114);
     brightness = brightness / 255000;
     if (brightness >= 0.5) {
-      return "light";
+        return "light";
     } else {
-      return "dark";
+        return "dark";
     }
-  }
+}
+
 
-  function initThemeColor() {
+function initThemeColor() {
     const currentTop = window.scrollY || document.documentElement.scrollTop;
     let themeColor;
     if (currentTop > 0) {
-      themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-card-bg');
+        themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-card-bg');
     } else if (PAGECONFIG.is_post) {
-      themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-main');
+        themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-main');
     } else {
-      themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-background');
+        themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-background');
     }
     changeThemeColor(themeColor);
-  }
+}
 
-  function changeThemeColor(color) {
+function changeThemeColor(color) {
     const meta = document.querySelector('meta[name="theme-color"]');
     if (meta) {
-      meta.setAttribute('content', color);
+        meta.setAttribute('content', color);
     }
-  }
+}

package/source/js/main.js

@@ -531,12 +531,12 @@ class sco {
             'light'
         if (nowMode === 'light') {
             document.documentElement.setAttribute('data-theme', 'dark')
-            saveToLocal.set('theme', 'dark', 0.5);
+            saveToLocal.set('theme', 'dark', 0.04);
             utils.snackbarShow(GLOBALCONFIG.lang.theme.dark, false, 2000)
             document.querySelector(".menu-darkmode-text").textContent = "深色模式";
         } else {
             document.documentElement.setAttribute('data-theme', 'light')
-            saveToLocal.set('theme', 'light', 0.5);
+            saveToLocal.set('theme', 'light', 0.04);
             utils.snackbarShow(GLOBALCONFIG.lang.theme.light, false, 2000)
             document.querySelector(".menu-darkmode-text").textContent = "浅色模式";
         }
@@ -564,25 +564,28 @@ class sco {
         }
     }
 
-    static copyPageUrl() {
-        utils.copy(window.location.href)
-    }
-
     static lightbox(el) {
         window.ViewImage && window.ViewImage.init("#article-container img:not(.flink-avatar), .bber-content-img img, #album_detail img, #equipment img, #twikoo .tk-content img:not(.tk-owo-emotion)");
     }
 
     static initTheme() {
         const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
-        const cachedMode = saveToLocal.get('theme');
-
-        if (cachedMode === undefined) {
-            const nowMode =
-                isDarkMode ? 'dark' : 'light'
-            document.documentElement.setAttribute('data-theme', nowMode);
-            saveToLocal.set('theme', nowMode, 2);
-        } else {
-            document.documentElement.setAttribute('data-theme', cachedMode);
+        try {
+            const cachedMode = saveToLocal.get('theme');
+            if (cachedMode === undefined) {
+                const nowMode =
+                    isDarkMode ? 'dark' : 'light'
+                document.documentElement.setAttribute('data-theme', nowMode);
+                saveToLocal.set('theme', nowMode, 0.5);
+            } else {
+                document.documentElement.setAttribute('data-theme', cachedMode);
+            }
+        } catch (e) {
+            if (isDarkMode) {
+                saveToLocal.set('theme', 'dark', 0.5)
+            } else {
+                saveToLocal.set('theme', 'light', 0.5)
+            }
         }
     }
 
@@ -758,7 +761,7 @@ class hightlight {
                     $expand[0].setAttribute('style', 'display:block')
                 }
                 if (itemHeight < 200) {
-                    $table.setAttribute('style', 'height:' + itemHeight + "px")
+                    $table.setAttribute('style', 'height: auto')
                 } else {
                     $table.setAttribute('style', 'height:200px')
                     ele.classList.remove("expand-done")