Browse Source

:art: fix https://github.com/siyuan-note/siyuan/issues/6338

Vanessa 2 years ago
parent
commit
4b33bc080a

+ 6 - 0
app/appearance/icons/ant/icon.js

@@ -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">
 <defs>
+    <symbol id="iconLayoutBottom" viewBox="0 0 32 32">
+    <path d="M30.4 1.6c0.884 0 1.6 0.716 1.6 1.6v0 25.6c0 0.884-0.716 1.6-1.6 1.6v0h-28.8c-0.884 0-1.6-0.716-1.6-1.6v0-25.6c0-0.884 0.716-1.6 1.6-1.6v0h28.8zM28.8 4.8h-25.6v22.4h25.6v-22.4zM25.6 20.8v3.2h-19.2v-3.2h19.2z"></path>
+  </symbol>
+  <symbol id="iconLayoutRight" viewBox="0 0 32 32">
+    <path d="M30.4 1.6c0.884 0 1.6 0.716 1.6 1.6v0 25.6c0 0.884-0.716 1.6-1.6 1.6v0h-28.8c-0.884 0-1.6-0.716-1.6-1.6v0-25.6c0-0.884 0.716-1.6 1.6-1.6v0h28.8zM28.8 4.8h-25.6v22.4h25.6v-22.4zM25.6 8v16h-3.2v-16h3.2z"></path>
+  </symbol>
   <symbol id="iconRef" viewBox="0 0 32 32">
     <path d="M2.545 28.491q-1.055 0-1.8-0.745t-0.745-1.8 0.745-1.8 1.8-0.745q0.182 0 0.364 0.018t0.473 0.091l7.273-7.273q-0.073-0.291-0.091-0.473t-0.018-0.364q0-1.055 0.745-1.8t1.8-0.745 1.8 0.745 0.745 1.8q0 0.073-0.109 0.836l4 4q0.291-0.073 0.473-0.091t0.364-0.018 0.364 0.018 0.473 0.091l5.818-5.818q-0.073-0.291-0.091-0.473t-0.018-0.364q0-1.055 0.745-1.8t1.8-0.745 1.8 0.745 0.745 1.8-0.745 1.8-1.8 0.745q-0.182 0-0.364-0.018t-0.473-0.091l-5.818 5.818q0.073 0.291 0.091 0.473t0.018 0.364q0 1.055-0.745 1.8t-1.8 0.745-1.8-0.745-0.745-1.8q0-0.182 0.018-0.364t0.091-0.473l-4-4q-0.291 0.073-0.473 0.091t-0.364 0.018q-0.073 0-0.836-0.109l-7.273 7.273q0.073 0.291 0.091 0.473t0.018 0.364q0 1.055-0.745 1.8t-1.8 0.745zM4.364 12.418l-0.727-1.6-1.6-0.727 1.6-0.727 0.727-1.6 0.727 1.6 1.6 0.727-1.6 0.727zM20.363 10.564l-1.127-2.4-2.4-1.127 2.4-1.127 1.127-2.4 1.127 2.4 2.4 1.127-2.4 1.127z"></path>
   </symbol>

+ 1 - 1
app/appearance/icons/ant/icon.json

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

+ 12 - 0
app/appearance/icons/index.html

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

+ 6 - 0
app/appearance/icons/material/icon.js

@@ -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">
 <defs>
