style: adjust padding and border radius in settings window CSS; add test content in XHTML

.github/workflows/build.yml

@@ -517,8 +517,6 @@ jobs:
           repository: ./updates-server
 
       - name: Generate Release Notes
-        env:
-          RELEASE_BRANCH: ${{ inputs.update_branch }}
         run: bash .github/workflows/src/generate_release_notes.sh
 
         # If we are on Twilight, we want to just update the Twilight tag's release

README.md

@@ -28,7 +28,7 @@
 
 ## 🖥️ Compatibility
 
-Zen is currently built using Firefox version `136.0.2`! 🚀
+Zen is currently built using Firefox version `136.0.1`! 🚀
 
 - [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 136.0`!
 - Check out the latest [release notes](https://zen-browser.app/release-notes)!

firefox-cache/l10n-last-commit-hash

@@ -1 +1 @@
-6013afe489c3d5e19c5f0d0f6c3f94b91f5bd7d1
+6ad0ab3c43a6208d8bcd997b40e802fccd48ba0a

scripts/update_ff.py

@@ -64,12 +64,6 @@ def update_l10n_last_commit_hash():
     if not os.path.exists("firefox-cache"):
       os.mkdir("firefox-cache")
     os.system("cat l10n-temp/.git/refs/heads/main > firefox-cache/l10n-last-commit-hash")
-    # Remove new line character
-    data = ""
-    with open("firefox-cache/l10n-last-commit-hash", "r") as f:
-      data = f.read()
-    with open("firefox-cache/l10n-last-commit-hash", "w") as f:
-      f.write(data.strip())
   except KeyboardInterrupt:
     print("Exiting...")
   shutil.rmtree("l10n-temp")

src/browser/base/content/ZenUIManager.mjs

@@ -250,7 +250,7 @@ var gZenUIManager = {
     const toast = this._createToastElement(messageId, options);
     this._toastContainer.removeAttribute('hidden');
     this._toastContainer.appendChild(toast);
-    await this.motion.animate(toast, { opacity: [0, 1], scale: [0.8, 1] }, { type: 'spring', bounce: 0.5, duration: 0.7 });
+    await this.motion.animate(toast, { opacity: [0, 1], scale: [0.8, 1] }, { type: 'spring', bounce: 0.5, duration: 0.5 });
     await new Promise((resolve) => setTimeout(resolve, 3000));
     await this.motion.animate(toast, { opacity: [1, 0], scale: [1, 0.9] }, { duration: 0.2, bounce: 0 });
     const toastHeight = toast.getBoundingClientRect().height;
@@ -265,6 +265,14 @@ var gZenUIManager = {
   get panelUIPosition() {
     return gZenVerticalTabsManager._hasSetSingleToolbar ? 'bottomleft topleft' : 'bottomright topright';
   },
+
+  openSettingsWindow() {
+    window.openDialog(
+      'chrome://browser/content/zen-components/windows/zen-settings.xhtml',
+      '_blank',
+      'centerscreen,chrome,dialog=no,resizable=no,titlebar'
+    );
+  },
 };
 
 var gZenVerticalTabsManager = {

src/browser/base/content/zen-assets.jar.inc.mn

@@ -52,6 +52,8 @@
         content/browser/zen-styles/zen-welcome.css              (content/zen-styles/zen-welcome.css)
         content/browser/zen-styles/zen-media-controls.css       (content/zen-styles/zen-media-controls.css)
 
+        content/browser/zen-styles/windows/zen-settings.css     (content/zen-styles/windows/zen-settings.css)
+
         content/browser/zen-styles/zen-panels/bookmarks.css     (content/zen-styles/zen-panels/bookmarks.css)
         content/browser/zen-styles/zen-panels/extensions.css    (content/zen-styles/zen-panels/extensions.css)
         content/browser/zen-styles/zen-panels/print.css         (content/zen-styles/zen-panels/print.css)
@@ -81,3 +83,6 @@
         # JS Vendor
         content/browser/zen-vendor/tsparticles.confetti.bundle.min.js (content/zen-vendor/tsparticles.confetti.bundle.min.js)
         content/browser/zen-vendor/motion.min.mjs                      (content/zen-vendor/motion.min.mjs)
+
+        # Windows
+        content/browser/zen-components/windows/zen-settings.xhtml (zen-components/windows/zen-settings.xhtml)

src/browser/base/content/zen-styles/windows/zen-settings.css

@@ -0,0 +1,49 @@
+@namespace html 'http://www.w3.org/1999/xhtml';
+@namespace xul 'http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul';
+
+* {
+  margin: 0;
+  box-sizing: border-box;
+}
+
+:root {
+  font: message-box;
+}
+
+body {
+  width: 100%;
+}
+
+#main-content {
+  background: var(--zen-themed-toolbar-bg-transparent);
+  @supports (-moz-osx-font-smoothing: auto) {
+    appearance: -moz-window-titlebar;
+  }
+
+  user-select: none;
+  touch-action: none;
+  pointer-events: auto;
+
+  width: 100%;
+  height: 100%;
+
+  overflow-x: hidden;
+  overflow-y: auto;
+
+  gap: 2rem;
+  padding: 1rem;
+}
+
+.section {
+  width: 100%;
+  position: relative;
+  gap: 0.6rem;
+
+  .section-content {
+    width: 100%;
+    background: var(--zen-toolbar-element-bg);
+    border-radius: 6px;
+    padding: 1em;
+    font-size: 1.1em;
+  }
+}

src/browser/base/content/zen-styles/zen-popup.css

@@ -360,14 +360,9 @@ menuitem {
   & .zen-toast {
     padding: 0.9rem 0.8rem;
     border-radius: 12px;
-    background: linear-gradient(
-      170deg,
-      var(--zen-primary-color) -40%,
-      color-mix(in srgb, var(--zen-primary-color) 85%, #0f0f0f 15%)
-    );
+    background: linear-gradient(170deg, light-dark(rgb(187, 187, 187), rgb(240, 240, 240)) -40%, var(--zen-primary-color) 140%);
     color: var(--button-primary-color);
-    box-shadow: 0 0 14px 3px rgba(0, 0, 0, 0.05);
-    border: 1px solid rgba(0, 0, 0, 0.1);
+    box-shadow: 0 0 16px 3px rgba(0, 0, 0, 0.1);
     display: flex;
     font-weight: 500;
     gap: 5px;

src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css

@@ -269,7 +269,7 @@
     }
 
     #tabbrowser-tabs:not([movingtab]) & .tab-content > image:active {
-      scale: 0.92;
+      scale: var(--zen-active-tab-scale);
     }
 
     & .tab-icon-image {

src/browser/base/zen-components/ZenMediaController.mjs

@@ -428,10 +428,7 @@ class ZenMediaController {
   }
 
   onMediaFocus() {
-    if (!this._currentBrowser) return;
-    const sidebarId = this._currentBrowser.getAttribute('zen-sidebar-id');
-    if (sidebarId) gZenBrowserManagerSidebar.open(sidebarId);
-    else this._currentMediaController?.focus();
+    this._currentMediaController?.focus();
   }
 
   onMediaMute() {

src/browser/base/zen-components/ZenPinnedTabManager.mjs

@@ -510,10 +510,6 @@
         case 'unload-switch':
         case 'reset-switch':
         case 'switch':
-          let { permitUnload } = selectedTab.linkedBrowser?.permitUnload();
-          if (!permitUnload) {
-            return;
-          }
           this._handleTabSwitch(selectedTab);
           if (behavior.includes('reset')) {
             this._resetTabToStoredState(selectedTab);
@@ -524,7 +520,8 @@
             }
             // Do not unload about:* pages
             if (!selectedTab.linkedBrowser?.currentURI.spec.startsWith('about:')) {
-              gZenTabUnloader.explicitUnloadTabs([selectedTab], { permitUnload });
+              gBrowser.explicitUnloadTabs([selectedTab]);
+              selectedTab.removeAttribute('linkedpanel');
             }
           }
           break;

src/browser/base/zen-components/ZenSidebarManager.mjs

@@ -280,10 +280,8 @@ class ZenBrowserManagerSidebar extends ZenDOMOperatedFeature {
     this.close();
   }
 
-  open(id = null) {
+  open() {
     let sidebar = document.getElementById('zen-sidebar-web-panel');
-    if (id) this._currentPanel = id;
-
     sidebar.removeAttribute('hidden');
     this.update();
   }

src/browser/base/zen-components/ZenTabUnloader.mjs

@@ -235,9 +235,9 @@
       this.explicitUnloadTabs(tabs);
     }
 
-    explicitUnloadTabs(tabs, extraArgs = {}) {
+    explicitUnloadTabs(tabs) {
       for (let i = 0; i < tabs.length; i++) {
-        if (this.canUnloadTab(tabs[i], Date.now(), this.intervalUnloader.excludedUrls, true, extraArgs)) {
+        if (this.canUnloadTab(tabs[i], Date.now(), this.intervalUnloader.excludedUrls, true)) {
           this.unload(tabs[i]);
         }
       }
@@ -259,7 +259,7 @@
       }
     }
 
-    canUnloadTab(tab, currentTimestamp, excludedUrls, ignoreTimestamp = false, extraArgs = {}) {
+    canUnloadTab(tab, currentTimestamp, excludedUrls, ignoreTimestamp = false) {
       if (
         (tab.pinned && !ignoreTimestamp) ||
         tab.selected ||
@@ -271,9 +271,6 @@
         tab.attention ||
         tab.hasAttribute('glance-id') ||
         tab.linkedBrowser?.zenModeActive ||
-        (typeof extraArgs.permitUnload === 'undefined'
-          ? !tab.linkedBrowser?.permitUnload()?.permitUnload
-          : !extraArgs.permitUnload) ||
         (tab.pictureinpicture && !ignoreTimestamp) ||
         (tab.soundPlaying && !ignoreTimestamp) ||
         (tab.zenIgnoreUnload && !ignoreTimestamp) ||

src/browser/base/zen-components/ZenWelcome.mjs

@@ -52,6 +52,13 @@
     }
   }
 
+  function openWelcomeTab() {
+    const tab = window.gBrowser.addTrustedTab('https://zen-browser.app/welcome', {
+      inBackground: true,
+    });
+    gBrowser.selectedTab = tab;
+  }
+
   class ZenWelcomePages {
     constructor(pages) {
       this._currentPage = -1;
@@ -403,6 +410,7 @@
             _tabsToPinEssentials.push(createdTab);
           }
           openInitialPinTab();
+          openWelcomeTab();
         },
       },
       {

src/browser/base/zen-components/windows/zen-settings.xhtml

@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - 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/. -->
+
+<html xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      id="zenSettingsWindow"
+      style="min-width: 35em; max-width: 35em; min-height: 40em;">
+  <head>
+    <linkset>
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/content/zen-styles/zen-theme.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/content/zen-styles/windows/zen-settings.css"
+      />
+
+      <html:link rel="localization" href="browser/preferences/preferences.ftl" />
+      <html:link rel="localization" href="browser/preferences/zen-preferences.ftl" />
+    </linkset>
+
+    <script src="chrome://browser/content/zenThemeModifier.js"></script>
+  </head>
+
+  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    <vbox id="main-content">
+      <vbox class="section">
+        <html:h2 data-l10n-id="pane-general-title"/>
+        <div class="section-content">
+          test
+        </div>
+      </vbox>
+      <vbox class="section">
+        <html:h2 data-l10n-id="pane-general-title"/>
+        <div class="section-content">
+          test
+        </div>
+      </vbox>
+    </vbox>
+  </html:body>
+</html>

surfer.json

@@ -5,8 +5,8 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "136.0.2",
-    "candidate": "136.0.2"
+    "version": "136.0.1",
+    "candidate": "136.0.1"
   },
   "buildOptions": {
     "generateBranding": true
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
+}