Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-20 14:04:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 fix https://github.com/siyuan-note/siyuan/issues/5610

Browse source
This commit is contained in:
Vanessa 2022-08-12 12:08:16 +08:00
parent 18e377f90f
commit b5ff267908
21 changed files with 123 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/assets/scss/_function.scss
View file

@ -99,6 +99,18 @@
top: 48px;
}
}
&__code {
padding: 0.2em 0.4em;
margin: 0;
font-size: 85%;
border-radius: 3px;
font-family: var(--b3-font-family-code);
word-break: break-word;
background-size: 20px 20px;
white-space: pre-wrap;
background-color: var(--b3-protyle-code-background);
}
}
.ft {

14
app/src/assets/scss/_typography.scss
View file

@ -204,15 +204,7 @@
}
code:not(.hljs) {
padding: 0.2em 0.4em;
margin: 0;
font-size: 85%;
border-radius: 3px;
font-family: var(--b3-font-family-code);
word-break: break-word;
background-size: 20px 20px;
white-space: pre-wrap;
background-color: var(--b3-protyle-code-background);
@extend .fn__code;
}
a[href^=pdf-outline] {
@ -252,7 +244,7 @@
}
.protyle-icon,
.protyle-action__language{
.protyle-action__language {
opacity: 0;
transition: var(--b3-transition);
}
@ -463,7 +455,7 @@
&:hover {
color: var(--b3-theme-surface);
background-color: var(--b3-theme-on-surface);
background-color: var(--b3-theme-on-surface);
}
}

7
app/src/config/about.ts
View file

