fix: fix syntax error of styles

loveminimal · Dec 6, 2024 · c145538 · c145538
1 parent dae455f
commit c145538
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 27 deletions.
diff --git a/flypy_rime_jk.custom.yaml b/flypy_rime_jk.custom.yaml
@@ -3,8 +3,13 @@
 
 patch:
   __include: style.yaml:/skjk
-  __append:
-    __include: style.yaml:/jk_style
   __patch:
     style/+:
       color_scheme: skjk
+      font_face: 黑体字根, LXGW WenKai GB Screen R
+      label_font_face: 黑体字根, LXGW WenKai GB Screen R
+      comment_font_face: 黑体字根, LXGW WenKai GB Screen R
+      font_point: 13 
+      label_font_point: 11
+      comment_font_point: 11
+      horizontal: false 
diff --git a/py_rime_jk.custom.yaml b/py_rime_jk.custom.yaml
@@ -3,8 +3,13 @@
 
 patch:
   __include: style.yaml:/emjk
-  __append:
-    __include: style.yaml:/jk_style
   __patch:
     style/+:
       color_scheme: emjk
+      font_face: 黑体字根, LXGW WenKai GB Screen R
+      label_font_face: 黑体字根, LXGW WenKai GB Screen R
+      comment_font_face: 黑体字根, LXGW WenKai GB Screen R
+      font_point: 13 
+      label_font_point: 11
+      comment_font_point: 11
+      horizontal: false 
diff --git a/rime_jk.custom.yaml b/rime_jk.custom.yaml
@@ -3,8 +3,13 @@
 
 patch:
   __include: style.yaml:/pujk
-  __append:
-    __include: style.yaml:/jk_style
   __patch:
     style/+:
       color_scheme: pujk
+      font_face: 黑体字根, LXGW WenKai GB Screen R
+      label_font_face: 黑体字根, LXGW WenKai GB Screen R
+      comment_font_face: 黑体字根, LXGW WenKai GB Screen R
+      font_point: 13 
+      label_font_point: 11
+      comment_font_point: 11
+      horizontal: false 
diff --git a/s_rime_jk.custom.yaml b/s_rime_jk.custom.yaml
@@ -3,8 +3,13 @@
 
 patch:
   __include: style.yaml:/aqjk
-  __append:
-    __include: style.yaml:/jk_style
   __patch:
     style/+:
       color_scheme: aqjk
+      font_face: 黑体字根, LXGW WenKai GB Screen R
+      label_font_face: 黑体字根, LXGW WenKai GB Screen R
+      comment_font_face: 黑体字根, LXGW WenKai GB Screen R
+      font_point: 13 
+      label_font_point: 11
+      comment_font_point: 11
+      horizontal: false 
diff --git a/style.yaml b/style.yaml
@@ -1,20 +1,7 @@
-# Rime 主题配置及其配色方案
+# Rime 主题配色方案
 # encoding: utf-8
 
-# === 主题配置 ===
-jk_style:
-  style/+:
-    color_scheme: pujk
-    font_face: TumanPUA, LXGW WenKai GB Screen R
-    label_font_face: TumanPUA, LXGW WenKai GB Screen R
-    comment_font_face: TumanPUA, LXGW WenKai GB Screen R
-    font_point: 13 
-    label_font_point: 11
-    comment_font_point: 11
-    horizontal: false 
 
-
-# === 配色方案 ===
 # --- 绛紫 Purple ---
 pujk:
   preset_color_schemes/pujk:                    # 在 `style/color_schema` 指定的配色方案值
@@ -48,7 +35,7 @@ pujk:
 
 
 
-# --- 天空蓝 Sky ----
+# --- 天蓝色 Sky ----
 skjk:
   preset_color_schemes/skjk:                    # 在 `style/color_schema` 指定的配色方案值
     name: "知心／SK蓝JK"                        # 方案设置中显示的配色名称

diff --git a/tiger_rime_jk.custom.yaml b/tiger_rime_jk.custom.yaml
@@ -3,8 +3,13 @@
 
 patch:
   __include: style.yaml:/orjk
-  __append:
-    __include: style.yaml:/jk_style
   __patch:
     style/+:
       color_scheme: orjk
+      font_face: 黑体字根, LXGW WenKai GB Screen R
+      label_font_face: 黑体字根, LXGW WenKai GB Screen R
+      comment_font_face: 黑体字根, LXGW WenKai GB Screen R
+      font_point: 13 
+      label_font_point: 11
+      comment_font_point: 11
+      horizontal: false 
diff --git a/zrm_rime_jk.custom.yaml b/zrm_rime_jk.custom.yaml
@@ -3,8 +3,13 @@
 
 patch:
   __include: style.yaml:/sljk
-  __append:
-    __include: style.yaml:/jk_style
   __patch:
     style/+:
       color_scheme: sljk
+      font_face: 黑体字根, LXGW WenKai GB Screen R
+      label_font_face: 黑体字根, LXGW WenKai GB Screen R
+      comment_font_face: 黑体字根, LXGW WenKai GB Screen R
+      font_point: 13 
+      label_font_point: 11
+      comment_font_point: 11
+      horizontal: false