mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-03-13 16:06:13 +01:00
This commit is contained in:
parent
57bc6db377
commit
bc016afea1
6 changed files with 17 additions and 8 deletions
|
|
@ -55,9 +55,6 @@ ctrl+p 搜索: 202
|
||||||
// 需大于 .block__popover
|
// 需大于 .block__popover
|
||||||
.b3-menu: 210
|
.b3-menu: 210
|
||||||
|
|
||||||
// 需大于 mobile .status
|
|
||||||
.keyboard: 222
|
|
||||||
|
|
||||||
// 需小于 .b3-dialog 关于中的锁屏密码设置
|
// 需小于 .b3-dialog 关于中的锁屏密码设置
|
||||||
#menu & .side-panel: 220
|
#menu & .side-panel: 220
|
||||||
|
|
||||||
|
|
@ -65,6 +62,9 @@ ctrl+p 搜索: 202
|
||||||
// 需大于 .protyle-util https://github.com/siyuan-note/siyuan/issues/5069
|
// 需大于 .protyle-util https://github.com/siyuan-note/siyuan/issues/5069
|
||||||
.b3-dialog: 305
|
.b3-dialog: 305
|
||||||
|
|
||||||
|
// 需大于 mobile .status、.b3-dialog
|
||||||
|
.keyboard: 306
|
||||||
|
|
||||||
// 历史中切换笔记本需临时大于 .b3-dialog https://github.com/siyuan-note/siyuan/issues/5107
|
// 历史中切换笔记本需临时大于 .b3-dialog https://github.com/siyuan-note/siyuan/issues/5107
|
||||||
// 移动端排序和菜单需临时大于 .side-panel https://github.com/siyuan-note/siyuan/issues/5254
|
// 移动端排序和菜单需临时大于 .side-panel https://github.com/siyuan-note/siyuan/issues/5254
|
||||||
.b3-menu: 310
|
.b3-menu: 310
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@
|
||||||
|
|
||||||
&-item {
|
&-item {
|
||||||
line-height: 28px;
|
line-height: 28px;
|
||||||
|
min-height: 28px;
|
||||||
padding: 1px 4px;
|
padding: 1px 4px;
|
||||||
display: flex;
|
display: flex;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|
|
||||||
|
|
@ -253,7 +253,7 @@
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
height: 42px;
|
height: 42px;
|
||||||
background: var(--b3-theme-background);
|
background: var(--b3-theme-background);
|
||||||
z-index: 222;
|
z-index: 306;
|
||||||
display: flex;
|
display: flex;
|
||||||
border-top: 1px solid var(--b3-theme-surface-lighter);
|
border-top: 1px solid var(--b3-theme-surface-lighter);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
|
||||||
|
|
@ -179,7 +179,7 @@ ${unicode2Emoji(childItem.ial.icon, false, "b3-list-item__graphic", true)}
|
||||||
${unicode2Emoji(item.ial.icon, false, "b3-list-item__graphic", true)}
|
${unicode2Emoji(item.ial.icon, false, "b3-list-item__graphic", true)}
|
||||||
<span class="b3-list-item__text">${item.content}</span>
|
<span class="b3-list-item__text">${item.content}</span>
|
||||||
</div>
|
</div>
|
||||||
<span class="b3-list-item__meta b3-list-item__meta--ellipsis"">${escapeGreat(title)}</span>
|
<span class="b3-list-item__text b3-list-item__meta" style="margin-top: -4px">${escapeGreat(title)}</span>
|
||||||
</div>`;
|
</div>`;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -350,7 +350,7 @@ const initSearchEvent = (element: Element, config: ISearchOption) => {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
break;
|
break;
|
||||||
} else if (type === "include") {
|
} else if (type === "include" && !target.hasAttribute("disabled")){
|
||||||
target.classList.toggle("toolbar__icon--active");
|
target.classList.toggle("toolbar__icon--active");
|
||||||
if (target.classList.contains("toolbar__icon--active")) {
|
if (target.classList.contains("toolbar__icon--active")) {
|
||||||
config.idPath.forEach((item, index) => {
|
config.idPath.forEach((item, index) => {
|
||||||
|
|
@ -486,7 +486,7 @@ export const popSearch = (config = window.siyuan.storage[Constants.LOCAL_SEARCHD
|
||||||
html: `<div class="fn__flex-column" style="height: 100%">
|
html: `<div class="fn__flex-column" style="height: 100%">
|
||||||
<div class="toolbar toolbar--border${config.hasReplace ? "" : " fn__none"}">
|
<div class="toolbar toolbar--border${config.hasReplace ? "" : " fn__none"}">
|
||||||
<svg class="toolbar__icon"><use xlink:href="#iconReplace"></use></svg>
|
<svg class="toolbar__icon"><use xlink:href="#iconReplace"></use></svg>
|
||||||
<input id="toolbarReplace" class="b3-text-field fn__flex-1">
|
<input id="toolbarReplace" style="font-size: 17px" class="b3-text-field fn__flex-1">
|
||||||
<svg class="fn__rotate fn__none toolbar__icon"><use xlink:href="#iconRefresh"></use></svg>
|
<svg class="fn__rotate fn__none toolbar__icon"><use xlink:href="#iconRefresh"></use></svg>
|
||||||
<div class="fn__space"></div>
|
<div class="fn__space"></div>
|
||||||
<button data-type="replace-all" class="b3-button b3-button--outline fn__flex-center">${window.siyuan.languages.replaceAll}</button>
|
<button data-type="replace-all" class="b3-button b3-button--outline fn__flex-center">${window.siyuan.languages.replaceAll}</button>
|
||||||
|
|
|
||||||
|
|
@ -258,6 +258,10 @@ export const showKeyboardToolbar = (height: number) => {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
toolbarElement.classList.remove("fn__none");
|
toolbarElement.classList.remove("fn__none");
|
||||||
|
const searchPathElement = document.getElementById("searchPath");
|
||||||
|
if (searchPathElement) {
|
||||||
|
(searchPathElement.nextElementSibling as HTMLElement).style.marginBottom = "42px"
|
||||||
|
}
|
||||||
const range = getSelection().getRangeAt(0);
|
const range = getSelection().getRangeAt(0);
|
||||||
if (!window.siyuan.mobile.editor ||
|
if (!window.siyuan.mobile.editor ||
|
||||||
!window.siyuan.mobile.editor.protyle.wysiwyg.element.contains(range.startContainer)) {
|
!window.siyuan.mobile.editor.protyle.wysiwyg.element.contains(range.startContainer)) {
|
||||||
|
|
@ -286,6 +290,10 @@ export const hideKeyboardToolbar = () => {
|
||||||
toolbarElement.classList.add("fn__none");
|
toolbarElement.classList.add("fn__none");
|
||||||
toolbarElement.style.height = "";
|
toolbarElement.style.height = "";
|
||||||
window.siyuan.mobile.editor.protyle.element.style.marginBottom = "";
|
window.siyuan.mobile.editor.protyle.element.style.marginBottom = "";
|
||||||
|
const searchPathElement = document.getElementById("searchPath");
|
||||||
|
if (searchPathElement) {
|
||||||
|
(searchPathElement.nextElementSibling as HTMLElement).style.marginBottom = ""
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const activeBlur = () => {
|
export const activeBlur = () => {
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,7 @@ export const movePathTo = (cb: (toPath: string[], toNotebook: string[]) => void,
|
||||||
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
|
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
|
||||||
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
|
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
|
||||||
</div>`,
|
</div>`,
|
||||||
width: isMobile() ? "80vw" : "50vw",
|
width: isMobile() ? "90vw" : "50vw",
|
||||||
destroyCallback() {
|
destroyCallback() {
|
||||||
if (range) {
|
if (range) {
|
||||||
focusByRange(range);
|
focusByRange(range);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue