Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 18:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

💄

Browse source
This commit is contained in:
Vanessa 2023-04-21 09:51:04 +08:00
parent 685b7e1383
commit 49327bf274
9 changed files with 39 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/assets/scss/business/_block.scss
View file

@ -137,8 +137,8 @@
height: 42px; height: 42px;
flex-shrink: 0; flex-shrink: 0;
&--border { &--menu {
background-color: var(--b3-theme-surface); background-color: var(--b3-menu-background);
} }
&:hover .block__icon:not([disabled]) { &:hover .block__icon:not([disabled]) {

8
app/src/assets/scss/business/_search.scss
View file

@ -7,6 +7,8 @@
&--row { &--row {
flex-direction: row; flex-direction: row;
border-top: 1px solid var(--b3-theme-surface-lighter);
border-bottom: 1px solid var(--b3-theme-surface-lighter);
.search__preview { .search__preview {
border-top: 0; border-top: 0;
@ -98,12 +100,6 @@
border-top: 1px solid var(--b3-theme-surface-lighter); border-top: 1px solid var(--b3-theme-surface-lighter);
} }
&__result {
white-space: nowrap;
margin-left: 5px;
line-height: 24px;
}
&__drag { &__drag {
cursor: row-resize; cursor: row-resize;
width: 100%; width: 100%;

4
app/src/assets/scss/component/_button.scss
View file

@ -54,6 +54,10 @@
font-size: 12px; font-size: 12px;
} }
&--mid {
padding: 2px 8px;
}
&--text, &--text,
&--cancel { &--cancel {
color: var(--b3-theme-primary); color: var(--b3-theme-primary);

2
app/src/assets/scss/component/_typography.scss
View file

@ -628,7 +628,7 @@
border-radius: 4px; border-radius: 4px;
box-shadow: var(--b3-dialog-shadow); box-shadow: var(--b3-dialog-shadow);
border: 1px solid var(--b3-theme-surface-lighter); border: 1px solid var(--b3-theme-surface-lighter);
background-color: var(--b3-menu-background); background-color: var(--b3-theme-surface);
z-index: 304; z-index: 304;
padding: 4px; padding: 4px;
} }

2
app/src/assets/scss/pdf/_pdf.scss
View file

@ -624,7 +624,7 @@ a:focus > .thumbnail > .thumbnailSelectionRing,
padding: 8px; padding: 8px;
box-shadow: var(--b3-dialog-shadow); box-shadow: var(--b3-dialog-shadow);
border: 1px solid var(--b3-theme-surface-lighter); border: 1px solid var(--b3-theme-surface-lighter);
background-color: var(--b3-menu-background); background-color: var(--b3-theme-surface);
border-radius: 4px; border-radius: 4px;
width: 520px; width: 520px;
position: absolute; position: absolute;

2
app/src/block/Panel.ts
View file

@ -318,7 +318,7 @@ export class BlockPanel {
<span class="fn__space"></span>`; <span class="fn__space"></span>`;
} }
/// #endif /// #endif
let html = `<div class="block__icons block__icons--border"> let html = `<div class="block__icons block__icons--menu">
<span class="fn__space fn__flex-1"></span>${openHTML} <span class="fn__space fn__flex-1"></span>${openHTML}
<span data-type="pin" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.pin}"><svg><use xlink:href="#iconPin"></use></svg></span> <span data-type="pin" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.pin}"><svg><use xlink:href="#iconPin"></use></svg></span>
<span class="fn__space"></span> <span class="fn__space"></span>

31
app/src/dialog/processSystem.ts
View file

@ -34,28 +34,23 @@ export const kernelError = () => {
if (window.siyuan.config.system.container === "ios" && window.webkit?.messageHandlers) { if (window.siyuan.config.system.container === "ios" && window.webkit?.messageHandlers) {
iosReStart = `<div class="fn__hr"></div><div class="fn__flex"><div class="fn__flex-1"></div><button class="b3-button">${window.siyuan.languages.retry}</button></div>`; iosReStart = `<div class="fn__hr"></div><div class="fn__flex"><div class="fn__flex-1"></div><button class="b3-button">${window.siyuan.languages.retry}</button></div>`;
} }
const html = `<div class="b3-dialog__scrim"></div> const dialog = new Dialog({
<div class="b3-dialog__container" style="width: ${isMobile() ? "80vw" : "520px"}"> disableClose: true,
<div class="b3-dialog__header" onselectstart="return false;">💔 ${window.siyuan.languages.kernelFault0} <small>v${Constants.SIYUAN_VERSION}</small></div> title: `💔 ${window.siyuan.languages.kernelFault0} <small>v${Constants.SIYUAN_VERSION}</small>`,
<div class="b3-dialog__content"> width: isMobile() ? "92vw" : "520px",
<p>${window.siyuan.languages.kernelFault1}</p> content: `<div id="errorLog" class="b3-dialog__content">
<div class="ft__breakword">
<div>${window.siyuan.languages.kernelFault1}</div>
<div class="fn__hr"></div> <div class="fn__hr"></div>
<p>${window.siyuan.languages.kernelFault2}</p> <div>${window.siyuan.languages.kernelFault2}</div>
${iosReStart} ${iosReStart}
</div> </div>
</div>`; </div>`
let logElement = document.getElementById("errorLog"); });
if (logElement) { const restartElement = dialog.element.querySelector(".b3-button");
logElement.innerHTML = html; if (restartElement) {
} else {
document.body.insertAdjacentHTML("beforeend", `<div id="errorLog" class="b3-dialog b3-dialog--open">${html}</div>`);
logElement = document.getElementById("errorLog");
}
const restartElement = logElement.querySelector(".b3-button");
if (restartElement && window.webkit?.messageHandlers) {
restartElement.addEventListener("click", () => { restartElement.addEventListener("click", () => {
logElement.remove(); dialog.destroy();
window.webkit.messageHandlers.startKernelFast.postMessage("startKernelFast"); window.webkit.messageHandlers.startKernelFast.postMessage("startKernelFast");
}); });
} }

2
app/src/protyle/toolbar/index.ts
View file

@ -874,7 +874,7 @@ export class Toolbar {
this.subElement.style.width = ""; this.subElement.style.width = "";
this.subElement.style.padding = "0"; this.subElement.style.padding = "0";
} }
this.subElement.innerHTML = `<div ${(isPin && this.subElement.firstElementChild.getAttribute("data-drag") === "true") ? 'data-drag="true"' : ""} class="block__popover--move"><div class="block__icons block__icons--border fn__flex"> this.subElement.innerHTML = `<div ${(isPin && this.subElement.firstElementChild.getAttribute("data-drag") === "true") ? 'data-drag="true"' : ""} class="block__popover--move"><div class="block__icons block__icons--menu fn__flex">
${title} ${title}
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
<button data-type="refresh" class="block__icon b3-tooltips b3-tooltips__nw${(isPin && !this.subElement.querySelector('[data-type="refresh"]').classList.contains("block__icon--active")) ? "" : " block__icon--active"}${types.includes("NodeBlockQueryEmbed") ? " fn__none" : ""}" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href="#iconRefresh"></use></svg></button> <button data-type="refresh" class="block__icon b3-tooltips b3-tooltips__nw${(isPin && !this.subElement.querySelector('[data-type="refresh"]').classList.contains("block__icon--active")) ? "" : " block__icon--active"}${types.includes("NodeBlockQueryEmbed") ? " fn__none" : ""}" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href="#iconRefresh"></use></svg></button>

