From bb9b7b74aaca023cf4d1c7f0e1742ebf59e5dfe3 Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Wed, 1 Oct 2025 21:52:26 +0200 Subject: [PATCH 1/3] feat: Improved space edit button sizings, b=no-bug, c=workspaces --- src/zen/workspaces/zen-workspaces.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css index 023c107ba..5ac09c7c2 100644 --- a/src/zen/workspaces/zen-workspaces.css +++ b/src/zen/workspaces/zen-workspaces.css @@ -237,7 +237,10 @@ --toolbarbutton-inner-padding: 6px; & image { - border-radius: calc(var(--border-radius-medium) - 4px); + border-radius: calc(var(--border-radius-medium) - 4px) !important; + width: 26px; + height: 26px; + margin-right: -1px; } :root[zen-renaming-tab='true'] & { From 69a0ddd03c1710079b53d2f0a6828d1d70ec0a57 Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Wed, 1 Oct 2025 22:17:42 +0200 Subject: [PATCH 2/3] fix: Fix compact mode native radius and separtion for windows, b=no-bug, c=compact-mode --- src/browser/themes/windows/browser-css.patch | 5 +++-- src/zen/compact-mode/zen-compact-mode.css | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/browser/themes/windows/browser-css.patch b/src/browser/themes/windows/browser-css.patch index 098bd9c63..5b064a7bb 100644 --- a/src/browser/themes/windows/browser-css.patch +++ b/src/browser/themes/windows/browser-css.patch @@ -1,5 +1,5 @@ diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css -index 4485369284ee762bc8b35afb84fec0874a831fff..7096e2e5d50cda99b62a2aa7118fea6371e76b85 100644 +index 4485369284ee762bc8b35afb84fec0874a831fff..6a1ad15f657437aa4ef98fda63ae921a378f7310 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -31,7 +31,6 @@ @@ -10,13 +10,14 @@ index 4485369284ee762bc8b35afb84fec0874a831fff..7096e2e5d50cda99b62a2aa7118fea63 } /* Using a semitransparent background preserves the tinting from the backdrop. -@@ -60,14 +59,12 @@ +@@ -60,14 +59,13 @@ } /* This is needed for Windows 10, see bug 1961257 */ -@media (-moz-windows-accent-color-in-titlebar) { - :root[customtitlebar][sizemode="normal"] #navigator-toolbox { + :root[customtitlebar][sizemode="normal"] #browser { ++ --zen-sidebar-compact-top-offset: 1px; border-top: 0.5px solid ActiveBorder; &:-moz-window-inactive { border-top-color: InactiveBorder; diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css index 38741c81a..af798fa33 100644 --- a/src/zen/compact-mode/zen-compact-mode.css +++ b/src/zen/compact-mode/zen-compact-mode.css @@ -29,7 +29,7 @@ &, &::before, &::after { - border-radius: calc(var(--zen-native-inner-radius) + var(--zen-element-separation) / 4 - var(--zen-compact-mode-no-padding-radius-fix, 0px)); + border-radius: calc(var(--zen-native-inner-radius) - var(--zen-compact-mode-no-padding-radius-fix, 0px)); } } @@ -97,7 +97,10 @@ bottom: var(--zen-compact-float); padding: 0 var(--zen-compact-float) !important; :root[zen-single-toolbar='true'] & { - top: calc(var(--zen-compact-float) / 2); + /* We add an extra offset since windows users have a border top + * in the window in order to compensate how windows renders the + * titlebar */ + top: calc(var(--zen-compact-float) / 2 + var(--zen-sidebar-compact-top-offset, 0px)); height: calc(100% - var(--zen-compact-float)); } :root:not([zen-single-toolbar='true']) & { From 2c31564f5de93d918e902ebd3b11595ddef1d7c2 Mon Sep 17 00:00:00 2001 From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com> Date: Wed, 1 Oct 2025 23:45:22 +0200 Subject: [PATCH 3/3] Revert "chore: Re-enable updater service, p=#10654, c=configs", p=#10660 --- configs/windows/mozconfig | 3 +++ src/browser/installer/package-manifest-in.patch | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig index 0e725a01e..408d8884e 100644 --- a/configs/windows/mozconfig +++ b/configs/windows/mozconfig @@ -22,6 +22,9 @@ if test "$ZEN_CROSS_COMPILING"; then fi fi +ac_add_options --disable-maintenance-service +ac_add_options --disable-bits-download + if test "$SURFER_COMPAT" = "x86_64"; then ac_add_options --target=x86_64-pc-windows-msvc diff --git a/src/browser/installer/package-manifest-in.patch b/src/browser/installer/package-manifest-in.patch index 8634232ff..7cc6a9526 100644 --- a/src/browser/installer/package-manifest-in.patch +++ b/src/browser/installer/package-manifest-in.patch @@ -1,8 +1,18 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in -index 70f268914f1078ef45e86d295f4bb2ce179a05e0..9eb138023bc9de6211a3e814b0525da612156a78 100644 +index 70f268914f1078ef45e86d295f4bb2ce179a05e0..73d8ffc4457468e8a57ad2c29e4d49f45436bf00 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -369,9 +369,9 @@ bin/libfreebl_64int_3.so +@@ -361,17 +361,17 @@ bin/libfreebl_64int_3.so + ; [MaintenanceService] + ; + #ifdef MOZ_MAINTENANCE_SERVICE +-@BINPATH@/maintenanceservice.exe +-@BINPATH@/maintenanceservice_installer.exe ++;@BINPATH@/maintenanceservice.exe ++;@BINPATH@/maintenanceservice_installer.exe + #endif + + ; [Crash Reporter] ; #ifdef MOZ_CRASHREPORTER #ifdef XP_MACOSX