From 65841d20856ff91bc9b5bbd4b17776cb92e1101e Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sat, 3 Aug 2024 19:46:08 +0200 Subject: [PATCH 01/18] chore: Update artifact names and paths in build workflows --- README.md | 6 ++++++ Performance.md => docs/performance.md | 0 docs/requirements.md | 31 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) rename Performance.md => docs/performance.md (100%) create mode 100644 docs/requirements.md diff --git a/README.md b/README.md index aa0153339..e431ac480 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,12 @@ Zen is currently built using firefox version `128.0.3`! * Checkout the latest [releases notes](https://get-zen.vercel.app/release-notes)! +# Performance + +Zen is built with performance in mind, and we have optimized the browser to be as fast as possible! + +* Checkout the latest [performance benchmarks](./docs/performance.md)! + ## 🚀 Run Locally Clone the project diff --git a/Performance.md b/docs/performance.md similarity index 100% rename from Performance.md rename to docs/performance.md diff --git a/docs/requirements.md b/docs/requirements.md new file mode 100644 index 000000000..b4b43f239 --- /dev/null +++ b/docs/requirements.md @@ -0,0 +1,31 @@ + +# Supported CPUs for optimized builds (Windows and Linux) + +> If you CPU is not listed, you should use the "Generic" build. + +* AMD Family 15h (Excavator) +* AMD Family 17h (Zen) +* AMD Family 17h (Zen+) +* AMD Family 17h (Zen 2) +* AMD Family 19h (Zen 3) +* Intel 4th Gen Core (Haswell) +* Intel 5th Gen Core (Broadwell) +* Intel 6th Gen Core (Skylake) +* Intel 7th Gen Core (Kaby Lake) +* Intel 8/9th Gen Core (Coffee Lake) +* Intel 10th Gen Core (Comet Lake) +* Intel 12th Gen (Alder Lake) +* Intel 13th Gen (Raptor Lake) +* Intel 14th Gen (Raptor Lake Refresh) +* Intel 15th Gen (Lunar / Arrow Lake) +* AMD Family 19h (Zen 4 / Zen 4c) +* AMD Family 1Ah (Zen 5 / Zen 5c) +* Intel 6th Gen Core (Skylake X) +* Intel 8th Gen Core i3 (Cannon Lake) +* Intel Xeon / 10th Gen Core (Ice Lake) +* Intel Xeon (Cascade Lake) +* Intel Xeon (Cooper Lake) +* Intel 3rd Gen 10nm++ (Tiger Lake) +* Intel 4th Gen 10nm++ (Sapphire Rapids) +* Intel 5th Gen 10nm++ (Emerald Rapids) +* Intel 11th Gen (Rocket Lake) From b1709c757a74805acc246f0230051b8f6727f104 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sat, 3 Aug 2024 19:57:54 +0200 Subject: [PATCH 02/18] chore: Update arrow panel menu item margin in panelUI-shared.css --- .../shared/customizableui/panelUI-shared-css.patch | 11 ++++++++++- src/browser/themes/shared/zen-browser-shared.css | 5 ----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/browser/themes/shared/customizableui/panelUI-shared-css.patch b/src/browser/themes/shared/customizableui/panelUI-shared-css.patch index d2c2e8a49..36027abfb 100644 --- a/src/browser/themes/shared/customizableui/panelUI-shared-css.patch +++ b/src/browser/themes/shared/customizableui/panelUI-shared-css.patch @@ -1,7 +1,16 @@ diff --git a/browser/themes/shared/customizableui/panelUI-shared.css b/browser/themes/shared/customizableui/panelUI-shared.css -index e4409ac75f6ee794d400559b0b01ae30904d01bc..44d4e648aa5aac17b82e0e1f80c7a953c2923ebc 100644 +index e4409ac75f6ee794d400559b0b01ae30904d01bc..4c10051d6bbc77440195b08397743c03a11d1fb0 100644 --- a/browser/themes/shared/customizableui/panelUI-shared.css +++ b/browser/themes/shared/customizableui/panelUI-shared.css +@@ -16,7 +16,7 @@ + --menu-panel-width-wide: 29em; + + --arrowpanel-menuitem-margin-block: 0; +- --arrowpanel-menuitem-margin-inline: 8px; ++ --arrowpanel-menuitem-margin-inline: 4px; + --arrowpanel-menuitem-margin: var(--arrowpanel-menuitem-margin-block) var(--arrowpanel-menuitem-margin-inline); + --arrowpanel-menuitem-padding-block: 8px; + --arrowpanel-menuitem-padding-inline: 8px; @@ -720,15 +720,15 @@ toolbarbutton[constrain-size="true"][cui-areatype="panel"] > .toolbarbutton-badg /* Firefox Account Toolbar Panel */ diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css index ceb6dc913..b5d1fc33d 100644 --- a/src/browser/themes/shared/zen-browser-shared.css +++ b/src/browser/themes/shared/zen-browser-shared.css @@ -518,11 +518,6 @@ panelmultiview { clip-path: inset(0px 0px 0px round var(--zen-browser-border-radius) 0) !important; } -#nav-bar { - padding-top: 5px; - padding-bottom: 5px; -} - #urlbar[breakout]:not([breakout-extend="true"]) { top: unset; } From 7e3c44846d43fd73a0d4c005e8f9417da5e7080c Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sat, 3 Aug 2024 20:33:50 +0200 Subject: [PATCH 03/18] chore: Update performance test results with latest version --- docs/performance.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/performance.md b/docs/performance.md index 3b8752aec..9bd7e4997 100644 --- a/docs/performance.md +++ b/docs/performance.md @@ -29,7 +29,7 @@ ## Scores ## 1 -- [NOCanoa ](https://github.com/NOCanoa) +- [NOCanoa](https://github.com/NOCanoa) OS: win 11; CPU: i5 13600k @@ -39,6 +39,7 @@ https://web.basemark.com/ | | score: |CSS | HTML5 | Page load and Responsiveness | Resize Cap. | |-----------|-----|-----|-------|------------------------------|-------------| +| 1.0.0-a.11 | 1678.49 | 59% | 91% | 91% | 76% | | 1.0.0-a.10 | 1660.89 | 59% | 91% | 91% | 76% | | 1.0.0-a.9 | 470 | why | why | why | why | | 1.0.0-a.8 | 446.74 | 59% | 91% | 96% | 76% | @@ -54,10 +55,10 @@ https://web.basemark.com/ ```mermaid xychart-beta title "Performance over time (Higher is better)" - x-axis [.3, .4, .6, .7, .8, .9, .10] + x-axis [.3, .4, .6, .7, .8, .9, .10, .11] y-axis "Benchmark Points" - bar [475.52, 470.49, 1747.98, 1964.43, 446.74, 470, 1660.89] - line [475.52, 470.49, 1747.98, 1964.43, 446.74, 470, 1660.89] + bar [475.52, 470.49, 1747.98, 1964.43, 446.74, 470, 1660.89, 1678.49] + line [475.52, 470.49, 1747.98, 1964.43, 446.74, 470, 1660.89, 1678.49] ``` ## Speedometer3.0 @@ -84,6 +85,7 @@ https://www.tablesgenerator.com/ | Version | Score: | |------------|--------| +| 1.0.0-a.11 | 20.8 | | 1.0.0-a.10 | 21.7 | | 1.0.0-a.9 | 3.7 | From 236c4160fcf7ee98f6bcb9291bb003b8021ba2af Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sat, 3 Aug 2024 21:40:15 +0200 Subject: [PATCH 04/18] chore: Update performance test results with latest version --- docs/performance.md | 2 +- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/performance.md b/docs/performance.md index 9bd7e4997..5672dd993 100644 --- a/docs/performance.md +++ b/docs/performance.md @@ -67,6 +67,7 @@ https://browserbench.org/Speedometer3.0/ | | score: | |-----------|-----| +| 1.0.0-a.11 | 20.8 | | 1.0.0-a.10 | 21.2 | | others| - | | Vivaldi 6.7.3329.39| 27.8 | @@ -85,7 +86,6 @@ https://www.tablesgenerator.com/ | Version | Score: | |------------|--------| -| 1.0.0-a.11 | 20.8 | | 1.0.0-a.10 | 21.7 | | 1.0.0-a.9 | 3.7 | diff --git a/package.json b/package.json index a2ac6bfc8..903e4c97d 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,6 @@ }, "homepage": "https://github.com/zen-browser/core#readme", "dependencies": { - "@zen-browser/surfer": "^1.2.5" + "@zen-browser/surfer": "^1.2.7" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2cfe98e9b..15dd63d35 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@zen-browser/surfer': - specifier: ^1.2.5 - version: 1.2.5 + specifier: ^1.2.7 + version: 1.2.7 packages: @@ -109,8 +109,8 @@ packages: '@types/node@17.0.45': resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} - '@zen-browser/surfer@1.2.5': - resolution: {integrity: sha512-EX39ay0wkCiifoAzxfoLZgAVXZawWDNDJuSqefvVq9kG82tbSSdgzhQSRjAOF0ZmaZegjyu0ID5+KroMtz3fLA==} + '@zen-browser/surfer@1.2.7': + resolution: {integrity: sha512-VbbbB7crGXrdfk1PPnlsWFWErwjtccXbRuw5mOQzY327d2t5VraxmkqTzcuGSTxpu3CR/KvzNu0gDg/6+7b4NQ==} hasBin: true ansi-regex@5.0.1: @@ -786,7 +786,7 @@ snapshots: '@types/node@17.0.45': {} - '@zen-browser/surfer@1.2.5': + '@zen-browser/surfer@1.2.7': dependencies: '@resvg/resvg-js': 1.4.0 async-icns: 1.0.2 From b224616b435782967abc6188799c1090c1957249 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sat, 3 Aug 2024 22:02:20 +0200 Subject: [PATCH 05/18] chore: Update macOS build configuration with optimized flags --- configs/macos/mozconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig index bcf0ccd23..d343d538d 100644 --- a/configs/macos/mozconfig +++ b/configs/macos/mozconfig @@ -16,10 +16,10 @@ if test "$SURFER_COMPAT" = "true"; then ac_add_options --enable-wasm-avx ac_add_options --enable-optimize="-march=nehalem -mtune=haswell -O3 -w" - export CFLAGS="-O3 -march=x86-64-v3" - export CPPFLAGS="-O3 -march=x86-64-v3" - export CXXFLAGS="-O3 -march=x86-64-v3" - export LDFLAGS="-Wl,-O3 -march=x86-64-v3" + export CFLAGS="-O3 -march=nehalem" + export CPPFLAGS="-O3 -march=nehalem" + export CXXFLAGS="-O3 -march=nehalem" + export LDFLAGS="-Wl,-O3 -march=nehalem" export RUSTFLAGS="-Ctarget-cpu=nehalem -C codegen-units=1" else ac_add_options --target=aarch64-apple-darwin From 76b2b55edae38219148a1c9644ad164e8fd53480 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sat, 3 Aug 2024 22:48:14 +0200 Subject: [PATCH 06/18] chore: Update padding for searchList cards in welcome.css --- src/browser/components/zen-welcome/welcome.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/components/zen-welcome/welcome.css b/src/browser/components/zen-welcome/welcome.css index 9af5475c4..e0a2a3a37 100644 --- a/src/browser/components/zen-welcome/welcome.css +++ b/src/browser/components/zen-welcome/welcome.css @@ -341,5 +341,5 @@ input[type='checkbox'] { #searchList .card { width: -moz-available !important; margin: 20px; - padding: 80px 0 !important; + padding: 20% 0 !important; } From 9998f93942fd613238d857d235170639687aaf98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mauro=20=F0=9F=A4=99?= Date: Sun, 4 Aug 2024 00:34:27 +0200 Subject: [PATCH 07/18] Update zenThemeModifier.js --- src/browser/base/content/zenThemeModifier.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/browser/base/content/zenThemeModifier.js b/src/browser/base/content/zenThemeModifier.js index fcabb3b56..dc07eb177 100644 --- a/src/browser/base/content/zenThemeModifier.js +++ b/src/browser/base/content/zenThemeModifier.js @@ -106,8 +106,7 @@ var ZenThemeModifier = { console.log("ZenThemeModifier: init browser layout"); const kNavbarItems = [ "nav-bar", - "PersonalToolbar", - "tab-notification-deck-template" + "PersonalToolbar" ]; const kSeparatorId = "zen-website-and-native-separator"; const kNewContainerId = "zen-appcontent-navbar-container"; From d60d4e888afdfaf5b203d9e25cb6a2b0121a1e94 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sun, 4 Aug 2024 11:04:34 +0200 Subject: [PATCH 08/18] chore: Update Windows build configuration with WebAssembly optimizations, also added persistent storage for sidebar --- configs/windows/mozconfig | 1 - .../base/content/navigator-toolbox-inc-xhtml.patch | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig index 0b6252017..dfaff1bcb 100644 --- a/configs/windows/mozconfig +++ b/configs/windows/mozconfig @@ -34,7 +34,6 @@ ac_add_options --disable-bits-download ac_add_options --without-wasm-sandboxed-libraries -ac_add_options --enable-wasm-avx if test "$SURFER_COMPAT" = "true"; then ac_add_options --enable-optimize="-O3 -mavx -maes -w -ftree-vectorize" diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch index 84b9ade53..2b06133ca 100644 --- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch +++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch @@ -1,7 +1,16 @@ diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml -index 390a1300a1213af2b411ba09c67e3c25750ee6c3..7c80c54dd43b5414bf5ea9101d53431c0b4a140b 100644 +index 390a1300a1213af2b411ba09c67e3c25750ee6c3..253d7abfcc1ade419c8f70289719cdc53898cab4 100644 --- a/browser/base/content/navigator-toolbox.inc.xhtml +++ b/browser/base/content/navigator-toolbox.inc.xhtml +@@ -2,7 +2,7 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +- ++ + + + @@ -32,10 +32,11 @@ From 29411d02d5d2967a586cea695dad807b6c3c44e4 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sun, 4 Aug 2024 11:21:37 +0200 Subject: [PATCH 09/18] chore: Update padding for searchList cards in welcome.css --- src/browser/themes/shared/zen-browser-shared.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css index b5d1fc33d..8f5380cab 100644 --- a/src/browser/themes/shared/zen-browser-shared.css +++ b/src/browser/themes/shared/zen-browser-shared.css @@ -414,6 +414,11 @@ toolbarbutton#scrollbutton-up { display: none; } +#nav-bar > *:not(.titlebar-buttonbox-container) { + padding-top: 5px; + padding-bottom: 5px; +} + #TabsToolbar-customization-target { height: 100%; } @@ -885,8 +890,3 @@ panelmultiview { } } -/* Window controls */ - -.titlebar-buttonbox-container { - padding-right: 10px; -} From 3cd21f55169d1ba4283be71085e2277a19701796 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sun, 4 Aug 2024 11:53:47 +0200 Subject: [PATCH 10/18] Reworked on compact mode --- .../themes/shared/zen-browser-shared.css | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css index 8f5380cab..1b2bc3bfb 100644 --- a/src/browser/themes/shared/zen-browser-shared.css +++ b/src/browser/themes/shared/zen-browser-shared.css @@ -536,22 +536,23 @@ panelmultiview { #navigator-toolbox[inFullscreen]{ margin-top: 0 !important; } #navigator-toolbox { + --zen-compact-toolbox-margin: 15px; position: absolute !important; display: block; transition: 50ms ease-in !important; - right: calc(100% - 25px) !important; + transform: translateX(calc(-100% + var(--zen-compact-toolbox-margin) + 2px)) !important; opacity: 0; line-height: 0; z-index: 1; - pointer-events: none; height: 100%; - padding: 0 !important; - margin: 0 !important; + margin: 0; + padding: var(--zen-compact-toolbox-margin) !important; & #titlebar { - border-right: 1px solid var(--zen-colors-border); - background: var(--zen-main-browser-background) !important; + border: 1px solid var(--zen-colors-border); + background: var(--zen-colors-tertiary) !important; padding: 0 5px; + border-radius: 8px; } } @@ -560,7 +561,7 @@ panelmultiview { #mainPopupSet:has(> #appMenu-popup:hover) ~ toolbox, #navigator-toolbox:has(*[open="true"]:not(tab):not(#zen-sidepanel-button)) { transition-delay: 33ms !important; - left: 0 !important; + transform: none !important; opacity: 1; } @@ -594,23 +595,25 @@ panelmultiview { @media (-moz-bool-pref: "zen.view.compact.hide-toolbar") { #zen-appcontent-navbar-container { - height: 10px; + transition: .2s ease-in-out; + transform: translateY(calc(-100% + 5px)); opacity: 0; position: absolute; width: 100%; + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; border-bottom: 1px solid var(--zen-colors-border); top: 0; - background: var(--zen-main-browser-background); + background: var(--zen-colors-tertiary); z-index: 1; - overflow: hidden; transition: .2s ease-in-out; - } + } #zen-appcontent-navbar-container:hover, #zen-appcontent-navbar-container:focus-within, #mainPopupSet:has(> #appMenu-popup:hover) ~ #zen-appcontent-navbar-container, #zen-appcontent-navbar-container:has(*[open="true"]) { - height: fit-content; + transform: translateY(0); opacity: 1; } From 3900908ed71356fe21f5d4bffd2f60ae96e71d07 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sun, 4 Aug 2024 12:01:13 +0200 Subject: [PATCH 11/18] Fixed pinned tabs --- src/browser/themes/shared/zen-browser-shared.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css index 1b2bc3bfb..9b99a4862 100644 --- a/src/browser/themes/shared/zen-browser-shared.css +++ b/src/browser/themes/shared/zen-browser-shared.css @@ -814,7 +814,7 @@ panelmultiview { /* We have the pinned tabs on the top, next to each other, * and the rest of the tabs are below them. */ display: grid; - grid-template-columns: repeat(auto-fill, minmax(31px, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(35px, 1fr)); padding: 5px; } From 4e61ab5e9820473cdfa7419753ee4623fef29664 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sun, 4 Aug 2024 12:27:44 +0200 Subject: [PATCH 12/18] chore: Update ZenSidebarManager to fix panel handling and data persistence --- .../base/content/ZenSidebarManager.mjs | 4 ++-- .../CustomizeMode-sys-mjs.patch | 20 +------------------ 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/browser/base/content/ZenSidebarManager.mjs b/src/browser/base/content/ZenSidebarManager.mjs index f440fccea..93827b4c2 100644 --- a/src/browser/base/content/ZenSidebarManager.mjs +++ b/src/browser/base/content/ZenSidebarManager.mjs @@ -511,9 +511,9 @@ var gZenBrowserManagerSidebar = { if (browser) { browser.remove(); } - this._closeSidebarPanel(); - this.close(); + this._currentPanel = null; this._lastOpenedPanel = null; + this.update(); Services.prefs.setStringPref("zen.sidebar.data", JSON.stringify(data)); }, diff --git a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch index 26596e67c..2ef493ec0 100644 --- a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch +++ b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch @@ -1,25 +1,7 @@ diff --git a/browser/components/customizableui/CustomizeMode.sys.mjs b/browser/components/customizableui/CustomizeMode.sys.mjs -index 7b4ee373be2cb3e11b480b2c0ad59cae1c43fc07..0f89293bc568fa994fc6f251478ec3dfac5ead39 100644 +index 41f347130e754ad0ee3416c1a3881211c4d2f777..e7b84b3b89fb4030ac05361475c0786e4208d5b8 100644 --- a/browser/components/customizableui/CustomizeMode.sys.mjs +++ b/browser/components/customizableui/CustomizeMode.sys.mjs -@@ -354,7 +354,7 @@ CustomizeMode.prototype = { - this._transitioning = true; - - let customizer = document.getElementById("customization-container"); -- let browser = document.getElementById("browser"); -+ let browser = document.getElementById("tabbrowser-tabbox"); - browser.hidden = true; - customizer.hidden = false; - -@@ -485,7 +485,7 @@ CustomizeMode.prototype = { - } - - let customizer = document.getElementById("customization-container"); -- let browser = document.getElementById("browser"); -+ let browser = document.getElementById("tabbrowser-tabbox"); - customizer.hidden = true; - browser.hidden = false; - @@ -2276,6 +2276,20 @@ CustomizeMode.prototype = { if (makeSpaceImmediately) { aItem.setAttribute("notransition", "true"); From fa6911df5e3da55520a3eb13afa28c441963ebc5 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sun, 4 Aug 2024 12:41:23 +0200 Subject: [PATCH 13/18] chore: Update backdrop-filter blur value in zen-browser-shared.css --- src/browser/themes/shared/zen-browser-shared.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css index 9b99a4862..025ab3c7d 100644 --- a/src/browser/themes/shared/zen-browser-shared.css +++ b/src/browser/themes/shared/zen-browser-shared.css @@ -849,12 +849,10 @@ panelmultiview { #urlbar:is([breakout][breakout-extend], [breakout][usertyping][focused]) { #urlbar-input { font-size: 16px !important; - text-align: left !important; } - z-index: 1; + z-index: 2; position: fixed !important; - --urlbar-height: auto !important; bottom: auto !important; top: 20vh !important; padding-left: 6px !important; @@ -876,7 +874,7 @@ panelmultiview { left: 0px; background-color: rgba(0, 0, 0, 0.3); - backdrop-filter: blur(8px); + backdrop-filter: blur(5px); z-index: -1; } From 741cfd7af437da25fd05de340b3548059b854f82 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sun, 4 Aug 2024 12:46:52 +0200 Subject: [PATCH 14/18] chore: Update mozconfig to allow loading unsigned extensions --- configs/common/mozconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/common/mozconfig b/configs/common/mozconfig index b2a02e7f1..bc86e729b 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -95,3 +95,7 @@ mk_add_options MOZ_SERVICES_HEALTHREPORT=0 mk_add_options MOZ_TELEMETRY_REPORTING=0 export MOZ_APP_UA_NAME="Firefox" + +# Allow loading unsigned extensions +export MOZ_REQUIRE_SIGNING=1 +mk_add_options MOZ_REQUIRE_SIGNING=1 From 14da8cd9e75303a8ab741ffe55e1ba69d07c4a6f Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sun, 4 Aug 2024 13:02:25 +0200 Subject: [PATCH 15/18] chore: Update sidebar close-on-blur preference handling --- src/browser/app/profile/zen-browser.js | 2 +- src/browser/base/content/ZenSidebarManager.mjs | 17 ++++++++++++----- .../base/content/zen-sidebar-panel.inc.xhtml | 2 +- .../components/preferences/zen-settings.js | 5 +++++ .../preferences/zenLooksAndFeel.inc.xhtml | 5 +++++ .../browser/preferences/zen-preferences.ftl | 2 ++ 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index b52c4f155..3950b6ff2 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -77,7 +77,7 @@ pref('zen.view.sidebar-expanded.max-width', 400); // Zen Sidebar pref('zen.sidebar.data', "{\"data\":\n {\"p1\":{\n \"url\":\"https://www.wikipedia.org/\"\n },\n\"p2\":{\n \"url\":\"https://m.twitter.com/\",\n\"ua\": true\n },\n\"p3\": {\n \"url\": \"https://www.youtube.com/\",\n\"ua\": true\n},\n\"p4\": {\n \"url\": \"https://translate.google.com/\",\n\"ua\": true\n},\n\"p5\": {\n \"url\": \"https://todoist.com/\",\n\"ua\": true\n}},\n\"index\":[\"p1\",\"p2\",\"p3\",\"p4\",\"p5\"]}"); pref('zen.sidebar.enabled', true); -pref('zen.sidebar.floating', true); +pref('zen.sidebar.close-on-blur', true); // Zen Split View pref('zen.splitView.working', false); diff --git a/src/browser/base/content/ZenSidebarManager.mjs b/src/browser/base/content/ZenSidebarManager.mjs index 93827b4c2..b7b3a3171 100644 --- a/src/browser/base/content/ZenSidebarManager.mjs +++ b/src/browser/base/content/ZenSidebarManager.mjs @@ -31,10 +31,13 @@ var gZenBrowserManagerSidebar = { return JSON.parse(services); }, + get shouldCloseOnBlur() { + return Services.prefs.getBoolPref("zen.sidebar.close-on-blur"); + }, + listenForPrefChanges() { Services.prefs.addObserver("zen.sidebar.data", this.handleEvent.bind(this)); Services.prefs.addObserver("zen.sidebar.enabled", this.handleEvent.bind(this)); - Services.prefs.addObserver("zen.sidebar.floating", this.handleEvent.bind(this)); let sidebar = document.getElementById("zen-sidebar-web-panel"); this.splitterElement.addEventListener("mousedown", (function(event) { @@ -102,6 +105,10 @@ var gZenBrowserManagerSidebar = { this.handleEvent(); }, + get isFloating() { + return document.getElementById("zen-sidebar-web-panel").hasAttribute("pinned"); + }, + handleEvent() { this._hasChangedConfig = true; this.update(); @@ -109,10 +116,11 @@ var gZenBrowserManagerSidebar = { // https://stackoverflow.com/questions/11565471/removing-event-listener-which-was-added-with-bind var clickOutsideHandler = this._handleClickOutside.bind(this); - if (Services.prefs.getBoolPref("zen.sidebar.floating") && !this._hasRegisteredPinnedClickOutside) { + let isFloating = this.isFloating; + if (isFloating && !this._hasRegisteredPinnedClickOutside) { document.addEventListener("mouseup", clickOutsideHandler); this._hasRegisteredPinnedClickOutside = true; - } else if (!Services.prefs.getBoolPref("zen.sidebar.floating") && this._hasRegisteredPinnedClickOutside) { + } else if (!isFloating && this._hasRegisteredPinnedClickOutside) { document.removeEventListener("mouseup", clickOutsideHandler); this._hasRegisteredPinnedClickOutside = false; } @@ -129,7 +137,7 @@ var gZenBrowserManagerSidebar = { _handleClickOutside(event) { let sidebar = document.getElementById("zen-sidebar-web-panel"); - if (!sidebar.hasAttribute("pinned") || !this._currentPanel || this._isDragging) { + if (!sidebar.hasAttribute("pinned") || this._isDragging || !this.shouldCloseOnBlur) { return; } let target = event.target; @@ -420,7 +428,6 @@ var gZenBrowserManagerSidebar = { } else { this._setPinnedToElements(); } - Services.prefs.setBoolPref("zen.sidebar.floating", sidebar.hasAttribute("pinned")); this.update(); }, diff --git a/src/browser/base/content/zen-sidebar-panel.inc.xhtml b/src/browser/base/content/zen-sidebar-panel.inc.xhtml index 1e718452b..46f78d69f 100644 --- a/src/browser/base/content/zen-sidebar-panel.inc.xhtml +++ b/src/browser/base/content/zen-sidebar-panel.inc.xhtml @@ -1,5 +1,5 @@ -