diff --git a/app/appearance/themes/daylight/theme.css b/app/appearance/themes/daylight/theme.css index ec91716fd..9f1d2e593 100644 --- a/app/appearance/themes/daylight/theme.css +++ b/app/appearance/themes/daylight/theme.css @@ -11,6 +11,7 @@ --b3-theme-surface-light: rgba(243, 243, 243, .86); --b3-theme-surface-lighter: #e0e0e0; --b3-theme-error: #d23f31; + --b3-theme-success: #65b84d; /* 文字颜色 */ --b3-theme-on-primary: #fff; diff --git a/app/appearance/themes/daylight/theme.json b/app/appearance/themes/daylight/theme.json index 3474fdd7a..d2eb4e835 100644 --- a/app/appearance/themes/daylight/theme.json +++ b/app/appearance/themes/daylight/theme.json @@ -2,7 +2,7 @@ "name": "daylight", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.0.5", + "version": "1.0.6", "modes": [ "light" ] diff --git a/app/appearance/themes/midnight/theme.css b/app/appearance/themes/midnight/theme.css index 879628733..b670aa315 100644 --- a/app/appearance/themes/midnight/theme.css +++ b/app/appearance/themes/midnight/theme.css @@ -11,6 +11,7 @@ --b3-theme-surface-light: rgba(41, 42, 45, .86); --b3-theme-surface-lighter: rgba(230, 230, 230, .06); --b3-theme-error: #d23f31; + --b3-theme-success: #65b84d; /* 文字颜色 */ --b3-theme-on-primary: #fff; diff --git a/app/appearance/themes/midnight/theme.json b/app/appearance/themes/midnight/theme.json index e47505edb..eddf47d7c 100644 --- a/app/appearance/themes/midnight/theme.json +++ b/app/appearance/themes/midnight/theme.json @@ -2,7 +2,7 @@ "name": "midnight", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.0.5", + "version": "1.0.6", "modes": [ "dark" ] diff --git a/app/src/assets/scss/util/_function.scss b/app/src/assets/scss/util/_function.scss index 0f51b13e1..aedb40bd0 100644 --- a/app/src/assets/scss/util/_function.scss +++ b/app/src/assets/scss/util/_function.scss @@ -175,6 +175,10 @@ color: var(--b3-theme-primary); } + &__success { + color: var(--b3-theme-success); + } + &__secondary { color: var(--b3-theme-secondary); } diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index e751e84d3..0d56bb986 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -19,7 +19,11 @@ import {resize} from "../protyle/util/resize"; import {setStorageVal} from "../protyle/util/compatibility"; const genCardCount = (unreviewedNewCardCount: number, unreviewedOldCardCount: number,) => { - return `${unreviewedNewCardCount} + ${unreviewedOldCardCount}`; + return `1 +/ +${unreviewedNewCardCount} ++ +${unreviewedOldCardCount}`; } export const genCardHTML = (options: { @@ -38,7 +42,7 @@ export const genCardHTML = (options: { iconsHTML = `
${window.siyuan.languages.riffCard} -
1/${genCardCount(options.cardsData.unreviewedNewCardCount, options.cardsData.unreviewedOldCardCount)}
+
${genCardCount(options.cardsData.unreviewedNewCardCount, options.cardsData.unreviewedOldCardCount)}
`; @@ -50,7 +54,7 @@ export const genCardHTML = (options: { ${window.siyuan.languages.riffCard}`} -
1/${genCardCount(options.cardsData.unreviewedNewCardCount, options.cardsData.unreviewedOldCardCount)}
+
${genCardCount(options.cardsData.unreviewedNewCardCount, options.cardsData.unreviewedOldCardCount)}
@@ -507,8 +511,8 @@ const nextCard = (options: { options.actionElements[1].classList.add("fn__none"); options.editor.protyle.element.classList.remove("fn__none"); options.editor.protyle.element.nextElementSibling.classList.add("fn__none"); - options.countElement.firstElementChild.innerHTML = (options.index + 1).toString(); - options.countElement.classList.remove("fn__none"); + options.countElement.innerHTML = (options.index + 1).toString(); + options.countElement.parentElement.classList.remove("fn__none"); if (options.index === 0) { options.actionElements[0].firstElementChild.setAttribute("disabled", "disabled"); } else { diff --git a/app/src/dialog/moveResize.ts b/app/src/dialog/moveResize.ts index c9e564a57..10663cc77 100644 --- a/app/src/dialog/moveResize.ts +++ b/app/src/dialog/moveResize.ts @@ -1,5 +1,6 @@ import {hasClosestByClassName} from "../protyle/util/hasClosest"; import {Constants} from "../constants"; +import {hideAllElements} from "../protyle/ui/hideElements"; export const moveResize = (element: HTMLElement, afterCB?: (type: string) => void) => { element.addEventListener("mousedown", (event: MouseEvent & { target: HTMLElement }) => { @@ -131,6 +132,7 @@ export const moveResize = (element: HTMLElement, afterCB?: (type: string) => voi documentSelf.ondragstart = null; documentSelf.onselectstart = null; documentSelf.onselect = null; + hideAllElements(["gutter"]) if (hasMove && afterCB) { afterCB(type); }