@ -27,16 +27,15 @@ export const about = {
<div class="fn__flex b3-label${isBrowser() ? " fn__none" : ""}">
<div class="fn__flex-1">
${window.siyuan.languages.about2}
<div class="b3-label__text b3-typography">${window.siyuan.languages.about3}</div>
<div class='fn__hr'></div>
<span class="b3-label__text b3-typography"><code>${window.siyuan.config.localIPs.join("</code> <code>")}</code></span>
<div class="b3-label__text">${window.siyuan.languages.about3}</div>
<span class="b3-label__text"><code class="fn__code">${window.siyuan.config.localIPs.join("</code> <code class='fn__code'>")}</code></span>
</div>
<div class="fn__space"></div>
<button data-type="open" data-url="http://${window.siyuan.config.system.networkServe ? window.siyuan.config.localIPs[0] : "127.0.0.1"}:6806" class="b3-button b3-button--outline fn__size200 fn__flex-center">${window.siyuan.languages.about4}</button>
</div>
<div class="b3-label${(window.siyuan.config.system.container === "std" || window.siyuan.config.system.container === "docker") ? "" : " fn__none"}">
${window.siyuan.languages.networkProxy}
<div class="b3-label__text b3-typography">
<div class="b3-label__text">
${window.siyuan.languages.about17}
</div>
<div class="b3-label__text fn__flex" style="padding: 4px 0 4px 4px;">

2
app/src/config/bazaar.ts
View file

@ -229,7 +229,7 @@ export const bazaar = {
</div>
<div class="item__main">
<div class="item__preview" style="background-image: url(${data.previewURL})"></div>
<div class="item__readme b3-typography" style="position:relative;">
<div class="item__readme b3-typography b3-typography--default" style="position:relative;">
<img data-type="img-loading" style="position: absolute;top: 0;left: 0;height: 100%;width: 100%;padding: 48px;box-sizing: border-box;" src="/stage/loading-pure.svg">
</div>
</div>`;

6
app/src/config/editor.ts
View file

@ -60,7 +60,7 @@ export const editor = {
<label class="fn__flex b3-label">
<div class="fn__flex-1">
${window.siyuan.languages.md39}
<div class="b3-label__text b3-typography">${window.siyuan.languages.md40}</div>
<div class="b3-label__text">${window.siyuan.languages.md40}</div>
</div>
<span class="fn__space"></span>
<input class="b3-text-field fn__flex-center fn__size200" id="plantUMLServePath" value="${window.siyuan.config.editor.plantUMLServePath}"/>
@ -76,7 +76,7 @@ export const editor = {
<label class="fn__flex b3-label">
<div class="fn__flex-1">
${window.siyuan.languages.md35}
<div class="b3-label__text b3-typography">${window.siyuan.languages.md36}</div>
<div class="b3-label__text">${window.siyuan.languages.md36}</div>
</div>
<span class="fn__space"></span>
<input class="b3-text-field fn__flex-center fn__size200" id="virtualBlockRefExclude" value="${window.siyuan.config.editor.virtualBlockRefExclude}" />
@ -104,7 +104,7 @@ export const editor = {
<label class="fn__flex b3-label">
<div class="fn__flex-1">
${window.siyuan.languages.font}
<div class="b3-label__text b3-typography">${window.siyuan.languages.font1}</div>
<div class="b3-label__text">${window.siyuan.languages.font1}</div>
</div>
<span class="fn__space"></span>
${fontFamilyHTML}

4
app/src/config/exportConfig.ts
View file

@ -93,7 +93,7 @@ export const exportConfig = {
<label class="fn__flex b3-label">
<div class="fn__flex-1 fn__flex-center">
${window.siyuan.languages.export} Data
<div class="b3-label__text b3-typography">${window.siyuan.languages.exportDataTip}</div>
<div class="b3-label__text">${window.siyuan.languages.exportDataTip}</div>
</div>
<span class="fn__space"></span>
<button class="b3-button b3-button--outline fn__flex-center fn__size200" id="exportData"><svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}</button>
@ -101,7 +101,7 @@ export const exportConfig = {
<div class="fn__flex b3-label">
<div class="fn__flex-1 fn__flex-center">
${window.siyuan.languages.import} Data
<div class="b3-label__text b3-typography">${window.siyuan.languages.importDataTip}</div>
<div class="b3-label__text">${window.siyuan.languages.importDataTip}</div>
</div>
<span class="fn__space"></span>
<button class="b3-button b3-button--outline fn__flex-center fn__size200" style="position: relative">

4
app/src/config/fileTree.ts
View file

@ -46,7 +46,7 @@ export const fileTree = {
<label class="fn__flex b3-label">
<div class="fn__flex-1">
${window.siyuan.languages.fileTree12}
<div class="b3-label__text b3-typography">${window.siyuan.languages.fileTree13}</div>
<div class="b3-label__text">${window.siyuan.languages.fileTree13}</div>
</div>
<span class="fn__space"></span>
<input class="b3-text-field fn__flex-center fn__size200" id="createDocNameTemplate" value="">
@ -54,7 +54,7 @@ export const fileTree = {
<label class="b3-label fn__flex">
<div class="fn__flex-1">
${window.siyuan.languages.fileTree5}
<div class="b3-label__text b3-typography">${window.siyuan.languages.fileTree6}</div>
<div class="b3-label__text">${window.siyuan.languages.fileTree6}</div>
</div>
<span class="fn__space"></span>
<input class="b3-text-field fn__flex-center fn__size200" id="refCreateSavePath" value="${window.siyuan.config.fileTree.refCreateSavePath}">

2
app/src/config/query.ts
View file

@ -187,7 +187,7 @@ export const query = {
<label class="fn__flex b3-label">
<div class="fn__flex-1">
${window.siyuan.languages.searchLimit}
<div class="b3-label__text b3-typography">${window.siyuan.languages.searchLimit1}</div>
<div class="b3-label__text">${window.siyuan.languages.searchLimit1}</div>
</div>
<span class="fn__space"></span>
<input class="b3-text-field fn__flex-center fn__size200" id="limit" type="number" min="1" max="10240" value="${window.siyuan.config.search.limit}">

8
app/src/config/repos.ts
View file

@ -108,8 +108,8 @@ export const repos = {
return `<div class="b3-label">${window.siyuan.config.system.container === "ios" ? window.siyuan.languages._kernel[122] : window.siyuan.languages._kernel[29]}</div>
<div class="b3-label">
${window.siyuan.languages.cloudIntro1}
<div class="b3-label__text b3-typography">
<ul>
<div class="b3-label__text">
<ul style="padding-left: 2em">
<li>${window.siyuan.languages.cloudIntro2}</li>
<li>${window.siyuan.languages.cloudIntro3}</li>
<li>${window.siyuan.languages.cloudIntro4}</li>
@ -122,8 +122,8 @@ export const repos = {
</div>
<div class="b3-label">
${window.siyuan.languages.cloudIntro9}
<div class="b3-label__text b3-typography">
<ul>
<div class="b3-label__text">
<ul style="padding-left: 2em">
<li>${window.siyuan.languages.cloudIntro10}</li>
<li>${window.siyuan.languages.cloudIntro11}</li>
</ul>

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

@ -13,7 +13,7 @@ export const lockFile = (id: string) => {
const html = `<div class="b3-dialog__scrim"></div>
<div class="b3-dialog__container">
<div class="b3-dialog__header" onselectstart="return false;">🔒 ${window.siyuan.languages.lockFile0} <small>v${Constants.SIYUAN_VERSION}</small></div>
<div class="b3-dialog__content b3-typography">
<div class="b3-dialog__content">
<p>${window.siyuan.languages.lockFile1}</p>
<p>${window.siyuan.languages.lockFile2}</p>
</div>
@ -58,7 +58,7 @@ export const kernelError = () => {
const html = `<div class="b3-dialog__scrim"></div>
<div class="b3-dialog__container">
<div class="b3-dialog__header" onselectstart="return false;">💔 ${window.siyuan.languages.kernelFault0} <small>v${Constants.SIYUAN_VERSION}</small></div>
<div class="b3-dialog__content b3-typography">
<div class="b3-dialog__content">
<p>${window.siyuan.languages.kernelFault1}</p>
<p>${window.siyuan.languages.kernelFault2}</p>
${iosReStart}

2
app/src/layout/dock/Inbox.ts
View file

@ -146,7 +146,7 @@ ${data.shorthandTitle}
<div class="fn__hr"></div>
<a href="${data.shorthandURL}" target="_blank">${data.shorthandURL}</a>
<div class="fn__hr"></div>
<div class="b3-typography">
<div class="b3-typography b3-typography--default">
${(Lute.New()).MarkdownStr("", data.shorthandContent)}
</div>`;
detailsElement.setAttribute("data-id", data.oId);

8
app/src/menus/onGetnotebookconf.ts
View file

@ -22,25 +22,25 @@ export const onGetnotebookconf = (data: {
<div class="b3-label">
${window.siyuan.languages.fileTree12}
<div class="fn__hr"></div>
<div class="b3-label__text b3-typography">${window.siyuan.languages.fileTree13}</div>
<div class="b3-label__text">${window.siyuan.languages.fileTree13}</div>
<div class="fn__hr"></div>
<input class="b3-text-field fn__flex-center fn__block" id="createDocNameTemplate" value="">
</div>
<div class="b3-label">
${window.siyuan.languages.fileTree5}
<div class="fn__hr"></div>
<div class="b3-label__text b3-typography">${window.siyuan.languages.fileTree6}</div>
<div class="b3-label__text">${window.siyuan.languages.fileTree6}</div>
<div class="fn__hr"></div>
<input class="b3-text-field fn__flex-center fn__block" id="refCreateSavePath" value="${window.siyuan.config.fileTree.refCreateSavePath}">
</div>
<div class="b3-label">
${window.siyuan.languages.fileTree11}
<div class="fn__hr"></div>
<div class="b3-label__text b3-typography">${window.siyuan.languages.fileTree14}</div>
<div class="b3-label__text">${window.siyuan.languages.fileTree14}</div>
<div class="fn__hr"></div>
<input class="b3-text-field fn__flex-center fn__block" id="dailyNoteSavePath" value="">
<div class="fn__hr"></div>
<div class="b3-label__text b3-typography">${window.siyuan.languages.fileTree15}</div>
<div class="b3-label__text">${window.siyuan.languages.fileTree15}</div>
<div class="fn__hr"></div>
<input class="b3-text-field fn__flex-center fn__block" id="dailyNoteTemplatePath" value="${data.conf.dailyNoteTemplatePath}">
</div></div>`;

12
app/src/mobile/settings/appearance.ts
View file

@ -15,7 +15,7 @@ export const initAppearance = (modelElement: HTMLElement, modelMainElement: HTML
<option value="0" ${window.siyuan.config.appearance.mode === 0 ? "selected" : ""}>${window.siyuan.languages.themeLight}</option>
<option value="1" ${window.siyuan.config.appearance.mode === 1 ? "selected" : ""}>${window.siyuan.languages.themeDark}</option>
</select>
<div class="b3-label__text b3-typography">${window.siyuan.languages.appearance5}</div>
<div class="b3-label__text">${window.siyuan.languages.appearance5}</div>
</div>
<div class="b3-label">
${window.siyuan.languages.theme}
@ -23,12 +23,12 @@ export const initAppearance = (modelElement: HTMLElement, modelMainElement: HTML
<select class="b3-select fn__block" id="themeLight">
${genOptions(window.siyuan.config.appearance.lightThemes, window.siyuan.config.appearance.themeLight)}
</select>
<div class="b3-label__text b3-typography">${window.siyuan.languages.theme11}</div>
<div class="b3-label__text">${window.siyuan.languages.theme11}</div>
<div class="fn__hr"></div>
<select class="b3-select fn__block" id="themeDark">
${genOptions(window.siyuan.config.appearance.darkThemes, window.siyuan.config.appearance.themeDark)}
</select>
<div class="b3-label__text b3-typography">${window.siyuan.languages.theme12}</div>
<div class="b3-label__text">${window.siyuan.languages.theme12}</div>
</div>
<div class="b3-label">
${window.siyuan.languages.icon}
@ -36,19 +36,19 @@ export const initAppearance = (modelElement: HTMLElement, modelMainElement: HTML
<select class="b3-select fn__block" id="icon">
${genOptions(window.siyuan.config.appearance.icons, window.siyuan.config.appearance.icon)}
</select>
<div class="b3-label__text b3-typography">${window.siyuan.languages.theme2}</div>
<div class="b3-label__text">${window.siyuan.languages.theme2}</div>
</div>
<div class="b3-label">
${window.siyuan.languages.language}
<div class="fn__hr"></div>
<select id="lang" class="b3-select fn__block">${genOptions(window.siyuan.config.langs, window.siyuan.config.appearance.lang)}</select>
<div class="b3-label__text b3-typography">${window.siyuan.languages.language1}</div>
<div class="b3-label__text">${window.siyuan.languages.language1}</div>
</div>
<div class="b3-label">
${window.siyuan.languages.fontSize} <span id="fontSize" class="ft__on-surface">${window.siyuan.config.editor.fontSize}px</span>
<div class="fn__hr"></div>
<input class="b3-slider fn__block" max="72" min="9" step="1" type="range" value="${window.siyuan.config.editor.fontSize}">
<div class="b3-label__text b3-typography">${window.siyuan.languages.fontSizeTip}</div>
<div class="b3-label__text">${window.siyuan.languages.fontSizeTip}</div>
</div>`;
modelMainElement.querySelector(".b3-slider").addEventListener("input", (event: InputEvent & { target: HTMLInputElement }) => {
modelMainElement.querySelector("#fontSize").textContent = event.target.value + "px";

12
app/src/mobile/util/menu.ts
View file

@ -193,9 +193,9 @@ ${accountHTML}
${window.siyuan.languages.about2}
<div class="fn__hr"></div>
<input class="b3-text-field fn__block" readonly value="http://${window.siyuan.config.system.networkServe ? window.siyuan.config.localIPs[0] : "127.0.0.1"}:6806">
<div class="b3-label__text b3-typography">${window.siyuan.languages.about3}</div>
<div class="b3-label__text">${window.siyuan.languages.about3}</div>
<div class="fn__hr"></div>
<span class="b3-label__text b3-typography"><code>${window.siyuan.config.localIPs.join("</code> <code>")}</code></span>
<span class="b3-label__text"><code class="fn__code">${window.siyuan.config.localIPs.join("</code> <code class='fn__code'>")}</code></span>
</div>
<div class="b3-label">
${window.siyuan.languages.about5}
@ -203,7 +203,7 @@ ${accountHTML}
<button class="b3-button b3-button--outline fn__block" id="authCode">
<svg><use xlink:href="#iconLock"></use></svg>${window.siyuan.languages.config}
</button>
<div class="b3-label__text b3-typography">${window.siyuan.languages.about6}</div>
<div class="b3-label__text">${window.siyuan.languages.about6}</div>
</div>
<div class="b3-label">
${window.siyuan.languages.dataRepoKey}
@ -240,7 +240,7 @@ ${accountHTML}
<button class="b3-button b3-button--outline fn__block" id="token">
<svg><use xlink:href="#iconCopy"></use></svg>${window.siyuan.languages.copy}
</button>
<div class="b3-label__text b3-typography">${window.siyuan.languages.about14}</div>
<div class="b3-label__text">${window.siyuan.languages.about14}</div>
</div>
<div class="b3-label">
<div class="fn__flex">
@ -251,7 +251,7 @@ ${accountHTML}
<svg><use xlink:href="#iconUpload"></use></svg> ${window.siyuan.languages.export} Data
</button>
<div class="fn__hr"></div>
<div class="b3-label__text b3-typography">${window.siyuan.languages.exportDataTip}</div>
<div class="b3-label__text">${window.siyuan.languages.exportDataTip}</div>
</div>
<div class="b3-label">
<div class="fn__flex">
@ -263,7 +263,7 @@ ${accountHTML}
<svg><use xlink:href="#iconDownload"></use></svg> ${window.siyuan.languages.import} Data
</button>
<div class="fn__hr"></div>
<div class="b3-label__text b3-typography">${window.siyuan.languages.importDataTip}</div>
<div class="b3-label__text">${window.siyuan.languages.importDataTip}</div>
</div>
<div class="b3-label">
<div class="config-about__logo">

2
app/src/util/assets.ts
View file

@ -100,7 +100,7 @@ export const setInlineStyle = (set = true) => {
.protyle-wysiwyg .h5 img.emoji, .b3-typography h5 img.emoji {width:${Math.floor(window.siyuan.config.editor.fontSize * 1.13 * 1.25)}px}
.protyle-wysiwyg .h6 img.emoji, .b3-typography h6 img.emoji {width:${Math.floor(window.siyuan.config.editor.fontSize * 1.25)}px}`;
if (window.siyuan.config.editor.fontFamily) {
style += `.b3-typography, .protyle-wysiwyg, .protyle-title, .protyle-title__input{font-family: "${window.siyuan.config.editor.fontFamily}", "quote", "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Microsoft Yahei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Segoe UI Symbol", "Android Emoji", "EmojiSymbols" !important;}`;
style += `.b3-typography:not(.b3-typography--default), .protyle-wysiwyg, .protyle-title, .protyle-title__input{font-family: "${window.siyuan.config.editor.fontFamily}", "quote", "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Microsoft Yahei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Segoe UI Symbol", "Android Emoji", "EmojiSymbols" !important;}`;
}
if (set) {
document.getElementById("editorFontSize").innerHTML = style;

2
app/src/util/history.ts
View file

@ -241,7 +241,7 @@ export const openHistory = () => {
<ul style="width:200px;overflow: auto;" class="b3-list b3-list--background">
<li class="b3-list--empty">${window.siyuan.languages.emptyContent}</li>
</ul>
<textarea class="fn__flex-1 b3-typography history__text" readonly></textarea>
<textarea class="fn__flex-1 history__text" readonly></textarea>
</div>
<div data-type="assets" class="fn__flex fn__none">
<ul style="width:200px;overflow: auto;" class="b3-list b3-list--background">