diff --git a/app/appearance/themes/daylight/theme.css b/app/appearance/themes/daylight/theme.css index eba11625e..654c5bc84 100644 --- a/app/appearance/themes/daylight/theme.css +++ b/app/appearance/themes/daylight/theme.css @@ -54,6 +54,9 @@ --b3-tooltips-color: var(--b3-theme-background-light); --b3-tooltips-shadow: 0 2px 8px rgba(0, 0, 0, .1); + /* 为空提示 */ + --b3-empty-color: var(--b3-theme-on-surface-light); + /* 遮罩 */ --b3-mask-background: rgba(220, 220, 220, .4); diff --git a/app/appearance/themes/daylight/theme.json b/app/appearance/themes/daylight/theme.json index aee14c7ae..cdb3f3502 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.2", + "version": "1.0.3", "modes": [ "light" ] diff --git a/app/appearance/themes/midnight/theme.css b/app/appearance/themes/midnight/theme.css index 37e459d1e..ff574aedf 100644 --- a/app/appearance/themes/midnight/theme.css +++ b/app/appearance/themes/midnight/theme.css @@ -54,6 +54,9 @@ --b3-tooltips-color: var(--b3-theme-on-surface-light); --b3-tooltips-shadow: 0 2px 8px rgba(0, 0, 0, .3); + /* 为空提示 */ + --b3-empty-color: var(--b3-theme-on-surface); + /* 遮罩 */ --b3-mask-background: rgba(10, 10, 10, 0.4); diff --git a/app/appearance/themes/midnight/theme.json b/app/appearance/themes/midnight/theme.json index 43df72dc5..844210f48 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.2", + "version": "1.0.3", "modes": [ "dark" ] diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index 554b14b1c..ae509a41b 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -474,7 +474,7 @@ html .protyle-wysiwyg [data-node-id]:last-child [spellcheck][contenteditable="true"]:empty:before { content: "Enter text"; - color: var(--b3-theme-on-surface-light); + color: var(--b3-empty-color); } html[lang="zh_CN"] .protyle-wysiwyg [data-node-id]:last-child [spellcheck][contenteditable="true"]:empty:before { diff --git a/app/src/boot/globalEvent/event.ts b/app/src/boot/globalEvent/event.ts index cec97c111..963fddca1 100644 --- a/app/src/boot/globalEvent/event.ts +++ b/app/src/boot/globalEvent/event.ts @@ -86,7 +86,7 @@ export const initWindowEvent = (app: App) => { const dockElement = hasClosestByClassName(target, "dock__item"); if (dockElement && dockElement.getAttribute("data-type")) { const dockRect = dockElement.getBoundingClientRect() - initDockMenu(dockElement).popup({x: dockRect.right, y: dockRect.bottom}); + initDockMenu(dockElement).popup({x: dockRect.right, y: dockRect.top}); event.stopImmediatePropagation(); event.preventDefault(); return; @@ -97,7 +97,8 @@ export const initWindowEvent = (app: App) => { if (tabElement) { const tabRect = tabElement.getBoundingClientRect() initTabMenu(app, (getInstanceById(tabElement.getAttribute("data-id")) as Tab)).popup({ - x: tabRect.left, y: tabRect.bottom + x: tabRect.left, + y: tabRect.bottom }); hideTooltip() event.stopImmediatePropagation(); diff --git a/app/src/boot/globalEvent/touch.ts b/app/src/boot/globalEvent/touch.ts index 9681cafad..6ddd5e8f2 100644 --- a/app/src/boot/globalEvent/touch.ts +++ b/app/src/boot/globalEvent/touch.ts @@ -22,7 +22,7 @@ export const globalTouchEnd = (event: TouchEvent, yDiff: number, time: number, a const menu = initNavigationMenu(app, fileItemElement); if (isIPadBoolean) { const rect = fileItemElement.getBoundingClientRect() - menu.popup({x: rect.right, y: rect.bottom, h: rect.height}) + menu.popup({x: rect.right - 52, y: rect.bottom, h: rect.height}) hideTooltip() } else { window.siyuan.menus.menu.fullscreen("bottom"); @@ -33,7 +33,7 @@ export const globalTouchEnd = (event: TouchEvent, yDiff: number, time: number, a const menu = initFileMenu(app, rootElement.dataset.url, fileItemElement.dataset.path, fileItemElement); if (isIPadBoolean) { const rect = fileItemElement.getBoundingClientRect() - menu.popup({x: rect.right, y: rect.bottom, h: rect.height}) + menu.popup({x: rect.right - 52, y: rect.bottom, h: rect.height}) hideTooltip() } else { window.siyuan.menus.menu.fullscreen("bottom");