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

🎨 fix https://github.com/siyuan-note/siyuan/issues/7650

Browse source
This commit is contained in:
Vanessa 2023-03-13 16:01:30 +08:00
parent 38f0b0f469
commit aad60b4d4e
9 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/appearance/icons/ant/icon.js
View file

@ -1,5 +1,11 @@
document.body.insertAdjacentHTML('afterBegin', `<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg"> document.body.insertAdjacentHTML('afterBegin', `<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg">
<defs> <defs>
<symbol id="iconScrollHoriz" viewBox="0 0 32 32">
<path d="M8.367 27.8l-7.117-7.117 7.117-7.117 1.549 1.549-4.462 4.462h11.652v2.212h-11.652l4.462 4.462zM23.633 18.434l-1.549-1.549 4.462-4.462h-11.652v-2.213h11.652l-4.462-4.462 1.549-1.549 7.117 7.117z"></path>
</symbol>
<symbol id="iconScrollVert" viewBox="0 0 32 32">
<path d="M10.075 17.163v-11.85l-4.5 4.5-1.575-1.575 7.237-7.237 7.238 7.237-1.575 1.575-4.575-4.537v11.887zM20.762 31l-7.238-7.275 1.575-1.538 4.5 4.5v-11.85h2.25v11.887l4.575-4.538 1.575 1.575z"></path>
</symbol>
<symbol id="iconSparkles" viewBox="0 0 32 32"> <symbol id="iconSparkles" viewBox="0 0 32 32">
<path d="M25.96 10.739l-1.464-3.405-3.541-1.566 3.541-1.532 1.464-3.235 1.464 3.235 3.541 1.532-3.541 1.566-1.464 3.405zM25.96 31l-1.464-3.269-3.541-1.532 3.541-1.532 1.464-3.439 1.464 3.439 3.541 1.532-3.541 1.532-1.464 3.269zM11.011 25.756l-3.133-6.708-6.844-3.065 6.844-3.065 3.133-6.674 3.167 6.674 6.81 3.065-6.81 3.065-3.167 6.708zM11.011 20.716l1.635-3.269 3.337-1.464-3.337-1.464-1.635-3.269-1.6 3.269-3.371 1.464 3.371 1.464 1.6 3.269z"></path> <path d="M25.96 10.739l-1.464-3.405-3.541-1.566 3.541-1.532 1.464-3.235 1.464 3.235 3.541 1.532-3.541 1.566-1.464 3.405zM25.96 31l-1.464-3.269-3.541-1.532 3.541-1.532 1.464-3.439 1.464 3.439 3.541 1.532-3.541 1.532-1.464 3.269zM11.011 25.756l-3.133-6.708-6.844-3.065 6.844-3.065 3.133-6.674 3.167 6.674 6.81 3.065-6.81 3.065-3.167 6.708zM11.011 20.716l1.635-3.269 3.337-1.464-3.337-1.464-1.635-3.269-1.6 3.269-3.371 1.464 3.371 1.464 1.6 3.269z"></path>
</symbol> </symbol>

2
app/appearance/icons/ant/icon.json
View file

@ -2,5 +2,5 @@
"name": "ant", "name": "ant",
"author": "Vanessa", "author": "Vanessa",
"url": "https://github.com/Vanessa219", "url": "https://github.com/Vanessa219",
"version": "1.14.0" "version": "1.15.0"
} }

12
app/appearance/icons/index.html
View file

@ -28,6 +28,18 @@
<body> <body>
<h2>SiYuan</h2> <h2>SiYuan</h2>
<div class="fn__clear"> <div class="fn__clear">
<div>
<svg>
<use xlink:href="#iconScrollHoriz"></use>
</svg>
iconScrollHoriz
</div>
<div>
<svg>
<use xlink:href="#iconScrollVert"></use>
</svg>
iconScrollVert
</div>
<div> <div>
<svg> <svg>
<use xlink:href="#iconSparkles"></use> <use xlink:href="#iconSparkles"></use>

6
app/appearance/icons/material/icon.js
View file