+  <symbol id="iconLayoutBottom" viewBox="0 0 32 32">
+    <path d="M30.4 1.6c0.884 0 1.6 0.716 1.6 1.6v0 25.6c0 0.884-0.716 1.6-1.6 1.6v0h-28.8c-0.884 0-1.6-0.716-1.6-1.6v0-25.6c0-0.884 0.716-1.6 1.6-1.6v0h28.8zM28.8 4.8h-25.6v22.4h25.6v-22.4zM25.6 20.8v3.2h-19.2v-3.2h19.2z"></path>
+  </symbol>
+  <symbol id="iconLayoutRight" viewBox="0 0 32 32">
+    <path d="M30.4 1.6c0.884 0 1.6 0.716 1.6 1.6v0 25.6c0 0.884-0.716 1.6-1.6 1.6v0h-28.8c-0.884 0-1.6-0.716-1.6-1.6v0-25.6c0-0.884 0.716-1.6 1.6-1.6v0h28.8zM28.8 4.8h-25.6v22.4h25.6v-22.4zM25.6 8v16h-3.2v-16h3.2z"></path>
+  </symbol>
   <symbol id="iconRef" viewBox="0 0 32 32">
     <path d="M2.545 28.491q-1.055 0-1.8-0.745t-0.745-1.8 0.745-1.8 1.8-0.745q0.182 0 0.364 0.018t0.473 0.091l7.273-7.273q-0.073-0.291-0.091-0.473t-0.018-0.364q0-1.055 0.745-1.8t1.8-0.745 1.8 0.745 0.745 1.8q0 0.073-0.109 0.836l4 4q0.291-0.073 0.473-0.091t0.364-0.018 0.364 0.018 0.473 0.091l5.818-5.818q-0.073-0.291-0.091-0.473t-0.018-0.364q0-1.055 0.745-1.8t1.8-0.745 1.8 0.745 0.745 1.8-0.745 1.8-1.8 0.745q-0.182 0-0.364-0.018t-0.473-0.091l-5.818 5.818q0.073 0.291 0.091 0.473t0.018 0.364q0 1.055-0.745 1.8t-1.8 0.745-1.8-0.745-0.745-1.8q0-0.182 0.018-0.364t0.091-0.473l-4-4q-0.291 0.073-0.473 0.091t-0.364 0.018q-0.073 0-0.836-0.109l-7.273 7.273q0.073 0.291 0.091 0.473t0.018 0.364q0 1.055-0.745 1.8t-1.8 0.745zM4.364 12.418l-0.727-1.6-1.6-0.727 1.6-0.727 0.727-1.6 0.727 1.6 1.6 0.727-1.6 0.727zM20.363 10.564l-1.127-2.4-2.4-1.127 2.4-1.127 1.127-2.4 1.127 2.4 2.4 1.127-2.4 1.127z"></path>
   </symbol>

+ 1 - 1
app/appearance/icons/material/icon.json

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

+ 2 - 2
app/src/menus/navigation.ts

@@ -245,14 +245,14 @@ export const initFileMenu = (notebookId: string, pathString: string, liElement:
     }
     /// #if !MOBILE
     const openSubmenus: IMenu[] = [{
-        icon: "iconRight",
+        icon: "iconLayoutRight",
         label: window.siyuan.languages.insertRight,
         accelerator: "⌥Click",
         click: () => {
             openFileById({id, position: "right", action: [Constants.CB_GET_FOCUS]});
         }
     }, {
-        icon: "iconDown",
+        icon: "iconLayoutBottom",
         label: window.siyuan.languages.insertBottom,
         click: () => {
             openFileById({id, position: "bottom", action: [Constants.CB_GET_FOCUS]});

+ 2 - 2
app/src/menus/protyle.ts

@@ -116,7 +116,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
     }).element);
     window.siyuan.menus.menu.append(new MenuItem({
         label: window.siyuan.languages.insertRight,
-        icon: "iconRight",
+        icon: "iconLayoutRight",
         accelerator: window.siyuan.config.keymap.editor.general.insertRight.custom + "/⌥Click",
         click() {
             fetchPost("/api/block/checkBlockFold", {id: refBlockId}, (foldResponse) => {
@@ -131,7 +131,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
     }).element);
     window.siyuan.menus.menu.append(new MenuItem({
         label: window.siyuan.languages.insertBottom,
-        icon: "iconDown",
+        icon: "iconLayoutBottom",
         accelerator: window.siyuan.config.keymap.editor.general.insertBottom.custom + (window.siyuan.config.keymap.editor.general.insertBottom.custom ? "/" : "") + "⇧Click",
         click() {
             fetchPost("/api/block/checkBlockFold", {id: refBlockId}, (foldResponse) => {

+ 2 - 2
app/src/menus/tab.ts

@@ -122,7 +122,7 @@ const splitSubMenu = (tab: Tab) => {
     }];
     if (tab.parent.children.length > 1) {
         subMenus.push({
-            icon: "iconRight",
+            icon: "iconLayoutRight",
             label: window.siyuan.languages.splitMoveR,
             click: () => {
                 const newWnd = tab.parent.split("lr");
@@ -142,7 +142,7 @@ const splitSubMenu = (tab: Tab) => {
 
     if (tab.parent.children.length > 1) {
         subMenus.push({
-            icon: "iconDown",
+            icon: "iconLayoutBottom",
             label: window.siyuan.languages.splitMoveB,
             click: () => {
                 const newWnd = tab.parent.split("tb");