16
app/src/search/util.ts
View file

@ -147,8 +147,12 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
<div id="replaceHistoryList" data-close="false" class="fn__none b3-menu b3-list b3-list--background"></div> <div id="replaceHistoryList" data-close="false" class="fn__none b3-menu b3-list b3-list--background"></div>
</div> </div>
<div id="criteria" class="b3-chips" style="background-color: var(--b3-theme-background)"></div> <div id="criteria" class="b3-chips" style="background-color: var(--b3-theme-background)"></div>
<div class="search__header" style="padding: 4px 8px;"> <div class="block__icons">
<span id="searchResult" class="search__result"></span> <span data-type="previous" class="block__icon block__icon--show b3-tooltips b3-tooltips__se" disabled="disabled" aria-label="${window.siyuan.languages.previousLabel}"><svg><use xlink:href='#iconLeft'></use></svg></span>
<span class="fn__space"></span>
<span data-type="next" class="block__icon block__icon--show b3-tooltips b3-tooltips__se" disabled="disabled" aria-label="${window.siyuan.languages.nextLabel}"><svg><use xlink:href='#iconRight'></use></svg></span>
<span class="fn__space"></span>
<span id="searchResult"></span>
<span class="fn__space"></span> <span class="fn__space"></span>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
<span id="searchPathInput" class="search__path ft__on-surface fn__flex-center ft__smaller fn__ellipsis" title="${escapeAttr(config.hPath)}"> <span id="searchPathInput" class="search__path ft__on-surface fn__flex-center ft__smaller fn__ellipsis" title="${escapeAttr(config.hPath)}">
@ -156,18 +160,18 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
<svg class="search__rmpath${config.hPath ? "" : " fn__none"}"><use xlink:href="#iconCloseRound"></use></svg> <svg class="search__rmpath${config.hPath ? "" : " fn__none"}"><use xlink:href="#iconCloseRound"></use></svg>
</span> </span>
<span class="fn__space"></span> <span class="fn__space"></span>
<button ${enableIncludeChild ? "" : "disabled"} id="searchInclude" class="b3-button b3-button--small${includeChild ? "" : " b3-button--cancel"}">${window.siyuan.languages.includeChildDoc}</button> <button ${enableIncludeChild ? "" : "disabled"} id="searchInclude" class="b3-button b3-button--mid${includeChild ? "" : " b3-button--cancel"}">${window.siyuan.languages.includeChildDoc}</button>
<span class="fn__space"></span> <span class="fn__space"></span>
<span id="searchPath" aria-label="${window.siyuan.languages.specifyPath}" class="block__icon b3-tooltips b3-tooltips__w"> <span id="searchPath" aria-label="${window.siyuan.languages.specifyPath}" class="block__icon block__icon--show b3-tooltips b3-tooltips__w">
<svg><use xlink:href="#iconFolder"></use></svg> <svg><use xlink:href="#iconFolder"></use></svg>
</span> </span>
<div class="fn__flex${config.group === 0 ? " fn__none" : ""}"> <div class="fn__flex${config.group === 0 ? " fn__none" : ""}">
<span class="fn__space"></span> <span class="fn__space"></span>
<span id="searchExpand" class="block__icon b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.expand}"> <span id="searchExpand" class="block__icon block__icon--show b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.expand}">
<svg><use xlink:href="#iconExpand"></use></svg> <svg><use xlink:href="#iconExpand"></use></svg>
</span> </span>
<span class="fn__space"></span> <span class="fn__space"></span>
<span id="searchCollapse" class="block__icon b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.collapse}"> <span id="searchCollapse" class="block__icon block__icon--show b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.collapse}">
<svg><use xlink:href="#iconContract"></use></svg> <svg><use xlink:href="#iconContract"></use></svg>
</span> </span>
</div> </div>