diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 625daa5c..00000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -patreon: zen_browser -ko_fi: zen_browser diff --git a/README.md b/README.md index b23dca1c..dfa5cd67 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne ### Firefox Versions -- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `140.0.1`! 🚀 -- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 140.0.1`! +- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `140.0.2`! 🚀 +- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 140.0.2`! ### Contributing diff --git a/src/browser/app/profile/ai.inc b/src/browser/app/profile/ai.inc index d5827fbd..a4186950 100644 --- a/src/browser/app/profile/ai.inc +++ b/src/browser/app/profile/ai.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref("browser.ml.chat.enabled", false); pref("browser.ml.chat.shortcuts", false); diff --git a/src/browser/app/profile/browser.inc b/src/browser/app/profile/browser.inc index 88d6131b..eaf00fd9 100644 --- a/src/browser/app/profile/browser.inc +++ b/src/browser/app/profile/browser.inc @@ -1,7 +1,7 @@ -// 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/. +# 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/. // Restore session on startup pref("browser.startup.page", 3); diff --git a/src/browser/app/profile/disablemozilla.inc b/src/browser/app/profile/disablemozilla.inc index 0ea5dc35..eb4e9f77 100644 --- a/src/browser/app/profile/disablemozilla.inc +++ b/src/browser/app/profile/disablemozilla.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. // Common UI changes pref("browser.privatebrowsing.vpnpromourl", "", locked); diff --git a/src/browser/app/profile/extensions.inc b/src/browser/app/profile/extensions.inc index 7179d747..2a428d27 100644 --- a/src/browser/app/profile/extensions.inc +++ b/src/browser/app/profile/extensions.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. // security: They must enable this themselves, to avoid people downloading malware pref('xpinstall.signatures.required', true); diff --git a/src/browser/app/profile/features.inc b/src/browser/app/profile/features.inc index 49d79fab..fc05c55c 100644 --- a/src/browser/app/profile/features.inc +++ b/src/browser/app/profile/features.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. #ifdef MOZILLA_OFFICIAL pref('zen.welcome-screen.seen', false, sticky); diff --git a/src/browser/app/profile/features/compact-mode.inc b/src/browser/app/profile/features/compact-mode.inc index 4a619feb..f5102c25 100644 --- a/src/browser/app/profile/features/compact-mode.inc +++ b/src/browser/app/profile/features/compact-mode.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('zen.view.compact.hide-tabbar', true); pref('zen.view.compact.hide-toolbar', false); diff --git a/src/browser/app/profile/features/downloads.inc b/src/browser/app/profile/features/downloads.inc index 1be5a250..027afb70 100644 --- a/src/browser/app/profile/features/downloads.inc +++ b/src/browser/app/profile/features/downloads.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('zen.downloads.download-animation', true); pref('zen.downloads.download-animation-duration', 1000); // ms diff --git a/src/browser/app/profile/features/glance.inc b/src/browser/app/profile/features/glance.inc index b017a90c..23143547 100644 --- a/src/browser/app/profile/features/glance.inc +++ b/src/browser/app/profile/features/glance.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('zen.glance.enabled', true); pref('zen.glance.enable-contextmenu-search', true); diff --git a/src/browser/app/profile/features/kbs.inc b/src/browser/app/profile/features/kbs.inc index e6bc7085..10efb5b7 100644 --- a/src/browser/app/profile/features/kbs.inc +++ b/src/browser/app/profile/features/kbs.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('zen.keyboard.shortcuts.enabled', true); pref('zen.keyboard.shortcuts.version', 0); // Empty string means default shortcuts diff --git a/src/browser/app/profile/features/mods.inc b/src/browser/app/profile/features/mods.inc index 862ac5fb..5e15ce43 100644 --- a/src/browser/app/profile/features/mods.inc +++ b/src/browser/app/profile/features/mods.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('zen.mods.updated-value-observer', false); diff --git a/src/browser/app/profile/features/split-view.inc b/src/browser/app/profile/features/split-view.inc index 09afcb2b..95bd25af 100644 --- a/src/browser/app/profile/features/split-view.inc +++ b/src/browser/app/profile/features/split-view.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('zen.splitView.enable-tab-drop', true); pref('zen.splitView.min-resize-width', 7); diff --git a/src/browser/app/profile/features/theme.inc b/src/browser/app/profile/features/theme.inc index 38c93c01..3b3ec02d 100644 --- a/src/browser/app/profile/features/theme.inc +++ b/src/browser/app/profile/features/theme.inc @@ -1,13 +1,12 @@ -// 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/. +# 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/. pref('zen.theme.accent-color', "#ffb787"); pref('zen.theme.content-element-separation', 8); // In pixels pref('zen.theme.gradient', true); pref('zen.theme.gradient.show-custom-colors', false); pref('zen.theme.essentials-favicon-bg', true); -pref('zen.theme.window.scheme', 'auto'); // auto, light, dark #ifdef XP_MACOSX pref('zen.theme.border-radius', 10); // In pixels @@ -21,5 +20,5 @@ pref('zen.theme.window.scheme', 'auto'); // auto, light, dark pref('zen.theme.acrylic-elements', false); #endif -// Light weight themes +# Light weight themes pref('zen.theme.disable-lightweight', true); diff --git a/src/browser/app/profile/features/urlbar.inc b/src/browser/app/profile/features/urlbar.inc index bfa9017e..9dca3cfa 100644 --- a/src/browser/app/profile/features/urlbar.inc +++ b/src/browser/app/profile/features/urlbar.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('zen.urlbar.replace-newtab', true); pref('zen.urlbar.show-protections-icon', false); diff --git a/src/browser/app/profile/features/view.inc b/src/browser/app/profile/features/view.inc index 87711a23..82b403c6 100644 --- a/src/browser/app/profile/features/view.inc +++ b/src/browser/app/profile/features/view.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('zen.view.sidebar-height-throttle', 0); // in ms pref('zen.view.sidebar-expanded.max-width', 500); @@ -22,3 +22,8 @@ pref('zen.view.grey-out-inactive-windows', true); pref('zen.view.show-newtab-button-border-top', false); pref('zen.view.show-newtab-button-top', true); + +# 0: Dark +# 1: Light +# 2: Auto (system color scheme unless overridden by browser theme) +pref('zen.view.window.scheme', 2); // auto, light, dark diff --git a/src/browser/app/profile/features/workspaces.inc b/src/browser/app/profile/features/workspaces.inc index 2d954863..b517c738 100644 --- a/src/browser/app/profile/features/workspaces.inc +++ b/src/browser/app/profile/features/workspaces.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('zen.workspaces.continue-where-left-off', false); pref('zen.workspaces.hide-default-container-indicator', true); @@ -19,7 +19,7 @@ pref('zen.workspaces.separate-essentials', true); pref('zen.workspaces.debug', true); #endif -// Section: Pinned tabs management +# Section: Pinned tabs management pref('zen.pinned-tab-manager.debug', false); pref('zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url', false); pref('zen.pinned-tab-manager.close-shortcut-behavior', 'reset-unload-switch'); diff --git a/src/browser/app/profile/fullscreen.inc b/src/browser/app/profile/fullscreen.inc index 7e18b277..9ce4aeeb 100644 --- a/src/browser/app/profile/fullscreen.inc +++ b/src/browser/app/profile/fullscreen.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref("full-screen-api.transition-duration.enter", "0 0"); pref("full-screen-api.transition-duration.leave", "0 0"); diff --git a/src/browser/app/profile/linux.inc b/src/browser/app/profile/linux.inc index 5837fc5c..6b65d85d 100644 --- a/src/browser/app/profile/linux.inc +++ b/src/browser/app/profile/linux.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref("widget.gtk.rounded-bottom-corners.enabled", true); diff --git a/src/browser/app/profile/macos.inc b/src/browser/app/profile/macos.inc index e237e401..d2f80fc8 100644 --- a/src/browser/app/profile/macos.inc +++ b/src/browser/app/profile/macos.inc @@ -1,14 +1,14 @@ -// 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/. +# 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/. -// Enable transparent background for macos +# Enable transparent background for macos pref('widget.macos.sidebar-blend-mode.behind-window', true); -// 1. hudWindow -// 2. fullScreenUI -// 3. popover -// 4. menu -// 5. toolTip -// 6. headerView -// 7. underlay +# 1. hudWindow +# 2. fullScreenUI +# 3. popover +# 4. menu +# 5. toolTip +# 6. headerView +# 7. underlay pref('zen.widget.macos.window-material', 1); diff --git a/src/browser/app/profile/media.inc b/src/browser/app/profile/media.inc index 3269ed4c..8eac516b 100644 --- a/src/browser/app/profile/media.inc +++ b/src/browser/app/profile/media.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('image.jxl.enabled', true, locked); pref("svg.context-properties.content.enabled", true); diff --git a/src/browser/app/profile/newtab.inc b/src/browser/app/profile/newtab.inc index 6c9bf881..6447ad3b 100644 --- a/src/browser/app/profile/newtab.inc +++ b/src/browser/app/profile/newtab.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('browser.newtabpage.activity-stream.feeds.topsites', false); pref('browser.newtabpage.activity-stream.feeds.section.topstories', false); diff --git a/src/browser/app/profile/pdf.inc b/src/browser/app/profile/pdf.inc index a178bda9..37361dff 100644 --- a/src/browser/app/profile/pdf.inc +++ b/src/browser/app/profile/pdf.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('pdfjs.enableHighlightEditor', true); pref('pdfjs.enableHighlightFloatingButton', true); diff --git a/src/browser/app/profile/performance.inc b/src/browser/app/profile/performance.inc index 0c78fa39..67ebaf8a 100644 --- a/src/browser/app/profile/performance.inc +++ b/src/browser/app/profile/performance.inc @@ -1,17 +1,17 @@ -// 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/. +# 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/. #ifdef XP_MACOSX - // Pref to control the reponse taken on macOS when the OS is under memory - // pressure. Changes to the pref take effect immediately. Browser restart not - // required. The pref value is a bitmask: - // 0x0: No response (other than recording for telemetry, crash reporting) - // 0x1: Use the tab unloading feature to reduce memory use. Requires that - // the above "browser.tabs.unloadOnLowMemory" pref be set to true for tab - // unloading to occur. - // 0x2: Issue the internal "memory-pressure" notification to reduce memory use - // 0x3: Both 0x1 and 0x2. +# Pref to control the reponse taken on macOS when the OS is under memory +# pressure. Changes to the pref take effect immediately. Browser restart not +# required. The pref value is a bitmask: +# 0x0: No response (other than recording for telemetry, crash reporting) +# 0x1: Use the tab unloading feature to reduce memory use. Requires that +# the above "browser.tabs.unloadOnLowMemory" pref be set to true for tab +# unloading to occur. +# 0x2: Issue the internal "memory-pressure" notification to reduce memory use +# 0x3: Both 0x1 and 0x2. pref("browser.lowMemoryResponseMask", 3); #endif diff --git a/src/browser/app/profile/pip.inc b/src/browser/app/profile/pip.inc index 31b72178..95d3ae64 100644 --- a/src/browser/app/profile/pip.inc +++ b/src/browser/app/profile/pip.inc @@ -1,7 +1,7 @@ -// 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/. +# 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/. pref("media.videocontrols.picture-in-picture.video-toggle.enabled", true); -// TODO: Enable once we have a proper settings page +# TODO: Enable once we have a proper settings page pref("media.videocontrols.picture-in-picture.enable-when-switching-tabs.enabled", false); diff --git a/src/browser/app/profile/privacy.inc b/src/browser/app/profile/privacy.inc index b3af6813..1b9f47e3 100644 --- a/src/browser/app/profile/privacy.inc +++ b/src/browser/app/profile/privacy.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref("datareporting.policy.dataSubmissionEnabled", false, locked); pref("datareporting.healthreport.uploadEnabled", false, locked); @@ -25,23 +25,23 @@ pref("app.shield.optoutstudies.enabled", false, locked); pref("app.normandy.enabled", false); pref("app.normandy.api_url", "", locked); -// Crash reports +# Crash reports pref("breakpad.reportURL", ""); pref("browser.tabs.crashReporting.sendReport", false); pref("browser.crashReports.unsubmittedCheck.autoSubmit2", false); -// Other privacy +# Other privacy pref("extensions.getAddons.cache.enabled", false); -// Disable cache for private browsing +# Disable cache for private browsing pref("browser.privatebrowsing.forceMediaMemoryCache", true); -// Tracking protection +# Tracking protection pref("browser.helperApps.deleteTempFileOnExit", true); pref("browser.uitour.enabled", false); pref("privacy.globalprivacycontrol.enabled", true); -// Contextual identity +# Contextual identity pref('privacy.userContext.enabled', true); pref('privacy.userContext.ui.enabled', true); diff --git a/src/browser/app/profile/smoothscroll.inc b/src/browser/app/profile/smoothscroll.inc index 9a322e69..85faa575 100644 --- a/src/browser/app/profile/smoothscroll.inc +++ b/src/browser/app/profile/smoothscroll.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref("general.smoothScroll.msdPhysics.enabled", true); pref("general.smoothScroll.currentVelocityWeighting", "0.15"); diff --git a/src/browser/app/profile/urlbar.inc b/src/browser/app/profile/urlbar.inc index e5aaa9a0..78e5fec7 100644 --- a/src/browser/app/profile/urlbar.inc +++ b/src/browser/app/profile/urlbar.inc @@ -1,6 +1,6 @@ -// 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/. +# 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/. pref('browser.urlbar.unitConversion.enabled', true); pref('browser.urlbar.trending.featureGate', false); @@ -12,10 +12,10 @@ pref('browser.urlbar.suggest.calculator', true); pref("browser.urlbar.trimHttps", true); pref("browser.urlbar.untrimOnUserInteraction.featureGate", true); -// Keep in sync with browser/components/topsites/constants.mjs +# Keep in sync with browser/components/topsites/constants.mjs pref("browser.urlbar.maxRichResults", 7); -// Enable private suggestions +# Enable private suggestions pref('browser.search.suggest.enabled', false); pref('browser.search.suggest.enabled.private', false); diff --git a/src/browser/app/profile/windows.inc b/src/browser/app/profile/windows.inc index 69f18ee9..631f0e5b 100644 --- a/src/browser/app/profile/windows.inc +++ b/src/browser/app/profile/windows.inc @@ -1,8 +1,8 @@ -// 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/. +# 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/. -// Mica +# Mica pref("widget.windows.mica", true); pref("widget.windows.mica.popups", true); pref("widget.windows.mica.toplevel-backdrop", 2); diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index 8f68cdbf..4458ea5a 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -1,6 +1,6 @@ -// 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/. +# 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/. #ifdef XP_UNIX #ifndef XP_MACOSX @@ -8,7 +8,7 @@ #endif #endif -// Dont download the multilingual dictionary +# Dont download the multilingual dictionary pref("intl.multilingual.downloadEnabled", false); #ifdef XP_WIN diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css index 55c84009..d3234f08 100644 --- a/src/browser/themes/shared/zen-icons/icons.css +++ b/src/browser/themes/shared/zen-icons/icons.css @@ -772,7 +772,7 @@ list-style-image: url('sparkles.svg'); } -@media -moz-pref('zen.theme.window.scheme', 'auto') { +@media -moz-pref('zen.view.window.scheme', 2) { #PanelUI-zen-gradient-generator-scheme-auto { background: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1)); } @@ -782,7 +782,7 @@ list-style-image: url('moon-stars.svg'); } -@media -moz-pref('zen.theme.window.scheme', 'dark') { +@media -moz-pref('zen.view.window.scheme', 0) { #PanelUI-zen-gradient-generator-scheme-dark { background: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1)); } @@ -792,7 +792,7 @@ list-style-image: url('face-sun.svg'); } -@media -moz-pref('zen.theme.window.scheme', 'light') { +@media -moz-pref('zen.view.window.scheme', 1) { #PanelUI-zen-gradient-generator-scheme-light { background: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1)); } diff --git a/src/zen/common/ZenUIMigration.mjs b/src/zen/common/ZenUIMigration.mjs index 0bb03d94..027b9846 100644 --- a/src/zen/common/ZenUIMigration.mjs +++ b/src/zen/common/ZenUIMigration.mjs @@ -55,6 +55,8 @@ class nsZenUIMigration { 'zen.workspaces.separate-essentials', Services.prefs.getBoolPref('zen.workspaces.container-specific-essentials-enabled', false) ); + const theme = Services.prefs.getIntPref('layout.css.prefers-color-scheme.content-override', 0); + Services.prefs.setIntPref('zen.view.window.scheme', theme); } } diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css index 156a1b5d..90702a3f 100644 --- a/src/zen/common/styles/zen-popup.css +++ b/src/zen/common/styles/zen-popup.css @@ -390,8 +390,6 @@ menuseparator { & label { margin-top: 0; margin-bottom: 0; - /* Invert the color based on the background */ - color: light-dark(rgba(255, 255, 255, 0.9), rgba(0, 0, 0, 0.9)); } & button { diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css index 9a007723..132640c0 100644 --- a/src/zen/common/styles/zen-theme.css +++ b/src/zen/common/styles/zen-theme.css @@ -44,7 +44,7 @@ var(--zen-colors-tertiary) 99% ); - --zen-dialog-background: var(--zen-colors-tertiary); + --zen-dialog-background: light-dark(var(--zen-colors-tertiary), var(--zen-branding-bg)); --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 3%, #f4f4f4 97%); --zen-secondary-btn-color: var(--zen-colors-primary-foreground); @@ -246,15 +246,15 @@ & #zen-browser-background, & #urlbar[breakout-extend='true'], & #tabbrowser-tabpanels browser[type='content'] { - @media -moz-pref('zen.theme.window.scheme', 'dark') { + @media -moz-pref('zen.view.window.scheme', 0) { color-scheme: dark; } - @media -moz-pref('zen.theme.window.scheme', 'light') { + @media -moz-pref('zen.view.window.scheme', 1) { color-scheme: light; } - @media -moz-pref('zen.theme.window.scheme', 'auto') { + @media -moz-pref('zen.view.window.scheme', 2) { color-scheme: light; @media (-moz-system-dark-theme) { color-scheme: dark; @@ -267,34 +267,33 @@ :host(:is(.anonymous-content-host, notification-message)), :root { --zen-in-content-dialog-background: var(--zen-branding-bg); - --zen-dark-color-mix-base: var(--zen-branding-bg); --zen-colors-primary: color-mix( in srgb, var(--zen-primary-color) 20%, - var(--zen-dark-color-mix-base) 80% + var(--zen-branding-bg) 80% ); --zen-colors-secondary: color-mix( in srgb, var(--zen-primary-color) 30%, - var(--zen-dark-color-mix-base) 70% + var(--zen-branding-bg) 70% ); --zen-colors-tertiary: color-mix( in srgb, var(--zen-primary-color) 1%, - var(--zen-dark-color-mix-base) 99% + var(--zen-branding-bg) 99% ); --zen-colors-hover-bg: color-mix( in srgb, var(--zen-primary-color) 90%, - var(--zen-dark-color-mix-base) 10% + var(--zen-branding-bg) 10% ); --zen-colors-primary-foreground: color-mix(in srgb, var(--zen-primary-color) 80%, white 20%); --zen-colors-input-bg: color-mix( in srgb, var(--zen-primary-color) 1%, - var(--zen-dark-color-mix-base) 99% + var(--zen-branding-bg) 99% ); --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 20%, rgb(79, 79, 79) 80%); --zen-colors-border-contrast: color-mix( @@ -303,13 +302,12 @@ rgba(255, 255, 255, 0.11) 90% ); - --zen-dialog-background: var(--zen-dark-color-mix-base); --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 4%, rgb(24, 24, 24) 96%); --zen-browser-gradient-base: color-mix( in srgb, var(--zen-primary-color) 30%, - var(--zen-dark-color-mix-base) 70% + var(--zen-branding-bg) 70% ); } } diff --git a/src/zen/media/zen-media-controls.css b/src/zen/media/zen-media-controls.css index 6f9cadb9..d7b6cad7 100644 --- a/src/zen/media/zen-media-controls.css +++ b/src/zen/media/zen-media-controls.css @@ -285,14 +285,17 @@ max-width: 100%; --toolbarbutton-outer-padding: 0; container: media-controls / inline-size; + gap: 0.7rem; } #zen-media-playback-buttons { - gap: 1.3rem; + justify-content: space-between; + max-width: 7em; + width: 100%; } /* Hide #zen-media-focus-button if it doesn't fit in the toolbar */ -@container media-controls (max-width: 160px) { +@container media-controls (max-width: 150px) { #zen-media-focus-button { display: none; } diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs index 40d28333..f6751997 100644 --- a/src/zen/workspaces/ZenGradientGenerator.mjs +++ b/src/zen/workspaces/ZenGradientGenerator.mjs @@ -116,8 +116,8 @@ XPCOMUtils.defineLazyPreferenceGetter( this, 'windowSchemeType', - 'zen.theme.window.scheme', - true, + 'zen.view.window.scheme', + 2, darkModeChange ); } @@ -128,9 +128,9 @@ get isDarkMode() { switch (this.windowSchemeType) { - case 'dark': + case 0: return true; - case 'light': + case 1: return false; default: } @@ -252,11 +252,15 @@ if (!scheme) { return; } - if (this.currentScheme === scheme) { + const themeInt = { + auto: 2, + light: 1, + dark: 0, + }[scheme]; + if (themeInt === undefined) { return; } - this.currentScheme = scheme; - Services.prefs.setStringPref('zen.theme.window.scheme', scheme); + Services.prefs.setIntPref('zen.view.window.scheme', themeInt); }); } @@ -1021,8 +1025,12 @@ } let opacity = this.currentOpacity; if (forToolbar) { + color = this.blendColors( + color.c, + this.getToolbarModifiedBaseRaw().slice(0, 3), + opacity * 100 + ); opacity = 1; // Toolbar colors should always be fully opaque - color = this.blendColors(color.c, this.getToolbarModifiedBaseRaw().slice(0, 3), 80); } else { color = color.c; } @@ -1132,7 +1140,6 @@ accentColor, (1 - this.currentOpacity) * 100 ); - minimalLum = this.isDarkMode ? 0.3 : 0.18; } const lum = this.luminance(accentColor); // Return true if background is dark enough that white text is preferred diff --git a/surfer.json b/surfer.json index 3b549e6e..0e454a11 100644 --- a/surfer.json +++ b/surfer.json @@ -5,8 +5,8 @@ "binaryName": "zen", "version": { "product": "firefox", - "version": "140.0.1", - "candidate": "140.0.1" + "version": "140.0.2", + "candidate": "140.0.2" }, "buildOptions": { "generateBranding": true