github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-15 16:41:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2023-11-23 22:46:41 +08:00
parent 3932d1cf0c
commit 5422bc4ffb
5 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/assets/scss/business/_config.scss
View File

@ -14,7 +14,7 @@
box-sizing: border-box; box-sizing: border-box;
height: 100%; height: 100%;
.b3-label { .b3-label:not(.b3-label--inner) {
padding: 16px 0; padding: 16px 0;
margin: 0 24px; margin: 0 24px;
} }

28
app/src/assets/scss/component/_form.scss
View File

@ -113,7 +113,11 @@
&--inner { &--inner {
border-bottom: 0; border-bottom: 0;
padding: 0 !important; padding: 0 0 16px 0;
&:last-child {
padding-bottom: 0;
}
} }
&:last-child, &:last-child,
@ -125,3 +129,25 @@
border-bottom: 1px solid var(--b3-border-color) !important; border-bottom: 1px solid var(--b3-border-color) !important;
} }
} }
@media screen and (max-width: 750px) {
.b3-label--inner {
flex-wrap: wrap;
& > .b3-text-field,
& > .b3-select,
& > .b3-form__icona {
width: 100%;
margin-top: 8px;
}
& > .b3-button {
width: 100%;
&:last-child {
margin-top: 16px;
}
}
}
}

1
app/src/assets/scss/mobile.scss
View File

