Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 16:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-04-17 15:06:55 +08:00
commit 8e8d9bba10
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel/model/appearance.go
View file

@ -266,8 +266,7 @@ func watchTheme(folder string) {
} }
//logging.LogInfof(event.String()) //logging.LogInfof(event.String())
if event.Op&fsnotify.Write == fsnotify.Write && if event.Op&fsnotify.Write == fsnotify.Write && (strings.HasSuffix(event.Name, "theme.css")) {
(strings.HasSuffix(event.Name, "theme.css") || strings.HasSuffix(event.Name, "custom.css")) {
var themeName string var themeName string
if themeName = isCurrentUseTheme(event.Name); "" == themeName { if themeName = isCurrentUseTheme(event.Name); "" == themeName {
break break
@ -279,13 +278,6 @@ func watchTheme(folder string) {
}) })
break break
} }
if strings.HasSuffix(event.Name, "custom.css") {
util.BroadcastByType("main", "refreshtheme", 0, "", map[string]interface{}{
"theme": "/appearance/themes/" + themeName + "/custom.css?" + fmt.Sprintf("%d", time.Now().Unix()),
})
break
}
} }
case err, ok := <-themeWatcher.Errors: case err, ok := <-themeWatcher.Errors:
if !ok { if !ok {