Skip to content

Commit

Permalink
🎨 fix #7650
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vanessa219
Vanessa219 committed Mar 13, 2023
1 parent 68c825a commit 97318de
Show file tree
Hide file tree
Showing 15 changed files with 48 additions and 23 deletions.
15 changes: 11 additions & 4 deletions app/appearance/icons/ant/icon.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 15 additions & 3 deletions app/appearance/icons/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@
<body>
<h2>SiYuan</h2>
<div class="fn__clear">
<div>
<svg>
<use xlink:href="#iconFullscreenExit"></use>
</svg>
iconFullscreenExit
</div>
<div>
<svg>
<use xlink:href="#iconFullscreen"></use>
</svg>
iconFullscreen
</div>
<div>
<svg>
<use xlink:href="#iconScrollHoriz"></use>
Expand Down Expand Up @@ -882,9 +894,9 @@ <h2>SiYuan</h2>
</div>
<div>
<svg>
<use xlink:href="#iconFullscreen"></use>
<use xlink:href="#iconExpand"></use>
</svg>
iconFullscreen
iconExpand
</div>
<div>
<svg>
Expand Down Expand Up @@ -1019,6 +1031,6 @@ <h2>SiYuan</h2>
iconSub
</div>
</div>
<script src="material/icon.js"></script>
<script src="ant/icon.js"></script>
</body>
</html>
8 changes: 7 additions & 1 deletion app/appearance/icons/material/icon.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/src/layout/dock/Backlink.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export class Backlink extends Model {
<span data-type="sort" data-sort="3" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.sort}"><svg><use xlink:href='#iconSort'></use></svg></span>
<span class="fn__space"></span>
<span data-type="expand" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.expand} ${updateHotkeyTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
<svg><use xlink:href="#iconFullscreen"></use></svg>
<svg><use xlink:href="#iconExpand"></use></svg>
</span>
<span class="fn__space"></span>
<span data-type="collapse" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.collapse} ${updateHotkeyTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
Expand All @@ -117,7 +117,7 @@ export class Backlink extends Model {
<span data-type="mSort" data-sort="3" class="block__icon b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.sort}"><svg><use xlink:href='#iconSort'></use></svg></span>
<span class="fn__space"></span>
<span data-type="mExpand" class="block__icon b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.expand}">
<svg><use xlink:href="#iconFullscreen"></use></svg>
<svg><use xlink:href="#iconExpand"></use></svg>
</span>
<span class="fn__space"></span>
<span data-type="mCollapse" class="block__icon b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.collapse}">
Expand Down
2 changes: 1 addition & 1 deletion app/src/layout/dock/Bookmark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export class Bookmark extends Model {
<span data-type="refresh" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href='#iconRefresh'></use></svg></span>
<span class="fn__space"></span>
<span data-type="expand" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.expand} ${updateHotkeyTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
<svg><use xlink:href="#iconFullscreen"></use></svg>
<svg><use xlink:href="#iconExpand"></use></svg>
</span>
<span class="fn__space"></span>
<span data-type="collapse" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.collapse} ${updateHotkeyTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
Expand Down
2 changes: 1 addition & 1 deletion app/src/layout/dock/Graph.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ export class Graph extends Model {
<span data-type="refresh" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href='#iconRefresh'></use></svg></span>
<div class="fn__space"></div>
<div data-type="fullscreen" class="b3-tooltips b3-tooltips__sw block__icon" aria-label="${window.siyuan.languages.fullscreen}">
<svg><use xlink:href="#iconHideDock"></use></svg>
<svg><use xlink:href="#iconFullscreen"></use></svg>
</div>
<div class="fn__space"></div>
<div data-type="menu" class="b3-tooltips b3-tooltips__sw block__icon" aria-label="${window.siyuan.languages.more}">
Expand Down
2 changes: 1 addition & 1 deletion app/src/layout/dock/Outline.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export class Outline extends Model {
</div>
<span class="fn__flex-1 fn__space"></span>
<span data-type="expand" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.stickOpen} ${updateHotkeyTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
<svg><use xlink:href="#iconFullscreen"></use></svg>
<svg><use xlink:href="#iconExpand"></use></svg>
</span>
<span class="fn__space"></span>
<span data-type="collapse" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.collapse} ${updateHotkeyTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
Expand Down
2 changes: 1 addition & 1 deletion app/src/layout/dock/Tag.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class Tag extends Model {
<span data-type="refresh" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href='#iconRefresh'></use></svg></span>
<span class="fn__space"></span>
<span data-type="expand" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.expand} ${updateHotkeyTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
<svg><use xlink:href="#iconFullscreen"></use></svg>
<svg><use xlink:href="#iconExpand"></use></svg>
</span>
<span class="fn__space"></span>
<span data-type="collapse" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.collapse} ${updateHotkeyTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
Expand Down
4 changes: 2 additions & 2 deletions app/src/mobile/util/MobileBacklinks.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class MobileBacklinks {
</div>
<span class="counter listCount"></span>
<span class="fn__space"></span>
<svg data-type="expand" class="toolbar__icon"><use xlink:href="#iconFullscreen"></use></svg>
<svg data-type="expand" class="toolbar__icon"><use xlink:href="#iconExpand"></use></svg>
<span class="fn__space"></span>
<svg data-type="collapse" class="toolbar__icon"><use xlink:href="#iconContract"></use></svg>
</div>
Expand All @@ -31,7 +31,7 @@ export class MobileBacklinks {
</div>
<span class="counter listMCount"></span>
<span class="fn__space"></span>
<svg data-type="mExpand" class="toolbar__icon"><use xlink:href="#iconFullscreen"></use></svg>
<svg data-type="mExpand" class="toolbar__icon"><use xlink:href="#iconExpand"></use></svg>
<span class="fn__space"></span>
<svg data-type="mCollapse" class="toolbar__icon"><use xlink:href="#iconContract"></use></svg>
<span class="fn__space"></span>
Expand Down
2 changes: 1 addition & 1 deletion app/src/mobile/util/MobileBookmarks.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class MobileBookmarks {
${window.siyuan.languages.bookmark}
</div>
<span class="fn__space"></span>
<svg data-type="expand" class="toolbar__icon"><use xlink:href="#iconFullscreen"></use></svg>
<svg data-type="expand" class="toolbar__icon"><use xlink:href="#iconExpand"></use></svg>
<span class="fn__space"></span>
<svg data-type="collapse" class="toolbar__icon"><use xlink:href="#iconContract"></use></svg>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/src/mobile/util/MobileOutline.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class MobileOutline {
${window.siyuan.languages.outline}
</div>
<span class="fn__flex-1 fn__space"></span>
<svg data-type="expand" class="toolbar__icon"><use xlink:href="#iconFullscreen"></use></svg>
<svg data-type="expand" class="toolbar__icon"><use xlink:href="#iconExpand"></use></svg>
<span class="fn__space"></span>
<svg data-type="collapse" class="toolbar__icon"><use xlink:href="#iconContract"></use></svg>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/src/mobile/util/MobileTags.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class MobileTags {
${window.siyuan.languages.tag}
</div>
<span class="fn__space"></span>
<svg data-type="expand" class="toolbar__icon"><use xlink:href="#iconFullscreen"></use></svg>
<svg data-type="expand" class="toolbar__icon"><use xlink:href="#iconExpand"></use></svg>
<span class="fn__space"></span>
<svg data-type="collapse" class="toolbar__icon"><use xlink:href="#iconContract"></use></svg>
<span class="fn__space${window.siyuan.config.readonly ? " fn__none" : ""}"></span>
Expand Down
4 changes: 2 additions & 2 deletions app/src/protyle/breadcrumb/action.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/protyle/breadcrumb/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: () => {
Expand Down

0 comments on commit 97318de

Please sign in to comment.