添加物理猫主题，优化低分辨率设备显示

caol64 · Dec 17, 2024 · 0fdf32b · 0fdf32b
1 parent a1dfc3f
commit 0fdf32b
Show file tree

Hide file tree

Showing 14 changed files with 384 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -31,6 +31,7 @@
   - [Pie](https://github.com/kevinzhao2233/typora-theme-pie)
   - [Maize](https://github.com/BEATREE/typora-maize-theme)
   - [Purple](https://github.com/hliu202/typora-purple-theme)
+  - [物理猫-薄荷](https://github.com/sumruler/typora-theme-phycat)
 - 自定义主题
   - 支持自定义样式
   - 支持导入现成的主题

diff --git a/WenYan.xcodeproj/project.pbxproj b/WenYan.xcodeproj/project.pbxproj
@@ -398,7 +398,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = WenYan/WenYan.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 15;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"WenYan/Preview Content\"";
 				DEVELOPMENT_TEAM = NNQB2TH9QC;
@@ -423,7 +423,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 2.3.2;
+				MARKETING_VERSION = 2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yztech.WenYan;
 				PRODUCT_MODULE_NAME = WenYan;
 				PRODUCT_NAME = "文颜";
@@ -443,7 +443,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = WenYan/WenYan.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 15;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"WenYan/Preview Content\"";
 				DEVELOPMENT_TEAM = NNQB2TH9QC;
@@ -468,7 +468,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 2.3.2;
+				MARKETING_VERSION = 2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yztech.WenYan;
 				PRODUCT_MODULE_NAME = WenYan;
 				PRODUCT_NAME = "文颜";

diff --git a/WenYan/Enums.swift b/WenYan/Enums.swift
@@ -17,6 +17,7 @@ enum ThemeStyle: String {
     case pie = "themes/pie.css"
     case maize = "themes/maize.css"
     case purple = "themes/purple.css"
+    case phycat = "themes/phycat.css"
 
     var name: String {
         switch self {
@@ -31,6 +32,7 @@ enum ThemeStyle: String {
         case .pie: "Pie"
         case .maize: "Maize"
         case .purple: "Purple"
+        case .phycat: "物理猫-薄荷"
         }
     }
 
@@ -47,6 +49,7 @@ enum ThemeStyle: String {
         case .pie: "kevinzhao2233"
         case .maize: "BEATREE"
         case .purple: "hliu202"
+        case .phycat: "sumruler"
         }
     }
 }
@@ -74,7 +77,7 @@ enum Platform: String, CaseIterable, Identifiable {
     var themes: [ThemeStyle] {
         switch self {
         case .gzh:
-            return [.gzhDefault, .orangeHeart, .rainbow, .lapis, .pie, .maize, .purple]
+            return [.gzhDefault, .orangeHeart, .rainbow, .lapis, .pie, .maize, .purple, .phycat]
         case .zhihu:
             return [.zhihuDefault]
         case .toutiao:

diff --git a/WenYan/Resources.bundle/csstree/handler.js b/WenYan/Resources.bundle/csstree/handler.js
@@ -299,11 +299,9 @@ function parseCss(css, compatibilityMode) {
         const defaultCss = `
 #wenyan table td {
     font-size: 0.75em;
-    height: 40px;
     padding: 9px 12px;
     line-height: 22px;
     color: #222;
-    min-width: 60px;
     border: 1px solid #d8d8d8;
     vertical-align: top;
 }`;
@@ -321,11 +319,9 @@ function parseCss(css, compatibilityMode) {
         const defaultCss = `
 #wenyan table th {
     font-size: 0.75em;
-    height: 40px;
     padding: 9px 12px;
     line-height: 22px;
     color: #222;
-    min-width: 60px;
     border: 1px solid #d8d8d8;
     vertical-align: top;
     font-weight: bold;

diff --git a/WenYan/Resources.bundle/main.js b/WenYan/Resources.bundle/main.js
@@ -244,16 +244,16 @@ function getContentForGzh() {
             element.insertBefore(buildPseudoSpan(beforeResults), element.firstChild);
         }
     });
-    // 不知是否是bug，公众号不再支持blockquote样式
-    elements = clonedWenyan.querySelectorAll('blockquote');
-    elements.forEach(element => {
-        const preElement = document.createElement('section');
-        preElement.style.cssText = element.style.cssText;
-        while (element.firstChild) {
-            preElement.appendChild(element.firstChild);
-        }
-        element.parentNode.replaceChild(preElement, element);
-    });
+//    // 不知是否是bug，公众号不再支持blockquote样式
+//    elements = clonedWenyan.querySelectorAll('blockquote');
+//    elements.forEach(element => {
+//        const preElement = document.createElement('section');
+//        preElement.style.cssText = element.style.cssText;
+//        while (element.firstChild) {
+//            preElement.appendChild(element.firstChild);
+//        }
+//        element.parentNode.replaceChild(preElement, element);
+//    });
     clonedWenyan.setAttribute("data-provider", "WenYan");
     return `${clonedWenyan.outerHTML.replace(/class="mjx-solid"/g, 'fill="none" stroke-width="70"')}`;
 }

diff --git a/WenYan/Resources.bundle/themes/gzh_default.css b/WenYan/Resources.bundle/themes/gzh_default.css
@@ -96,11 +96,9 @@
 #wenyan table td,
 #wenyan table th {
     font-size: 0.75em;
-    height: 40px;
     padding: 9px 12px;
     line-height: 22px;
     color: #222;
-    min-width: 60px;
     border: 1px solid #d8d8d8;
     vertical-align: top;
 }

diff --git a/WenYan/Resources.bundle/themes/lapis.css b/WenYan/Resources.bundle/themes/lapis.css
@@ -140,11 +140,9 @@
 #wenyan table th,
 #wenyan table td {
     border: 1px solid #d9dfe4;
-    height: 40px;
     padding: 9px 12px;
     font-size: 0.75em;
     line-height: 22px;
-    min-width: 60px;
     vertical-align: top;
 }
 #wenyan table th {

diff --git a/WenYan/Resources.bundle/themes/maize.css b/WenYan/Resources.bundle/themes/maize.css
@@ -143,11 +143,9 @@
 #wenyan table td,
 #wenyan table th {
     font-size: 0.75em;
-    height: 40px;
     padding: 9px 12px;
     line-height: 22px;
     color: #222;
-    min-width: 60px;
     border: 1px solid rgb(255, 216, 181);
     vertical-align: top;
 }

diff --git a/WenYan/Resources.bundle/themes/orangeheart.css b/WenYan/Resources.bundle/themes/orangeheart.css
@@ -135,11 +135,9 @@
 #wenyan table td,
 #wenyan table th {
     font-size: 0.75em;
-    height: 40px;
     padding: 9px 12px;
     line-height: 22px;
     color: #222;
-    min-width: 60px;
     border: 1px solid rgb(239, 112, 96);
     vertical-align: top;
 }