diff --git a/app/electron/main.js b/app/electron/main.js index 3653e4e3d..a1e410ff9 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -863,8 +863,8 @@ app.whenReady().then(() => { parent: getWindowByContentId(event.sender.id), modal: true, show: true, - width: 1032, - height: 725, + width: Math.floor(screen.getPrimaryDisplay().size.width * 0.8), + height: Math.floor(screen.getPrimaryDisplay().workAreaSize.height * 0.8), resizable: false, frame: "darwin" === process.platform, icon: path.join(appDir, "stage", "icon-large.png"), diff --git a/app/src/protyle/export/index.ts b/app/src/protyle/export/index.ts index 7f6d5f9a5..f1db04b89 100644 --- a/app/src/protyle/export/index.ts +++ b/app/src/protyle/export/index.ts @@ -111,9 +111,9 @@ const renderPDF = (id: string) => { } #action { - width: 200px; + width: 232px; background: var(--b3-theme-surface); - padding: 16px; + padding: 16px 0; position: fixed; right: 0; top: 0; @@ -121,6 +121,8 @@ const renderPDF = (id: string) => { bottom: 0; overflow-x: hidden; z-index: 1; + display: flex; + flex-direction: column; } #preview { @@ -156,8 +158,12 @@ const renderPDF = (id: string) => { border-bottom: 1px solid var(--b3-theme-surface-lighter); display: block; color: var(--b3-theme-on-surface); - padding-bottom: 12px; - margin-bottom: 12px; + padding-bottom: 16px; + margin: 0 16px 16px 16px; + } + + .b3-label:last-child { + border-bottom: none; } ${setInlineStyle(false)} ${document.getElementById("pluginsStyle").innerHTML} @@ -166,91 +172,93 @@ const renderPDF = (id: string) => {
-
-
- ${window.siyuan.languages.exportPDF0} +
+
+
+ ${window.siyuan.languages.exportPDF0} +
+ +
- - +
+
+ ${window.siyuan.languages.exportPDF2} +
+ + +
+ +
${window.siyuan.languages.marginTop}
+ + +
${window.siyuan.languages.marginRight}
+ + +
${window.siyuan.languages.marginBottom}
+ + +
${window.siyuan.languages.marginLeft}
+ +
+
+
+
+ ${window.siyuan.languages.exportPDF3} + ${localData.scale || 1} +
+ + +
+ + + + +
-
-
- ${window.siyuan.languages.exportPDF2} -
- - -
- -
${window.siyuan.languages.marginTop}
- - -
${window.siyuan.languages.marginRight}
- - -
${window.siyuan.languages.marginBottom}
- - -
${window.siyuan.languages.marginLeft}
- -
-
-
-
- ${window.siyuan.languages.exportPDF3} - ${localData.scale || 1} -
- - -
- - - - - -
+