hexo-theme-linen 1.0.38 → 1.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-linen",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "description": "A clean Hexo theme",
   "main": "index.js",
   "homepage": "https://github.com/lynanbreeze/hexo-theme-linen",

package/scripts/helpers/tools.js

@@ -86,13 +86,23 @@ hexo.extend.helper.register("getTranslationPage", function () {
       : false;
     let origin =
       config?.theme_config?.siteOriginLocaleMap?.[targetLanguage] || config.url;
-    let targetLanguagePath = `${origin}${this.url_for(page.path)}`;
+    // `url_for` includes the current site's `root` (for example, the GitHub
+    // Pages repository path). The locale origin may already include its own
+    // root, so only append the page path portion to avoid duplicating it.
+    const rootPath = String(config.root || "/").replace(/^\/+|\/+$/g, "");
+    const siteRoot = rootPath ? `/${rootPath}/` : "/";
+    let pagePath = this.url_for(page.path);
+    if (siteRoot !== "/" && pagePath.startsWith(siteRoot)) {
+      pagePath = pagePath.slice(siteRoot.length - 1);
+    }
+    const originBase = String(origin || "").replace(/\/+$/, "");
+    let targetLanguagePath = `${originBase}/${String(pagePath).replace(/^\/+/, "")}`;
     if (page?.seriesInfo?.mappingName) {
-      targetLanguagePath = `${origin}/series/${page?.seriesInfo?.mappingName}/`;
+      targetLanguagePath = `${originBase}/series/${page?.seriesInfo?.mappingName}/`;
     }
     if (this.is_category()) {
       if (categoriesInfo?.[page.category]?.mappingName) {
-        targetLanguagePath = `${origin}/categories/${
+        targetLanguagePath = `${originBase}/categories/${
           categoriesInfo?.[page.category]?.mappingName
         }/`;
       } else {
@@ -101,7 +111,7 @@ hexo.extend.helper.register("getTranslationPage", function () {
     }
     if (this.is_tag()) {
       if (tagsInfo?.[page.tag]?.mappingName) {
-        targetLanguagePath = `${origin}/tags/${tagsInfo?.[page.tag]?.mappingName}/`;
+        targetLanguagePath = `${originBase}/tags/${tagsInfo?.[page.tag]?.mappingName}/`;
       } else {
         hasTranslatation = false;
       }

package/scripts/lazyload/client.js

@@ -300,6 +300,7 @@
       };
       if (/<video/.test(contentStr)) {
         setTimeout(function () {
+          resourceElement.style.opacity = "1";
           element.classList.add("loaded");
         }, 100);
       }

package/source/linen-theme/css/_mediaquery.scss

@@ -91,6 +91,9 @@
       transform: translateY(0);
     }
   }
+  #back-to-top {
+    z-index: 998;
+  }
   .series-nav {
     display: block;
   }

package/source/linen-theme/css/linen.scss

@@ -1113,6 +1113,7 @@ body {
     display: none;
   }
   figure.highlight {
+    margin-bottom: 0;
     pre {
       white-space: pre-wrap;
       word-wrap: break-word;

package/source/linen-theme/js/lazyload.js

@@ -300,6 +300,7 @@
       };
       if (/<video/.test(contentStr)) {
         setTimeout(function () {
+          resourceElement.style.opacity = "1";
           element.classList.add("loaded");
         }, 100);
       }