From 35d1c106337e1dd4cf2cc4c5b4090f0b162965af Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 17 Nov 2024 12:05:35 +0800 Subject: [PATCH 1/2] :art: Use real theme style value replace var in preview mode https://github.com/siyuan-note/siyuan/issues/11458 --- kernel/model/theme.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/model/theme.go b/kernel/model/theme.go index b18982d7c..dac7878f8 100644 --- a/kernel/model/theme.go +++ b/kernel/model/theme.go @@ -22,6 +22,7 @@ import ( "path/filepath" "strings" + "github.com/88250/gulu" "github.com/88250/lute/ast" "github.com/88250/lute/parse" "github.com/gorilla/css/scanner" @@ -54,6 +55,10 @@ func fillThemeStyleVar(tree *parse.Tree) { buf.WriteString(style) buf.WriteString(": ") value := themeStyles[name] + if strings.Contains(value, "-b3-") { + name = gulu.Str.SubStringBetween(value, "(", ")") + value = themeStyles[name] + } if "" == value { // 回退为变量 buf.WriteString("var(") From 6dad90f8212ffd7d7b20ce2ffc7d8ec17aa40c01 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 17 Nov 2024 12:05:35 +0800 Subject: [PATCH 2/2] :art: Use real theme style value replace var in preview mode https://github.com/siyuan-note/siyuan/issues/11458 --- kernel/model/theme.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/model/theme.go b/kernel/model/theme.go index dac7878f8..3b32a68a6 100644 --- a/kernel/model/theme.go +++ b/kernel/model/theme.go @@ -55,7 +55,7 @@ func fillThemeStyleVar(tree *parse.Tree) { buf.WriteString(style) buf.WriteString(": ") value := themeStyles[name] - if strings.Contains(value, "-b3-") { + if strings.Contains(value, "var(") { name = gulu.Str.SubStringBetween(value, "(", ")") value = themeStyles[name] }