Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 18:10:12 +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-02-12 23:51:43 +08:00
commit b9ff2fcaa2
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/appearance/themes/daylight/theme.css
View file

@ -91,8 +91,8 @@
--b3-font-background13: var(--b3-theme-on-background); --b3-font-background13: var(--b3-theme-on-background);
/* 动画效果 */ /* 动画效果 */
--b3-transition: all .15s cubic-bezier(0, 0, .2, 1) 0ms; --b3-transition: all .2s cubic-bezier(0, 0, .2, 1) 0ms;
--b3-width-transition: width .15s cubic-bezier(0, 0, .2, 1) 0ms; --b3-width-transition: width .2s cubic-bezier(0, 0, .2, 1) 0ms;
/* 阴影 */ /* 阴影 */
--b3-point-shadow: 0 3px 6px rgba(140,149,159,0.15); --b3-point-shadow: 0 3px 6px rgba(140,149,159,0.15);

4
app/appearance/themes/midnight/theme.css
View file

@ -91,8 +91,8 @@
--b3-font-background13: var(--b3-theme-on-background); --b3-font-background13: var(--b3-theme-on-background);
/* 动画效果 */ /* 动画效果 */
--b3-transition: all .15s cubic-bezier(0, 0, .2, 1) 0ms; --b3-transition: all .2s cubic-bezier(0, 0, .2, 1) 0ms;
--b3-width-transition: width .15s cubic-bezier(0, 0, .2, 1) 0ms; --b3-width-transition: width .2s cubic-bezier(0, 0, .2, 1) 0ms;
/* 阴影 */ /* 阴影 */
--b3-point-shadow: 0 3px 6px #010409; --b3-point-shadow: 0 3px 6px #010409;

9
kernel/api/workspace.go
View file

@ -134,17 +134,18 @@ func getMobileWorkspaces(c *gin.Context) {
return return
} }
var names []string var paths []string
for _, dir := range dirs { for _, dir := range dirs {
if dir.IsDir() { if dir.IsDir() {
if isInvalidWorkspacePath(filepath.Join(root, dir.Name())) { absPath := filepath.Join(root, dir.Name())
if isInvalidWorkspacePath(absPath) {
continue continue
} }
names = append(names, dir.Name()) paths = append(paths, absPath)
} }
} }
ret.Data = names ret.Data = paths
} }
func getWorkspaces(c *gin.Context) { func getWorkspaces(c *gin.Context) {