Browse Source

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

Vanessa 2 years ago
parent
commit
8a73e08acd

+ 11 - 9
app/src/assets/scss/component/_snackbar.scss

@@ -57,6 +57,10 @@
     text-align: left;
     display: inline-block;
 
+    &--close {
+      padding-right: 27px;
+    }
+
     a {
       color: var(--b3-theme-on-primary);
       text-decoration: underline;
@@ -70,18 +74,16 @@
   &__close {
     position: absolute;
     cursor: pointer;
-    top: 10px;
-    right: 1px;
-    height: 8px;
-    width: 8px;
-    padding: 4px;
-    border-radius: 10px;
-    color: var(--b3-theme-background-light);
+    height: 16px;
+    width: 16px;
+    color: var(--b3-theme-on-primary);
     transition: var(--b3-transition);
+    opacity: .68;
+    right: 5px;
+    top: 10px;
 
     &:hover {
-      color: var(--b3-theme-on-background);
-      background-color: var(--b3-theme-background-light);
+      opacity: 1;
     }
   }
 }

+ 0 - 10
app/src/assets/scss/mobile.scss

@@ -271,16 +271,6 @@
         padding: 4px;
         height: 32px;
       }
-
-      &.keyboard__svg--close {
-        height: 12px;
-        background-color: var(--b3-theme-on-surface-light);
-        width: 12px;
-        padding: 4px;
-        border-radius: 10px;
-        margin: 10px;
-        color: var(--b3-theme-on-primary);
-      }
     }
   }
 }

+ 3 - 3
app/src/dialog/message.ts

@@ -32,7 +32,7 @@ export const showMessage = (message: string, timeout = 6000, type = "info", mess
     const existElement = messagesElement.querySelector(`.b3-snackbar[data-id="${id}"]`);
     if (existElement) {
         window.clearTimeout(parseInt(existElement.getAttribute("data-timeoutid")));
-        existElement.innerHTML = `<div class="b3-snackbar__content">${message}</div>${timeout === 0 ? '<svg class="b3-snackbar__close"><use xlink:href="#iconClose"></use></svg>' : ""}`;
+        existElement.innerHTML = `<div class="b3-snackbar__content${timeout === 0 ? " b3-snackbar__content--close" : ""}">${message}</div>${timeout === 0 ? '<svg class="b3-snackbar__close"><use xlink:href="#iconCloseRound"></use></svg>' : ""}`;
         if (type === "error") {
             existElement.classList.add("b3-snackbar--error");
         } else {
@@ -46,9 +46,9 @@ export const showMessage = (message: string, timeout = 6000, type = "info", mess
         }
         return;
     }
-    let messageHTML = `<div data-id="${id}" class="b3-snackbar--hide b3-snackbar${type === "error" ? " b3-snackbar--error" : ""}"><div class="b3-snackbar__content">${message}</div>`;
+    let messageHTML = `<div data-id="${id}" class="b3-snackbar--hide b3-snackbar${type === "error" ? " b3-snackbar--error" : ""}"><div class="b3-snackbar__content${timeout === 0 ? " b3-snackbar__content--close" : ""}">${message}</div>`;
     if (timeout === 0) {
-        messageHTML += '<svg class="b3-snackbar__close"><use xlink:href="#iconClose"></use></svg>';
+        messageHTML += '<svg class="b3-snackbar__close"><use xlink:href="#iconCloseRound"></use></svg>';
     } else if (timeout !== -1) { // -1 时需等待请求完成后手动关闭
         const timeoutId = window.setTimeout(() => {
             hideMessage(id);

+ 1 - 1
app/src/index.ts

@@ -103,7 +103,7 @@ class App {
                                 downloadProgress(data.data);
                                 break;
                             case "txerr":
-                                transactionError(data);
+                                transactionError();
                                 break;
                             case "syncing":
                                 processSync(data);

+ 1 - 1
app/src/mobile/util/keyboardToolbar.ts

@@ -192,7 +192,7 @@ export const initKeyboardToolbar = () => {
             <button class="keyboard__action" data-type="tag"><svg><use xlink:href="#iconTags"></use></svg></button>
             <button class="keyboard__action" data-type="inline-math"><svg><use xlink:href="#iconMath"></use></svg></button>
             <button class="keyboard__action" data-type="inline-memo"><svg><use xlink:href="#iconM"></use></svg></button>
-            <button class="keyboard__action" data-type="goback"><svg class="keyboard__svg--close"><use xlink:href="#iconClose"></use></svg></button>
+            <button class="keyboard__action" data-type="goback"><svg><use xlink:href="#iconCloseRound"></use></svg></button>
         </div>
     </div>
     <span class="keyboard__split"></span>