From cbbeaf98c9d61bfaf0a3a74290943fee22c92805 Mon Sep 17 00:00:00 2001 From: niutech Date: Sat, 12 Apr 2025 23:56:36 +0200 Subject: [PATCH 1/4] Add compact toolbar --- .../ui/components/topBar/palette/palette.module.scss | 6 ++++-- src/renderer/ui/components/topBar/topBar.module.scss | 6 ++---- .../workflowSwitcher/workflowSwitcher.module.scss | 4 ++-- src/renderer/ui/components/worktable/worktable.module.scss | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/renderer/ui/components/topBar/palette/palette.module.scss b/src/renderer/ui/components/topBar/palette/palette.module.scss index 3f843d6..b22075e 100644 --- a/src/renderer/ui/components/topBar/palette/palette.module.scss +++ b/src/renderer/ui/components/topBar/palette/palette.module.scss @@ -14,10 +14,11 @@ } .palette-tab { + position: relative; z-index:1; display: inline-block; font-family: 'Roboto Condensed'; - padding: 22px 16px; + padding: 10px 12px; font-size: 16px; line-height: 16px; background-color: var(--freeter-paletteTabBackground); @@ -34,10 +35,11 @@ } } .palette-section { + position: absolute; box-sizing: border-box; overflow-x: hidden; overflow-y:auto; - width: 100%; + width: 180px; z-index:0; max-height: 500px; display: none; diff --git a/src/renderer/ui/components/topBar/topBar.module.scss b/src/renderer/ui/components/topBar/topBar.module.scss index 3987fb3..910ae13 100644 --- a/src/renderer/ui/components/topBar/topBar.module.scss +++ b/src/renderer/ui/components/topBar/topBar.module.scss @@ -8,17 +8,15 @@ position: fixed; z-index: 3; background-color: var(--freeter-topBarBackground); - border-top: 1px solid var(--freeter-topBarBorder); border-bottom: 1px solid var(--freeter-topBarBorder); top: 0; - left: 0; right: 0; } .top-bar-section { box-sizing: border-box; - padding: 12px; - height: 60px; + padding: 0 12px; + height: 36px; display: flex; &:not(:last-child) { border-right: 1px solid var(--freeter-topBarBorder); diff --git a/src/renderer/ui/components/workflowSwitcher/workflowSwitcher.module.scss b/src/renderer/ui/components/workflowSwitcher/workflowSwitcher.module.scss index 78505d1..31d9461 100644 --- a/src/renderer/ui/components/workflowSwitcher/workflowSwitcher.module.scss +++ b/src/renderer/ui/components/workflowSwitcher/workflowSwitcher.module.scss @@ -8,9 +8,9 @@ border-bottom: 1px solid var(--freeter-workflowSwitcherBorder); position: fixed; z-index: 2; - top: 62px; + top: 0; left: 0; - right: 0; + right: 275px; box-sizing: content-box; height: 36px; } diff --git a/src/renderer/ui/components/worktable/worktable.module.scss b/src/renderer/ui/components/worktable/worktable.module.scss index 51b3533..69dc0c1 100644 --- a/src/renderer/ui/components/worktable/worktable.module.scss +++ b/src/renderer/ui/components/worktable/worktable.module.scss @@ -5,7 +5,7 @@ .no-workflows, .worktable { position: fixed; - top: 99px; + top: 37px; bottom: 0px; left: 0px; right: 0px; From 89b9d99d8abe73a455f3602a469d4b234ad1b2b3 Mon Sep 17 00:00:00 2001 From: niutech Date: Mon, 14 Apr 2025 11:21:00 +0200 Subject: [PATCH 2/4] v2.6.0-beta --- package.json | 2 +- yarn.lock | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index d5990f2..64ca37e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "freeter", - "version": "2.5.0-beta", + "version": "2.6.0-beta", "main": "main.js", "homepage": "https://freeter.io/", "repository": "https://github.com/FreeterApp/Freeter.git", diff --git a/yarn.lock b/yarn.lock index e498daa..49c2a72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2964,6 +2964,11 @@ copyfiles@^2.4.1: untildify "^4.0.0" yargs "^16.1.0" +core-js@^3.6.5: + version "3.41.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.41.0.tgz#57714dafb8c751a6095d028a7428f1fb5834a776" + integrity sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA== + core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -9043,6 +9048,13 @@ tiny-async-pool@1.3.0: dependencies: semver "^5.5.0" +tiny-markdown-editor@^0.1.31: + version "0.1.31" + resolved "https://registry.yarnpkg.com/tiny-markdown-editor/-/tiny-markdown-editor-0.1.31.tgz#2631e64852f447594ec4ee9f3be20a728bda0b6f" + integrity sha512-rCjxSyiytrJOmDpAdRKhw/9XFw5uUaW3kbfb5dop5JwWAka0386tSO3HUswOTQpX7W5bFlpkCKyKMS+XsBKa+w== + dependencies: + core-js "^3.6.5" + tmp-promise@^3.0.2: version "3.0.3" resolved "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz" From 871543a45ee5fca8230c9f72e702395ba8ea7d70 Mon Sep 17 00:00:00 2001 From: niutech Date: Mon, 14 Apr 2025 17:10:57 +0200 Subject: [PATCH 3/4] Add zoom factor --- src/renderer/widgets/webpage/settings.tsx | 10 ++++++++++ src/renderer/widgets/webpage/widget.tsx | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/renderer/widgets/webpage/settings.tsx b/src/renderer/widgets/webpage/settings.tsx index 5909989..d9ef847 100644 --- a/src/renderer/widgets/webpage/settings.tsx +++ b/src/renderer/widgets/webpage/settings.tsx @@ -43,6 +43,7 @@ export interface Settings { injectedCSS: string; injectedJS: string; userAgent: string; + zoom: number; } export const createSettingsState: CreateSettingsState = (settings) => ({ @@ -53,6 +54,7 @@ export const createSettingsState: CreateSettingsState = (settings) => injectedCSS: typeof settings.injectedCSS === 'string' ? settings.injectedCSS : '', injectedJS: typeof settings.injectedJS === 'string' ? settings.injectedJS : '', userAgent: typeof settings.userAgent === 'string' ? settings.userAgent : '', + zoom: typeof settings.zoom === 'number' ? settings.zoom : 100, }) const debounceUpdate3s = debounce((fn: () => void) => fn(), 3000); @@ -162,6 +164,14 @@ export function SettingsEditorComp({settings, settingsApi}: SettingsEditorReactC > updateSettings({...settings, userAgent: e.target.value})} placeholder="Type a User Agent string" /> + + + updateSettings({...settings, zoom: +e.target.value})} min="50" max="300" step="10" /> % + ) } diff --git a/src/renderer/widgets/webpage/widget.tsx b/src/renderer/widgets/webpage/widget.tsx index 44a9980..95e778a 100644 --- a/src/renderer/widgets/webpage/widget.tsx +++ b/src/renderer/widgets/webpage/widget.tsx @@ -24,7 +24,7 @@ interface WebviewProps extends WidgetReactComponentProps { } function Webview({settings, widgetApi, onRequireRestart, env, id}: WebviewProps) { - const {url, sessionScope, sessionPersist, autoReload, injectedCSS, injectedJS, userAgent} = settings; + const {url, sessionScope, sessionPersist, autoReload, injectedCSS, injectedJS, userAgent, zoom} = settings; const partition = useMemo(() => createPartition(sessionPersist, sessionScope, env, id), [ env, id, sessionScope, sessionPersist @@ -133,7 +133,7 @@ function Webview({settings, widgetApi, onRequireRestart, env, id}: WebviewProps) refreshActions(); injectedCSS && webviewEl.insertCSS(injectedCSS); injectedJS && webviewEl.executeJavaScript(injectedJS); - // webviewEl.classList.add('is-bg-visible'); + zoom && webviewEl.setZoomFactor(zoom / 100); } const handleDidFinishLoad = () => { refreshActions(); From 620c436af10d3ec02bc53739d9937fb9a27a4c02 Mon Sep 17 00:00:00 2001 From: niu tech Date: Thu, 12 Jun 2025 16:33:55 +0200 Subject: [PATCH 4/4] Merge with master --- .../ui/components/topBar/palette/palette.module.scss | 6 ++---- src/renderer/ui/components/topBar/topBar.module.scss | 6 ++++-- .../workflowSwitcher/workflowSwitcher.module.scss | 4 ++-- src/renderer/ui/components/worktable/worktable.module.scss | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/renderer/ui/components/topBar/palette/palette.module.scss b/src/renderer/ui/components/topBar/palette/palette.module.scss index b22075e..3f843d6 100644 --- a/src/renderer/ui/components/topBar/palette/palette.module.scss +++ b/src/renderer/ui/components/topBar/palette/palette.module.scss @@ -14,11 +14,10 @@ } .palette-tab { - position: relative; z-index:1; display: inline-block; font-family: 'Roboto Condensed'; - padding: 10px 12px; + padding: 22px 16px; font-size: 16px; line-height: 16px; background-color: var(--freeter-paletteTabBackground); @@ -35,11 +34,10 @@ } } .palette-section { - position: absolute; box-sizing: border-box; overflow-x: hidden; overflow-y:auto; - width: 180px; + width: 100%; z-index:0; max-height: 500px; display: none; diff --git a/src/renderer/ui/components/topBar/topBar.module.scss b/src/renderer/ui/components/topBar/topBar.module.scss index 910ae13..3987fb3 100644 --- a/src/renderer/ui/components/topBar/topBar.module.scss +++ b/src/renderer/ui/components/topBar/topBar.module.scss @@ -8,15 +8,17 @@ position: fixed; z-index: 3; background-color: var(--freeter-topBarBackground); + border-top: 1px solid var(--freeter-topBarBorder); border-bottom: 1px solid var(--freeter-topBarBorder); top: 0; + left: 0; right: 0; } .top-bar-section { box-sizing: border-box; - padding: 0 12px; - height: 36px; + padding: 12px; + height: 60px; display: flex; &:not(:last-child) { border-right: 1px solid var(--freeter-topBarBorder); diff --git a/src/renderer/ui/components/workflowSwitcher/workflowSwitcher.module.scss b/src/renderer/ui/components/workflowSwitcher/workflowSwitcher.module.scss index 31d9461..78505d1 100644 --- a/src/renderer/ui/components/workflowSwitcher/workflowSwitcher.module.scss +++ b/src/renderer/ui/components/workflowSwitcher/workflowSwitcher.module.scss @@ -8,9 +8,9 @@ border-bottom: 1px solid var(--freeter-workflowSwitcherBorder); position: fixed; z-index: 2; - top: 0; + top: 62px; left: 0; - right: 275px; + right: 0; box-sizing: content-box; height: 36px; } diff --git a/src/renderer/ui/components/worktable/worktable.module.scss b/src/renderer/ui/components/worktable/worktable.module.scss index 69dc0c1..51b3533 100644 --- a/src/renderer/ui/components/worktable/worktable.module.scss +++ b/src/renderer/ui/components/worktable/worktable.module.scss @@ -5,7 +5,7 @@ .no-workflows, .worktable { position: fixed; - top: 37px; + top: 99px; bottom: 0px; left: 0px; right: 0px;