@ -1,5 +1,11 @@
document.body.insertAdjacentHTML('afterbegin', `<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg"> document.body.insertAdjacentHTML('afterbegin', `<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg">
<defs> <defs>
<symbol id="iconScrollHoriz" viewBox="0 0 32 32">
<path d="M8.367 27.8l-7.117-7.117 7.117-7.117 1.549 1.549-4.462 4.462h11.652v2.212h-11.652l4.462 4.462zM23.633 18.434l-1.549-1.549 4.462-4.462h-11.652v-2.213h11.652l-4.462-4.462 1.549-1.549 7.117 7.117z"></path>
</symbol>
<symbol id="iconScrollVert" viewBox="0 0 32 32">
<path d="M10.075 17.163v-11.85l-4.5 4.5-1.575-1.575 7.237-7.237 7.238 7.237-1.575 1.575-4.575-4.537v11.887zM20.762 31l-7.238-7.275 1.575-1.538 4.5 4.5v-11.85h2.25v11.887l4.575-4.538 1.575 1.575z"></path>
</symbol>
<symbol id="iconSparkles" viewBox="0 0 32 32"> <symbol id="iconSparkles" viewBox="0 0 32 32">
<path d="M25.96 10.739l-1.464-3.405-3.541-1.566 3.541-1.532 1.464-3.235 1.464 3.235 3.541 1.532-3.541 1.566-1.464 3.405zM25.96 31l-1.464-3.269-3.541-1.532 3.541-1.532 1.464-3.439 1.464 3.439 3.541 1.532-3.541 1.532-1.464 3.269zM11.011 25.756l-3.133-6.708-6.844-3.065 6.844-3.065 3.133-6.674 3.167 6.674 6.81 3.065-6.81 3.065-3.167 6.708zM11.011 20.716l1.635-3.269 3.337-1.464-3.337-1.464-1.635-3.269-1.6 3.269-3.371 1.464 3.371 1.464 1.6 3.269z"></path> <path d="M25.96 10.739l-1.464-3.405-3.541-1.566 3.541-1.532 1.464-3.235 1.464 3.235 3.541 1.532-3.541 1.566-1.464 3.405zM25.96 31l-1.464-3.269-3.541-1.532 3.541-1.532 1.464-3.439 1.464 3.439 3.541 1.532-3.541 1.532-1.464 3.269zM11.011 25.756l-3.133-6.708-6.844-3.065 6.844-3.065 3.133-6.674 3.167 6.674 6.81 3.065-6.81 3.065-3.167 6.708zM11.011 20.716l1.635-3.269 3.337-1.464-3.337-1.464-1.635-3.269-1.6 3.269-3.371 1.464 3.371 1.464 1.6 3.269z"></path>
</symbol> </symbol>

2
app/appearance/icons/material/icon.json
View file

@ -2,5 +2,5 @@
"name": "material", "name": "material",
"author": "Vanessa", "author": "Vanessa",
"url": "https://github.com/Vanessa219", "url": "https://github.com/Vanessa219",
"version": "1.14.0" "version": "1.15.0"
} }

6
app/src/asset/index.ts
View file

