From 67b6daaa0e869e0b5e954b880dc95016be920867 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Mon, 31 Aug 2026 02:52:10 +0200
Subject: [PATCH] gh-15177: Improve on-boarding experience and new space form
UX (gh-15178)
---
locales/en-US/browser/browser/zen-welcome.ftl | 39 +-
.../base/content/zen-panels/theme-picker.inc | 94 +-
.../preferences/preferences-js.patch | 8 +-
.../windows/nsis/uninstaller-nsi.patch | 11 +-
src/browser/themes/shared/zen-icons/icons.css | 3 +-
src/zen/common/modules/ZenUIManager.mjs | 6 +-
src/zen/common/styles/zen-omnibox.css | 5 +
src/zen/common/styles/zen-theme.css | 2 +-
src/zen/common/zenThemeModifier.js | 2 +-
src/zen/images/favicons/tuta.svg | 3 +-
.../providers/GithubLiveFolder.sys.mjs | 3 +-
src/zen/spaces/ZenGradientGenerator.mjs | 5 +-
src/zen/spaces/ZenSpaceCreation.mjs | 185 ++-
src/zen/spaces/ZenSpaceManager.mjs | 119 +-
src/zen/spaces/create-workspace-form.css | 7 +-
src/zen/spaces/zen-workspaces.css | 5 +-
src/zen/sync/ZenSpacesSync.sys.mjs | 2 +-
src/zen/tabs/zen-tabs/vertical-tabs.css | 13 +-
src/zen/tests/welcome/browser_welcome.js | 330 +++---
src/zen/tests/welcome/head.js | 2 +-
src/zen/welcome/ZenWelcome.mjs | 1041 ++++++++---------
src/zen/welcome/jar.inc.mn | 1 +
src/zen/welcome/welcome-background.mp4 | Bin 0 -> 15452319 bytes
src/zen/welcome/zen-welcome.css | 596 ++++++----
24 files changed, 1367 insertions(+), 1115 deletions(-)
create mode 100644 src/zen/welcome/welcome-background.mp4
diff --git a/locales/en-US/browser/browser/zen-welcome.ftl b/locales/en-US/browser/browser/zen-welcome.ftl
index 1967595a9..c351f271a 100644
--- a/locales/en-US/browser/browser/zen-welcome.ftl
+++ b/locales/en-US/browser/browser/zen-welcome.ftl
@@ -5,29 +5,28 @@
zen-welcome-title-line1 = Welcome to
zen-welcome-title-line2 = a calmer internet
-zen-welcome-import-title = A Fresh Start, Same Bookmarks
-zen-welcome-import-description-1 = Your bookmarks, history, and passwords are like a trail of breadcrumbs through the internet—don’t leave them behind!
-zen-welcome-import-description-2 = Easily bring them over from another browser and pick up right where you left off.
-zen-welcome-import-button = Import now
+zen-welcome-back = Back
+zen-welcome-skip = Skip for now
-zen-welcome-set-default-browser = Set { -brand-short-name } as your default browser
-zen-welcome-dont-set-default-browser = DON’T set { -brand-short-name } as your default browser
+zen-welcome-import-title = Bring your stuff along.
+zen-welcome-import-description = Import your bookmarks, history and passwords from another browser and pick up right where you left off.
+zen-welcome-import-yes = YES, import from another browser.
+zen-welcome-import-no = NO, start fresh.
-zen-welcome-initial-essentials-title = Your Key Tabs, Always Within Reach
-zen-welcome-initial-essentials-description-1 = Keep your most important tabs easily accessible and always at hand, no matter how many you open.
-zen-welcome-initial-essentials-description-2 = Essential tabs are always visible, no matter what workspace you are in.
+zen-welcome-default-browser-title = Make { -brand-short-name } your default?
+zen-welcome-default-browser-description = Links from other apps will open in { -brand-short-name }. You can always change this later.
+zen-welcome-set-default-browser = YES, make { -brand-short-name } default.
+zen-welcome-dont-set-default-browser = NO, still exploring my options.
-zen-welcome-workspace-colors-title = Your Workspaces, Your Colors
-zen-welcome-workspace-colors-description = Personalize your browser by giving each workspace its own unique color identity.
-
-zen-welcome-start-browsing-title = All set?
- Let’s get rolling!
-zen-welcome-start-browsing-description-1 = You’re all set up and ready to go. Click the button below to start browsing with { -brand-short-name }.
-zen-welcome-start-browsing = Dive in!
-
-zen-welcome-default-search-title = Your Default Search Engine
+zen-welcome-default-search-title = Pick your search engine.
zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
-zen-welcome-skip-button = Skip
+zen-welcome-essentials-title = Choose the apps you use most.
+zen-welcome-essentials-description = Select your favorite apps to keep them handy in your sidebar.
-zen-welcome-finished = Your Zen has been set up correctly!
+zen-welcome-workspace-colors-title = Your space, your colors.
+zen-welcome-workspace-colors-description = Personalize your browser by giving each space its own unique color identity.
+
+zen-welcome-start-browsing-title = All set? Let’s get rolling!
+zen-welcome-start-browsing-description-1 = You’re all set up and ready to go. Click the button below to start browsing with { -brand-short-name }.
+zen-welcome-start-browsing = Dive in!
diff --git a/src/browser/base/content/zen-panels/theme-picker.inc b/src/browser/base/content/zen-panels/theme-picker.inc
index 524126c55..7f7f0b495 100644
--- a/src/browser/base/content/zen-panels/theme-picker.inc
+++ b/src/browser/base/content/zen-panels/theme-picker.inc
@@ -14,14 +14,14 @@
-
-
-
+
+
+
-
-
-
+
+
+
@@ -29,82 +29,82 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
# Start from black to white in a span on 8 steps and.
# They must all go from the middle to the right side. They must always stay verically centered.
# And reach to 180 on the right side, meaning we must divide the width in 16 segments.
-
-
-
-
-
-
-
-
-
diff --git a/src/browser/components/preferences/preferences-js.patch b/src/browser/components/preferences/preferences-js.patch
index 3e3ad8c86..d7367f2ae 100644
--- a/src/browser/components/preferences/preferences-js.patch
+++ b/src/browser/components/preferences/preferences-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index a76699af75252bec31e17b562463c37236cbbfe5..6355a6ee92754846ffcdd123ac49545d520470c7 100644
+index 94612d8e28af58fcb04914440348b899a0a1e08f..da3b1ffd09745d09589283356d1001dbfb76a468 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -132,6 +132,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
@@ -10,7 +10,7 @@ index a76699af75252bec31e17b562463c37236cbbfe5..6355a6ee92754846ffcdd123ac49545d
],
resizeCallback: async ({ title, frame }) => {
// Search within main document and highlight matched keyword.
-@@ -462,6 +463,8 @@ const CONFIG_PANES = Object.freeze({
+@@ -471,6 +472,8 @@ const CONFIG_PANES = Object.freeze({
tabsBrowsing: {
l10nId: "tabs-browsing-section",
groupIds: [
@@ -19,7 +19,7 @@ index a76699af75252bec31e17b562463c37236cbbfe5..6355a6ee92754846ffcdd123ac49545d
"browserLayout",
"tabs",
"pageNavigation",
-@@ -509,7 +512,7 @@ function register_module(categoryName, categoryObject) {
+@@ -518,7 +521,7 @@ function register_module(categoryName, categoryObject) {
}
this._initted = true;
let template = document.getElementById("template-" + categoryName);
@@ -28,7 +28,7 @@ index a76699af75252bec31e17b562463c37236cbbfe5..6355a6ee92754846ffcdd123ac49545d
// Replace the template element with the nodes inside of it.
template.replaceWith(template.content);
-@@ -553,6 +556,10 @@ function init_all() {
+@@ -562,6 +565,10 @@ function init_all() {
register_module("paneHome", gHomePane);
register_module("paneSearch", gSearchPane);
register_module("panePrivacy", gPrivacyPane);
diff --git a/src/browser/installer/windows/nsis/uninstaller-nsi.patch b/src/browser/installer/windows/nsis/uninstaller-nsi.patch
index ad4d6025a..6c8873660 100644
--- a/src/browser/installer/windows/nsis/uninstaller-nsi.patch
+++ b/src/browser/installer/windows/nsis/uninstaller-nsi.patch
@@ -1,9 +1,18 @@
diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
old mode 100755
new mode 100644
-index becbb0f70c84eb7f2d9bff5a3aedcbb7a78a61cf..05835d2088ab631316a25a9f0728898bd7998d8d
+index becbb0f70c84eb7f2d9bff5a3aedcbb7a78a61cf..a23a8a1b160932368377fc841b501df9355918db
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/installer/windows/nsis/uninstaller.nsi
+@@ -150,7 +150,7 @@ OutFile "helper.exe"
+ !endif
+ ShowUnInstDetails nevershow
+
+-!define URLUninstallSurvey "https://qsurvey.mozilla.com/s3/FF-Desktop-Post-Uninstall?channel=${UpdateChannel}&version=${AppVersion}&osversion="
++!define URLUninstallSurvey "https://links.zen-browser.app/uninstall-feedback?osversion="
+
+ ; Support for the profile refresh feature
+ !define URLProfileRefreshHelp "https://support.mozilla.org/kb/refresh-firefox-reset-add-ons-and-settings"
@@ -516,6 +516,7 @@ Section "Uninstall"
${un.RegCleanFileHandler} ".svg" "FirefoxHTML-$AppUserModelID"
${un.RegCleanFileHandler} ".webp" "FirefoxHTML-$AppUserModelID"
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index a42d0021c..e76187864 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -812,7 +812,8 @@
#toolbar-context-toggle-vertical-tabs,
#toolbar-context-customize-sidebar,
-#sidebarRevampSeparator {
+#sidebarRevampSeparator,
+.fxa-menu-sign-in-promo-image {
display: none !important;
}
diff --git a/src/zen/common/modules/ZenUIManager.mjs b/src/zen/common/modules/ZenUIManager.mjs
index 977a7d8df..d205f6951 100644
--- a/src/zen/common/modules/ZenUIManager.mjs
+++ b/src/zen/common/modules/ZenUIManager.mjs
@@ -543,6 +543,10 @@ window.gZenUIManager = {
return false;
}
+ if (document.documentElement.hasAttribute("zen-welcome-stage")) {
+ return false;
+ }
+
const shouldOpenURLBar =
overridePreferance ||
(gZenVerticalTabsManager._canReplaceNewTab &&
@@ -1282,7 +1286,7 @@ window.gZenVerticalTabsManager = {
if (!this._hasSetSingleToolbar) {
height = AppConstants.platform == "macosx" ? 34 : 32;
} else if (!gURLBar.hasAttribute("breakout-extend")) {
- height = 36;
+ height = 38;
}
if (typeof height !== "undefined") {
gURLBar.style.setProperty("--urlbar-height", `${height}px`);
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 98659ef8d..7ad2a72b2 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -136,6 +136,11 @@
& #identity-box {
margin-inline-end: 0 !important;
+
+ &[pageproxystate="invalid"] {
+ margin-inline-end: -4px !important;
+ }
+
&.chromeUI:not([pageproxystate="invalid"]) #identity-icon-box {
border-radius: 10px !important;
}
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index 51a4447f7..fd5a01175 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -286,7 +286,7 @@
* 1. If the native radius - the separation is less than 4px, use 4px.
* 2. Otherwise, use the the calculated value (inner radius = outer radius - separation).
*/
- max(5px, calc(var(--zen-border-radius) - var(--zen-element-separation) / 2))
+ max(5px, calc((var(--zen-border-radius) - var(--zen-element-separation) / 2) * var(--zen-squircle-value)))
);
/** Other theme-related styles */
diff --git a/src/zen/common/zenThemeModifier.js b/src/zen/common/zenThemeModifier.js
index 314e5fc6e..84fa26405 100644
--- a/src/zen/common/zenThemeModifier.js
+++ b/src/zen/common/zenThemeModifier.js
@@ -109,7 +109,7 @@
if (AppConstants.platform == "macosx") {
const targetRadius = window.matchMedia("(-moz-mac-tahoe-theme)")
.matches
- ? 14
+ ? 12
: 10;
document.documentElement.style.setProperty(
"--zen-border-radius",
diff --git a/src/zen/images/favicons/tuta.svg b/src/zen/images/favicons/tuta.svg
index 8dc5ca458..c7bc7e62a 100644
--- a/src/zen/images/favicons/tuta.svg
+++ b/src/zen/images/favicons/tuta.svg
@@ -3,8 +3,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/.
-->
-
-