Merge pull request #44 from f-dong/BUG修复

Bug修复

Author: mintfog

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-minimalism",
-  "version": "1.3.11",
+  "version": "1.4.0",
   "private": false,
   "description": "a minimalist Hexo theme that is simple yet elegant, enabling your blog content to shine. Its powerful features also help you create a personalized blog that truly stands out.",
   "scripts": {

scripts/events/config.js

@@ -20,8 +20,21 @@ function merge(target, source) {
 hexo.on('generateBefore', () => {
   merge(hexo.theme.config, hexo.config.theme_config);
 
-  hexo.theme.config.highlight = hexo.config.highlight.enable ? {enable: true} : {enable: false};
-  hexo.theme.config.prismjs = hexo.config.prismjs.enable ? {enable: true} : {enable: false};
+  // hexo v7.0.0 新的配置改动
+  if (hexo.config.syntax_highlighter) {
+    if (hexo.config.syntax_highlighter === 'prismjs') {
+      hexo.theme.config.prismjs = {enable: true};
+      hexo.theme.config.highlight = {enable: false};
+    } else if (hexo.config.syntax_highlighter === 'highlight.js') {
+      hexo.theme.config.prismjs = {enable: false};
+      hexo.theme.config.highlight = {enable: true};
+    } else {
+      hexo.log.warn('Unsupported syntax highlighter: ' + hexo.config.syntax_highlighter);
+    }
+  } else { // v7.0.0 以下版本
+    hexo.theme.config.highlight = hexo.config.highlight.enable ? {enable: true} : {enable: false};
+    hexo.theme.config.prismjs = hexo.config.prismjs.enable ? {enable: true} : {enable: false};
+  }
 
   // 评论系统，旧配置兼容
   if (typeof hexo.theme.config.comment !== 'object' && hexo.theme.config.gitalk) {

source/style/_blocks/post.styl

@@ -178,7 +178,7 @@
   display: flex;
 }
 
-@media (max-width: 1200px) {
+@media (max-width: 1400px) {
   .top-box {
     display: none;
   }
@@ -200,7 +200,7 @@
   }
 }
 
-@media (min-width: 1200px) {
+@media (min-width: 1400px) {
   .top-div {
     box-sizing: border-box;
     margin: 0;