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

# Conflicts:
#	app/src/menus/workspace.ts
This commit is contained in:
Vanessa 2023-01-09 16:33:55 +08:00
commit c6e183d1a1
7 changed files with 8 additions and 8 deletions

View file

@ -108,7 +108,7 @@ export const workspaceMenu = (rect: DOMRect) => {
});
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
window.siyuan.menus.menu.append(new MenuItem({
iconHTML: window.siyuan.languages.about7,
iconHTML: window.siyuan.languages.workspaceList,
label:"",
type: "readonly"
}).element);

View file

@ -291,7 +291,7 @@ ${accountHTML}
<div class="b3-label__text">${window.siyuan.languages.importDataTip}</div>
</div>
<div class="b3-label">
${window.siyuan.languages.about7}
${window.siyuan.languages.workspaceList}
<div class="fn__hr"></div>
<ul id="workspaceDir" class="b3-list b3-list--background"></ul>
<div class="fn__hr"></div>