🐛 & ⚡ fix permalink cross the border, support update without changing…

… old _config.yml
FoxerLee · Sep 28, 2020 · 9604cd7 · 9604cd7
1 parent d725af5
commit 9604cd7
Show file tree

Hide file tree

Showing 19 changed files with 17 additions and 2 deletions.
diff --git a/languages/en.yml b/languages/en.yml
@@ -18,4 +18,5 @@ license: License
 signature: Signature
 education: Education
 experience: Experience
-interest: Interest
+interest: Interest
+resume: Resume
diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
@@ -18,4 +18,5 @@ license: 许可
 signature: 签名
 education: 教育
 experience: 工作经历
-interest: 兴趣
+interest: 兴趣
+resume: 简历
diff --git a/layout/_page/post.ejs b/layout/_page/post.ejs
@@ -37,14 +37,18 @@
     <% if (theme.copyright) { %>
         <div class="copyright">
             <% if (theme.permalink) { %>
+                <div style="overflow-x: auto;white-space:nowrap;">
                 <p>
                     <strong><%= __('permalink') %>:</strong> <a href="<%- page.permalink %>"><%- page.permalink %></a>
                 </p>
+                </div>
             <% } %>
             <% if (theme.license) { %>
+                <div style="overflow-x: auto;white-space:nowrap;">
                 <p>
                     <strong><%= __('license') %>:</strong> <%- theme.license %>
                 </p>
+                </div>
             <% } %>
             <% if (theme.signature) { %>
                 <p>

diff --git a/scripts/replace.js b/scripts/replace.js
@@ -0,0 +1,9 @@
+/**
+ * Note: configs in _data/temp.yml will replace configs in hexo.theme.config.
+ */
+hexo.on('generateBefore', function () {
+    if (hexo.locals.get) {
+      var data = hexo.locals.get('data') // 获取_data文件夹下的内容
+      data && data.temp && (hexo.theme.config = data.temp) // 如果temp.yml 存在，就把内容替换掉主题的config
+    }
+  })
diff --git a/source/images/a1.jpg b/source/images/a1.jpg
diff --git a/source/images/a10.jpg b/source/images/a10.jpg
diff --git a/source/images/a11.jpg b/source/images/a11.jpg
diff --git a/source/images/a12.jpg b/source/images/a12.jpg
diff --git a/source/images/a13.png b/source/images/a13.png
diff --git a/source/images/a14.png b/source/images/a14.png
diff --git a/source/images/a2.jpg b/source/images/a2.jpg
diff --git a/source/images/a3.jpg b/source/images/a3.jpg
diff --git a/source/images/a4.jpg b/source/images/a4.jpg
diff --git a/source/images/a6.jpg b/source/images/a6.jpg
diff --git a/source/images/a7.jpg b/source/images/a7.jpg
diff --git a/source/images/a8.jpg b/source/images/a8.jpg
diff --git a/source/images/a9.jpg b/source/images/a9.jpg
diff --git a/source/images/avatar.jpeg b/source/images/avatar.jpeg
diff --git a/source/images/avatar2.jpeg b/source/images/avatar2.jpeg