diff --git a/app/appearance/icons/ant/icon.js b/app/appearance/icons/ant/icon.js index dac15a89b..7c5482f45 100644 --- a/app/appearance/icons/ant/icon.js +++ b/app/appearance/icons/ant/icon.js @@ -1,10 +1,16 @@ document.body.insertAdjacentHTML('afterBegin', ` + + + + + + - + - + @@ -267,7 +273,8 @@ document.body.insertAdjacentHTML('afterBegin', ` - + + @@ -484,7 +491,7 @@ document.body.insertAdjacentHTML('afterBegin', ` - + diff --git a/app/appearance/icons/index.html b/app/appearance/icons/index.html index 3233a51ae..94a3b36b5 100644 --- a/app/appearance/icons/index.html +++ b/app/appearance/icons/index.html @@ -28,6 +28,18 @@

SiYuan

+
+ + + + iconFullscreenExit +
+
+ + + + iconFullscreen +
@@ -882,9 +894,9 @@
- + - iconFullscreen + iconExpand
@@ -1019,6 +1031,6 @@ iconSub
- + diff --git a/app/appearance/icons/material/icon.js b/app/appearance/icons/material/icon.js index 381c97d34..72e44a8a8 100644 --- a/app/appearance/icons/material/icon.js +++ b/app/appearance/icons/material/icon.js @@ -1,5 +1,11 @@ document.body.insertAdjacentHTML('afterbegin', ` + + + + + + @@ -484,7 +490,7 @@ document.body.insertAdjacentHTML('afterbegin', ` - + diff --git a/app/src/layout/dock/Backlink.ts b/app/src/layout/dock/Backlink.ts index 5d0250b01..cf6c6848f 100644 --- a/app/src/layout/dock/Backlink.ts +++ b/app/src/layout/dock/Backlink.ts @@ -92,7 +92,7 @@ export class Backlink extends Model { - + @@ -117,7 +117,7 @@ export class Backlink extends Model { - + diff --git a/app/src/layout/dock/Bookmark.ts b/app/src/layout/dock/Bookmark.ts index 3dfad6f34..8eb3a4123 100644 --- a/app/src/layout/dock/Bookmark.ts +++ b/app/src/layout/dock/Bookmark.ts @@ -62,7 +62,7 @@ export class Bookmark extends Model { - + diff --git a/app/src/layout/dock/Graph.ts b/app/src/layout/dock/Graph.ts index 28ba8abc0..812120fe1 100644 --- a/app/src/layout/dock/Graph.ts +++ b/app/src/layout/dock/Graph.ts @@ -264,7 +264,7 @@ export class Graph extends Model {
- +
diff --git a/app/src/layout/dock/Outline.ts b/app/src/layout/dock/Outline.ts index d545212f8..badb9edef 100644 --- a/app/src/layout/dock/Outline.ts +++ b/app/src/layout/dock/Outline.ts @@ -81,7 +81,7 @@ export class Outline extends Model {
- + diff --git a/app/src/layout/dock/Tag.ts b/app/src/layout/dock/Tag.ts index d7747c426..4c68c0268 100644 --- a/app/src/layout/dock/Tag.ts +++ b/app/src/layout/dock/Tag.ts @@ -59,7 +59,7 @@ export class Tag extends Model { - + diff --git a/app/src/mobile/util/MobileBacklinks.ts b/app/src/mobile/util/MobileBacklinks.ts index d2de31593..e848bc925 100644 --- a/app/src/mobile/util/MobileBacklinks.ts +++ b/app/src/mobile/util/MobileBacklinks.ts @@ -19,7 +19,7 @@ export class MobileBacklinks { - + @@ -31,7 +31,7 @@ export class MobileBacklinks { - + diff --git a/app/src/mobile/util/MobileBookmarks.ts b/app/src/mobile/util/MobileBookmarks.ts index a14c6f4a1..5fb856740 100644 --- a/app/src/mobile/util/MobileBookmarks.ts +++ b/app/src/mobile/util/MobileBookmarks.ts @@ -20,7 +20,7 @@ export class MobileBookmarks { ${window.siyuan.languages.bookmark} - + diff --git a/app/src/mobile/util/MobileOutline.ts b/app/src/mobile/util/MobileOutline.ts index 2c9dda780..ca69eacf0 100644 --- a/app/src/mobile/util/MobileOutline.ts +++ b/app/src/mobile/util/MobileOutline.ts @@ -17,7 +17,7 @@ export class MobileOutline { ${window.siyuan.languages.outline} - + diff --git a/app/src/mobile/util/MobileTags.ts b/app/src/mobile/util/MobileTags.ts index 6e8e62865..ee7398b44 100644 --- a/app/src/mobile/util/MobileTags.ts +++ b/app/src/mobile/util/MobileTags.ts @@ -20,7 +20,7 @@ export class MobileTags { ${window.siyuan.languages.tag} - + diff --git a/app/src/protyle/breadcrumb/action.ts b/app/src/protyle/breadcrumb/action.ts index 5b3090149..f168ba14a 100644 --- a/app/src/protyle/breadcrumb/action.ts +++ b/app/src/protyle/breadcrumb/action.ts @@ -58,9 +58,9 @@ export const fullscreen = (element: Element, btnElement?: Element) => { if (btnElement) { if (isFullscreen) { - btnElement.querySelector("use").setAttribute("xlink:href", "#iconHideDock"); + btnElement.querySelector("use").setAttribute("xlink:href", "#iconFullscreen"); } else { - btnElement.querySelector("use").setAttribute("xlink:href", "#iconDock"); + btnElement.querySelector("use").setAttribute("xlink:href", "#iconFullscreenExit"); } const dockLayoutElement = hasClosestByClassName(element, "layout--float"); if (dockLayoutElement) { diff --git a/app/src/protyle/breadcrumb/index.ts b/app/src/protyle/breadcrumb/index.ts index 5cf3bfbba..05214010a 100644 --- a/app/src/protyle/breadcrumb/index.ts +++ b/app/src/protyle/breadcrumb/index.ts @@ -325,7 +325,7 @@ export class Breadcrumb { }).element); if (!isMobile()) { window.siyuan.menus.menu.append(new MenuItem({ - icon: "iconHideDock", + icon: protyle.element.className.includes("fullscreen") ? "iconFullscreenExit" : "iconFullscreen", accelerator: window.siyuan.config.keymap.editor.general.fullscreen.custom, label: window.siyuan.languages.fullscreen, click: () => { diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 8a37d5d3d..d0c5b6f52 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -159,7 +159,7 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
- +