@ -482,7 +482,6 @@ html[lang="zh_CN"] .protyle-wysiwyg [data-node-id]:last-child [spellcheck][conte
content: "键入文字"; content: "键入文字";
} }
@media (max-width: 620px) { @media (max-width: 620px) {
.protyle-wysiwyg [data-node-id].sb[data-sb-layout="col"] { .protyle-wysiwyg [data-node-id].sb[data-sb-layout="col"] {
flex-direction: column; flex-direction: column;

34
app/src/config/repos.ts
View File

@ -10,7 +10,7 @@ const renderProvider = (provider: number) => {
if (provider === 0) { if (provider === 0) {
if (needSubscribe("")) { if (needSubscribe("")) {
return `<div class="b3-label b3-label--inner">${window.siyuan.config.system.container === "ios" ? window.siyuan.languages._kernel[122] : window.siyuan.languages._kernel[29].replace("${url}", getCloudURL("subscribe/siyuan"))}</div> return `<div class="b3-label b3-label--inner">${window.siyuan.config.system.container === "ios" ? window.siyuan.languages._kernel[122] : window.siyuan.languages._kernel[29].replace("${url}", getCloudURL("subscribe/siyuan"))}</div>
<div class="b3-label b3-label--noborder"> <div class="b3-label b3-label--inner">
${window.siyuan.languages.cloudIntro1} ${window.siyuan.languages.cloudIntro1}
<div class="b3-label__text"> <div class="b3-label__text">
<ul class="fn__list"> <ul class="fn__list">
@ -24,7 +24,7 @@ const renderProvider = (provider: number) => {
</ul> </ul>
</div> </div>
</div> </div>
<div class="b3-label b3-label--noborder"> <div class="b3-label b3-label--inner">
${window.siyuan.languages.cloudIntro9} ${window.siyuan.languages.cloudIntro9}
<div class="b3-label__text"> <div class="b3-label__text">
<ul style="padding-left: 2em"> <ul style="padding-left: 2em">
@ -49,17 +49,17 @@ const renderProvider = (provider: number) => {
<div class="fn__hr"></div> <div class="fn__hr"></div>
${window.siyuan.languages.syncThirdPartyProviderTip} ${window.siyuan.languages.syncThirdPartyProviderTip}
</div> </div>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Endpoint</div> <div class="fn__flex-center fn__size200">Endpoint</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<input id="endpoint" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.endpoint}"> <input id="endpoint" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.endpoint}">
</label> </label>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Access Key</div> <div class="fn__flex-center fn__size200">Access Key</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<input id="accessKey" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.accessKey}"> <input id="accessKey" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.accessKey}">
</label> </label>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Secret Key</div> <div class="fn__flex-center fn__size200">Secret Key</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<div class="b3-form__icona fn__block"> <div class="b3-form__icona fn__block">
@ -67,22 +67,22 @@ const renderProvider = (provider: number) => {
<svg class="b3-form__icona-icon" data-action="togglePassword"><use xlink:href="#iconEye"></use></svg> <svg class="b3-form__icona-icon" data-action="togglePassword"><use xlink:href="#iconEye"></use></svg>
</div> </div>
</label> </label>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Bucket</div> <div class="fn__flex-center fn__size200">Bucket</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<input id="bucket" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.bucket}"> <input id="bucket" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.bucket}">
</label> </label>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Region</div> <div class="fn__flex-center fn__size200">Region</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<input id="region" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.region}"> <input id="region" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.region}">
</label> </label>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Timeout (s)</div> <div class="fn__flex-center fn__size200">Timeout (s)</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300" value="${window.siyuan.config.sync.s3.timeout}"> <input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300" value="${window.siyuan.config.sync.s3.timeout}">
</label> </label>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Addressing</div> <div class="fn__flex-center fn__size200">Addressing</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<select class="b3-select fn__block" id="pathStyle"> <select class="b3-select fn__block" id="pathStyle">
@ -90,7 +90,7 @@ const renderProvider = (provider: number) => {
<option ${window.siyuan.config.sync.s3.pathStyle ? "selected" : ""} value="true">Path-style</option> <option ${window.siyuan.config.sync.s3.pathStyle ? "selected" : ""} value="true">Path-style</option>
</select> </select>
</label> </label>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">TLS Verify</div> <div class="fn__flex-center fn__size200">TLS Verify</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<select class="b3-select fn__block" id="s3SkipTlsVerify"> <select class="b3-select fn__block" id="s3SkipTlsVerify">
@ -98,7 +98,7 @@ const renderProvider = (provider: number) => {
<option ${window.siyuan.config.sync.s3.skipTlsVerify ? "selected" : ""} value="true">Skip</option> <option ${window.siyuan.config.sync.s3.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
</select> </select>
</label> </label>
<div class="b3-label fn__flex"> <div class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-1"></div> <div class="fn__flex-1"></div>
<button class="b3-button b3-button--outline fn__size200" style="position: relative"> <button class="b3-button b3-button--outline fn__size200" style="position: relative">
<input id="importData" class="b3-form__upload" type="file" data-type="s3"> <input id="importData" class="b3-form__upload" type="file" data-type="s3">
@ -117,17 +117,17 @@ const renderProvider = (provider: number) => {
<div class="fn__hr"></div> <div class="fn__hr"></div>
${window.siyuan.languages.syncThirdPartyProviderTip} ${window.siyuan.languages.syncThirdPartyProviderTip}
</div> </div>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Endpoint</div> <div class="fn__flex-center fn__size200">Endpoint</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<input id="endpoint" class="b3-text-field fn__block" value="${window.siyuan.config.sync.webdav.endpoint}"> <input id="endpoint" class="b3-text-field fn__block" value="${window.siyuan.config.sync.webdav.endpoint}">
</label> </label>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Username</div> <div class="fn__flex-center fn__size200">Username</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<input id="username" class="b3-text-field fn__block" value="${window.siyuan.config.sync.webdav.username}"> <input id="username" class="b3-text-field fn__block" value="${window.siyuan.config.sync.webdav.username}">
</label> </label>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Password</div> <div class="fn__flex-center fn__size200">Password</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<div class="b3-form__icona fn__block"> <div class="b3-form__icona fn__block">
@ -135,12 +135,12 @@ const renderProvider = (provider: number) => {
<svg class="b3-form__icona-icon" data-action="togglePassword"><use xlink:href="#iconEye"></use></svg> <svg class="b3-form__icona-icon" data-action="togglePassword"><use xlink:href="#iconEye"></use></svg>
</div> </div>
</label> </label>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Timeout (s)</div> <div class="fn__flex-center fn__size200">Timeout (s)</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300" value="${window.siyuan.config.sync.webdav.timeout}"> <input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300" value="${window.siyuan.config.sync.webdav.timeout}">
</label> </label>
<label class="b3-label b3-label--noborder fn__flex config__item"> <label class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">TLS Verify</div> <div class="fn__flex-center fn__size200">TLS Verify</div>
<div class="fn__space"></div> <div class="fn__space"></div>
<select class="b3-select fn__block" id="webdavSkipTlsVerify"> <select class="b3-select fn__block" id="webdavSkipTlsVerify">
@ -148,7 +148,7 @@ const renderProvider = (provider: number) => {
<option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "selected" : ""} value="true">Skip</option> <option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
</select> </select>
</label> </label>
<div class="b3-label fn__flex"> <div class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-1"></div> <div class="fn__flex-1"></div>
<button class="b3-button b3-button--outline fn__size200" style="position: relative"> <button class="b3-button b3-button--outline fn__size200" style="position: relative">
<input id="importData" class="b3-form__upload" type="file" data-type="webdav"> <input id="importData" class="b3-form__upload" type="file" data-type="webdav">

10
app/src/sync/syncGuide.ts
View File

@ -83,10 +83,9 @@ export const getSyncCloudList = (cloudPanelElement: Element, reload = false, cb?
return; return;
} }
fetchPost("/api/sync/listCloudSyncDir", {}, (response) => { fetchPost("/api/sync/listCloudSyncDir", {}, (response) => {
let syncListHTML = `<div class="fn__hr"></div><ul><li style="padding: 0 16px" class="b3-list--empty">${window.siyuan.languages.emptyCloudSyncList}</li></ul>`; let syncListHTML = `<ul><li style="padding: 0 16px" class="b3-list--empty">${window.siyuan.languages.emptyCloudSyncList}</li></ul>`;
if (response.code === 1) { if (response.code === 1) {
syncListHTML = `<div class="fn__hr"></div> syncListHTML = `<ul>
<ul>
<li class="b3-list--empty ft__error"> <li class="b3-list--empty ft__error">
${response.msg} ${response.msg}
</li> </li>
@ -95,7 +94,7 @@ export const getSyncCloudList = (cloudPanelElement: Element, reload = false, cb?
</li> </li>
</ul>`; </ul>`;
} else if (response.code !== 1) { } else if (response.code !== 1) {
syncListHTML = '<div class="fn__hr"></div><ul class="b3-list b3-list--background fn__flex-1" style="overflow: auto;">'; syncListHTML = '<ul class="b3-list b3-list--background fn__flex-1" style="overflow: auto;">';
response.data.syncDirs.forEach((item: { hSize: string, cloudName: string, updated: string }) => { response.data.syncDirs.forEach((item: { hSize: string, cloudName: string, updated: string }) => {
/// #if MOBILE /// #if MOBILE
syncListHTML += `<li data-type="selectCloud" data-name="${item.cloudName}" class="b3-list-item b3-list-item--two"> syncListHTML += `<li data-type="selectCloud" data-name="${item.cloudName}" class="b3-list-item b3-list-item--two">
@ -115,7 +114,7 @@ export const getSyncCloudList = (cloudPanelElement: Element, reload = false, cb?
</div> </div>
</li>`; </li>`;
/// #else /// #else
syncListHTML += `<li data-type="selectCloud" data-name="${item.cloudName}" class="b3-list-item b3-list-item--hide-action"> syncListHTML += `<li data-type="selectCloud" data-name="${item.cloudName}" class="b3-list-item b3-list-item--narrow b3-list-item--hide-action">
<input type="radio" name="cloudName"${item.cloudName === response.data.checkedSyncDir ? " checked" : ""}/> <input type="radio" name="cloudName"${item.cloudName === response.data.checkedSyncDir ? " checked" : ""}/>
<span class="fn__space"></span> <span class="fn__space"></span>
<span>${item.cloudName}</span> <span>${item.cloudName}</span>
@ -236,6 +235,7 @@ const setSync = (key?: string, dialog?: Dialog) => {
if (!window.siyuan.config.sync.enabled) { if (!window.siyuan.config.sync.enabled) {
const listHTML = `<div class="b3-dialog__content"> const listHTML = `<div class="b3-dialog__content">
<div class="ft__on-surface">${window.siyuan.languages.syncConfGuide3}</div> <div class="ft__on-surface">${window.siyuan.languages.syncConfGuide3}</div>
<div class="fn__hr--b"></div>
<div style="display: flex;flex-direction: column;height: 40vh;"> <div style="display: flex;flex-direction: column;height: 40vh;">
<img style="margin: 0 auto;display: block;width: 64px;height: 100%" src="/stage/loading-pure.svg"> <img style="margin: 0 auto;display: block;width: 64px;height: 100%" src="/stage/loading-pure.svg">
</div> </div>