@ -198,11 +198,11 @@ export class Asset extends Model {
</button> </button>
<div class="horizontalToolbarSeparator b3-menu__separator"></div> <div class="horizontalToolbarSeparator b3-menu__separator"></div>
<button id="scrollVertical" class="secondaryToolbarButton b3-menu__item scrollModeButtons scrollVertical toggled" tabindex="62"> <button id="scrollVertical" class="secondaryToolbarButton b3-menu__item scrollModeButtons scrollVertical toggled" tabindex="62">
<svg class="b3-menu__icon"><use xlink:href="#iconSplitTB"></use></svg> <svg class="b3-menu__icon"><use xlink:href="#iconScrollVert"></use></svg>
<span class="b3-menu__label">${window.siyuan.languages.scrollVertical}</span> <span class="b3-menu__label">${window.siyuan.languages.scrollVertical}</span>
</button> </button>
<button id="scrollHorizontal" class="secondaryToolbarButton b3-menu__item scrollModeButtons scrollHorizontal" tabindex="63"> <button id="scrollHorizontal" class="secondaryToolbarButton b3-menu__item scrollModeButtons scrollHorizontal" tabindex="63">
<svg class="b3-menu__icon"><use xlink:href="#iconSplitLR"></use></svg> <svg class="b3-menu__icon"><use xlink:href="#iconScrollHoriz"></use></svg>
<span class="b3-menu__label">${window.siyuan.languages.scrollHorizontal}</span> <span class="b3-menu__label">${window.siyuan.languages.scrollHorizontal}</span>
</button> </button>
<button id="scrollWrapped" class="secondaryToolbarButton b3-menu__item scrollModeButtons scrollWrapped" tabindex="64"> <button id="scrollWrapped" class="secondaryToolbarButton b3-menu__item scrollModeButtons scrollWrapped" tabindex="64">
@ -236,7 +236,7 @@ export class Asset extends Model {
<div id="toolbarContainer"> <div id="toolbarContainer">
<div id="toolbarViewer"> <div id="toolbarViewer">
<button id="sidebarToggle" class="toolbarButton b3-tooltips b3-tooltips__se" tabindex="11" aria-expanded="false" aria-controls="sidebarContainer" aria-label="${window.siyuan.languages.toggleSidebarNotification2Title}"> <button id="sidebarToggle" class="toolbarButton b3-tooltips b3-tooltips__se" tabindex="11" aria-expanded="false" aria-controls="sidebarContainer" aria-label="${window.siyuan.languages.toggleSidebarNotification2Title}">
<svg><use xlink:href="#iconBoth"></use></svg> <svg><use xlink:href="#iconLayoutRight"></use></svg>
</button> </button>
<button id="viewFind" class="toolbarButton b3-tooltips b3-tooltips__s" tabindex="12" aria-expanded="false" aria-controls="findbar" aria-label="${window.siyuan.languages.search}"> <button id="viewFind" class="toolbarButton b3-tooltips b3-tooltips__s" tabindex="12" aria-expanded="false" aria-controls="findbar" aria-label="${window.siyuan.languages.search}">
<svg><use xlink:href="#iconSearch"></use></svg> <svg><use xlink:href="#iconSearch"></use></svg>

2
app/src/layout/dock/Graph.ts
View file

@ -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> <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 class="fn__space"></div>
<div data-type="fullscreen" class="b3-tooltips b3-tooltips__sw block__icon" aria-label="${window.siyuan.languages.fullscreen}"> <div data-type="fullscreen" class="b3-tooltips b3-tooltips__sw block__icon" aria-label="${window.siyuan.languages.fullscreen}">
<svg><use xlink:href="#iconFullscreen"></use></svg> <svg><use xlink:href="#iconHideDock"></use></svg>
</div> </div>
<div class="fn__space"></div> <div class="fn__space"></div>
<div data-type="menu" class="b3-tooltips b3-tooltips__sw block__icon" aria-label="${window.siyuan.languages.more}"> <div data-type="menu" class="b3-tooltips b3-tooltips__sw block__icon" aria-label="${window.siyuan.languages.more}">

4
app/src/protyle/breadcrumb/action.ts
View file

@ -58,9 +58,9 @@ export const fullscreen = (element: Element, btnElement?: Element) => {
if (btnElement) { if (btnElement) {
if (isFullscreen) { if (isFullscreen) {
btnElement.querySelector("use").setAttribute("xlink:href", "#iconFullscreen"); btnElement.querySelector("use").setAttribute("xlink:href", "#iconHideDock");
} else { } else {
btnElement.querySelector("use").setAttribute("xlink:href", "#iconContract"); btnElement.querySelector("use").setAttribute("xlink:href", "#iconDock");
} }
const dockLayoutElement = hasClosestByClassName(element, "layout--float"); const dockLayoutElement = hasClosestByClassName(element, "layout--float");
if (dockLayoutElement) { if (dockLayoutElement) {

2
app/src/protyle/breadcrumb/index.ts
View file

@ -325,7 +325,7 @@ export class Breadcrumb {
}).element); }).element);
if (!isMobile()) { if (!isMobile()) {
window.siyuan.menus.menu.append(new MenuItem({ window.siyuan.menus.menu.append(new MenuItem({
icon: "iconFullscreen", icon: "iconHideDock",
accelerator: window.siyuan.config.keymap.editor.general.fullscreen.custom, accelerator: window.siyuan.config.keymap.editor.general.fullscreen.custom,
label: window.siyuan.languages.fullscreen, label: window.siyuan.languages.fullscreen,
click: () => { click: () => {