diff --git a/app/src/assets/scss/component/_snackbar.scss b/app/src/assets/scss/component/_snackbar.scss index eae42224c..522e59c5f 100644 --- a/app/src/assets/scss/component/_snackbar.scss +++ b/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; } } } diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index bd0b7a75f..b36efa98e 100644 --- a/app/src/assets/scss/mobile.scss +++ b/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); - } } } } diff --git a/app/src/dialog/message.ts b/app/src/dialog/message.ts index 3a6323f3a..01b322218 100644 --- a/app/src/dialog/message.ts +++ b/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 = `
${message}
${timeout === 0 ? '' : ""}`; + existElement.innerHTML = `
${message}
${timeout === 0 ? '' : ""}`; 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 = `
${message}
`; + let messageHTML = `
${message}
`; if (timeout === 0) { - messageHTML += ''; + messageHTML += ''; } else if (timeout !== -1) { // -1 时需等待请求完成后手动关闭 const timeoutId = window.setTimeout(() => { hideMessage(id); diff --git a/app/src/index.ts b/app/src/index.ts index 3a8634b78..be9c04fbe 100644 --- a/app/src/index.ts +++ b/app/src/index.ts @@ -103,7 +103,7 @@ class App { downloadProgress(data.data); break; case "txerr": - transactionError(data); + transactionError(); break; case "syncing": processSync(data); diff --git a/app/src/mobile/util/keyboardToolbar.ts b/app/src/mobile/util/keyboardToolbar.ts index 1ad7c4a9e..a4071a457 100644 --- a/app/src/mobile/util/keyboardToolbar.ts +++ b/app/src/mobile/util/keyboardToolbar.ts @@ -192,7 +192,7 @@ export const initKeyboardToolbar = () => { - +