diff --git a/configs/branding/alpha/VisualElements_150.png b/configs/branding/alpha/VisualElements_150.png index 85dc56dd4..3dc13c557 100644 Binary files a/configs/branding/alpha/VisualElements_150.png and b/configs/branding/alpha/VisualElements_150.png differ diff --git a/configs/branding/alpha/VisualElements_70.png b/configs/branding/alpha/VisualElements_70.png index e68cbe2e1..3dc13c557 100644 Binary files a/configs/branding/alpha/VisualElements_70.png and b/configs/branding/alpha/VisualElements_70.png differ diff --git a/configs/branding/alpha/content/about-logo.png b/configs/branding/alpha/content/about-logo.png index de3092a61..e7527594f 100644 Binary files a/configs/branding/alpha/content/about-logo.png and b/configs/branding/alpha/content/about-logo.png differ diff --git a/configs/branding/alpha/content/about-logo.svg b/configs/branding/alpha/content/about-logo.svg index 6ad4ec9fa..01a5288e3 100644 --- a/configs/branding/alpha/content/about-logo.svg +++ b/configs/branding/alpha/content/about-logo.svg @@ -1 +1,12 @@ - \ No newline at end of file + + + + + + + + + + + + diff --git a/configs/branding/alpha/content/about-logo@2x.png b/configs/branding/alpha/content/about-logo@2x.png index 91c0adeea..41087208d 100644 Binary files a/configs/branding/alpha/content/about-logo@2x.png and b/configs/branding/alpha/content/about-logo@2x.png differ diff --git a/configs/branding/alpha/firefox.ico b/configs/branding/alpha/firefox.ico index 055ed7426..1c9e7ba1e 100644 Binary files a/configs/branding/alpha/firefox.ico and b/configs/branding/alpha/firefox.ico differ diff --git a/configs/branding/alpha/firefox64.ico b/configs/branding/alpha/firefox64.ico index 711aec9c3..9607d034d 100644 Binary files a/configs/branding/alpha/firefox64.ico and b/configs/branding/alpha/firefox64.ico differ diff --git a/configs/branding/alpha/logo-mac.png b/configs/branding/alpha/logo-mac.png index e82bb5f72..5b991b2b8 100644 Binary files a/configs/branding/alpha/logo-mac.png and b/configs/branding/alpha/logo-mac.png differ diff --git a/configs/branding/alpha/logo.png b/configs/branding/alpha/logo.png index 6c170bbc4..5b991b2b8 100644 Binary files a/configs/branding/alpha/logo.png and b/configs/branding/alpha/logo.png differ diff --git a/configs/branding/alpha/logo1024.png b/configs/branding/alpha/logo1024.png new file mode 100644 index 000000000..5b991b2b8 Binary files /dev/null and b/configs/branding/alpha/logo1024.png differ diff --git a/configs/branding/alpha/logo128.png b/configs/branding/alpha/logo128.png index f9cdafaa7..d0b9fac08 100644 Binary files a/configs/branding/alpha/logo128.png and b/configs/branding/alpha/logo128.png differ diff --git a/configs/branding/alpha/logo16.png b/configs/branding/alpha/logo16.png index 4fbe0483e..15b406e55 100644 Binary files a/configs/branding/alpha/logo16.png and b/configs/branding/alpha/logo16.png differ diff --git a/configs/branding/alpha/logo22.png b/configs/branding/alpha/logo22.png index e3d6050ad..13c0d48ab 100644 Binary files a/configs/branding/alpha/logo22.png and b/configs/branding/alpha/logo22.png differ diff --git a/configs/branding/alpha/logo24.png b/configs/branding/alpha/logo24.png index 17d25f8cf..13c0d48ab 100644 Binary files a/configs/branding/alpha/logo24.png and b/configs/branding/alpha/logo24.png differ diff --git a/configs/branding/alpha/logo256.png b/configs/branding/alpha/logo256.png index 84996daaf..3952e166b 100644 Binary files a/configs/branding/alpha/logo256.png and b/configs/branding/alpha/logo256.png differ diff --git a/configs/branding/alpha/logo32.png b/configs/branding/alpha/logo32.png index dd93d4840..13c0d48ab 100644 Binary files a/configs/branding/alpha/logo32.png and b/configs/branding/alpha/logo32.png differ diff --git a/configs/branding/alpha/logo48.png b/configs/branding/alpha/logo48.png index 4b8c013a7..e06788010 100644 Binary files a/configs/branding/alpha/logo48.png and b/configs/branding/alpha/logo48.png differ diff --git a/configs/branding/alpha/logo512.png b/configs/branding/alpha/logo512.png index 6c170bbc4..5d2ffe023 100644 Binary files a/configs/branding/alpha/logo512.png and b/configs/branding/alpha/logo512.png differ diff --git a/configs/branding/alpha/logo64.png b/configs/branding/alpha/logo64.png index 457c591f6..e06788010 100644 Binary files a/configs/branding/alpha/logo64.png and b/configs/branding/alpha/logo64.png differ diff --git a/configs/branding/twilight/VisualElements_150.png b/configs/branding/twilight/VisualElements_150.png index c8ba82a13..3dc13c557 100644 Binary files a/configs/branding/twilight/VisualElements_150.png and b/configs/branding/twilight/VisualElements_150.png differ diff --git a/configs/branding/twilight/VisualElements_70.png b/configs/branding/twilight/VisualElements_70.png index ca693564f..3dc13c557 100644 Binary files a/configs/branding/twilight/VisualElements_70.png and b/configs/branding/twilight/VisualElements_70.png differ diff --git a/configs/branding/twilight/content/about-logo.png b/configs/branding/twilight/content/about-logo.png index 36a51559b..e7527594f 100644 Binary files a/configs/branding/twilight/content/about-logo.png and b/configs/branding/twilight/content/about-logo.png differ diff --git a/configs/branding/twilight/content/about-logo.svg b/configs/branding/twilight/content/about-logo.svg index 1226b561c..01a5288e3 100644 --- a/configs/branding/twilight/content/about-logo.svg +++ b/configs/branding/twilight/content/about-logo.svg @@ -1 +1,12 @@ - \ No newline at end of file + + + + + + + + + + + + diff --git a/configs/branding/twilight/content/about-logo@2x.png b/configs/branding/twilight/content/about-logo@2x.png index 775bc736b..41087208d 100644 Binary files a/configs/branding/twilight/content/about-logo@2x.png and b/configs/branding/twilight/content/about-logo@2x.png differ diff --git a/configs/branding/twilight/firefox.ico b/configs/branding/twilight/firefox.ico index f89a04525..1c9e7ba1e 100644 Binary files a/configs/branding/twilight/firefox.ico and b/configs/branding/twilight/firefox.ico differ diff --git a/configs/branding/twilight/firefox64.ico b/configs/branding/twilight/firefox64.ico index 270748f5f..9607d034d 100644 Binary files a/configs/branding/twilight/firefox64.ico and b/configs/branding/twilight/firefox64.ico differ diff --git a/configs/branding/twilight/logo-mac.png b/configs/branding/twilight/logo-mac.png index df53a75c4..5b991b2b8 100644 Binary files a/configs/branding/twilight/logo-mac.png and b/configs/branding/twilight/logo-mac.png differ diff --git a/configs/branding/twilight/logo.png b/configs/branding/twilight/logo.png index df801d06f..5b991b2b8 100644 Binary files a/configs/branding/twilight/logo.png and b/configs/branding/twilight/logo.png differ diff --git a/configs/branding/twilight/logo1024.png b/configs/branding/twilight/logo1024.png new file mode 100644 index 000000000..5b991b2b8 Binary files /dev/null and b/configs/branding/twilight/logo1024.png differ diff --git a/configs/branding/twilight/logo128.png b/configs/branding/twilight/logo128.png index f0ee1daea..d0b9fac08 100644 Binary files a/configs/branding/twilight/logo128.png and b/configs/branding/twilight/logo128.png differ diff --git a/configs/branding/twilight/logo16.png b/configs/branding/twilight/logo16.png index f4179cce0..15b406e55 100644 Binary files a/configs/branding/twilight/logo16.png and b/configs/branding/twilight/logo16.png differ diff --git a/configs/branding/twilight/logo22.png b/configs/branding/twilight/logo22.png index 675c0147c..13c0d48ab 100644 Binary files a/configs/branding/twilight/logo22.png and b/configs/branding/twilight/logo22.png differ diff --git a/configs/branding/twilight/logo24.png b/configs/branding/twilight/logo24.png index 95d2f4a94..13c0d48ab 100644 Binary files a/configs/branding/twilight/logo24.png and b/configs/branding/twilight/logo24.png differ diff --git a/configs/branding/twilight/logo256.png b/configs/branding/twilight/logo256.png index 85966450f..3952e166b 100644 Binary files a/configs/branding/twilight/logo256.png and b/configs/branding/twilight/logo256.png differ diff --git a/configs/branding/twilight/logo32.png b/configs/branding/twilight/logo32.png index a9922a581..13c0d48ab 100644 Binary files a/configs/branding/twilight/logo32.png and b/configs/branding/twilight/logo32.png differ diff --git a/configs/branding/twilight/logo48.png b/configs/branding/twilight/logo48.png index 65f949b57..e06788010 100644 Binary files a/configs/branding/twilight/logo48.png and b/configs/branding/twilight/logo48.png differ diff --git a/configs/branding/twilight/logo512.png b/configs/branding/twilight/logo512.png index df801d06f..5d2ffe023 100644 Binary files a/configs/branding/twilight/logo512.png and b/configs/branding/twilight/logo512.png differ diff --git a/configs/branding/twilight/logo64.png b/configs/branding/twilight/logo64.png index 22a35b205..e06788010 100644 Binary files a/configs/branding/twilight/logo64.png and b/configs/branding/twilight/logo64.png differ diff --git a/l10n b/l10n index 19ba80d87..2a9eb863f 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit 19ba80d872e724fd564b80affd19b677df1e8799 +Subproject commit 2a9eb863f38184504f9a03b3251a6e106f864d92 diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index 4feef9a26..9d93f00ba 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -71,8 +71,8 @@ pref("app.update.checkInstallTime.days", 6); // CUSTOM ZEN PREFS -pref('zen.welcomeScreen.enabled', true, sticky); -pref('zen.welcomeScreen.seen', false); +pref('zen.welcome-screen.enabled', true, sticky); +pref('zen.welcome-screen.seen', false); pref('zen.tabs.vertical', true); pref('zen.tabs.vertical.right-side', false); diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs index 1dc6be221..91d98feb2 100644 --- a/src/browser/base/content/ZenUIManager.mjs +++ b/src/browser/base/content/ZenUIManager.mjs @@ -295,13 +295,15 @@ var gZenVerticalTabsManager = { } const appContentNavbarContaienr = document.getElementById('zen-appcontent-navbar-container'); - if ((!isRightSide && this.isWindowsStyledButtons) || (isRightSide && !this.isWindowsStyledButtons) + let shouldHide = false; + if (((!isRightSide && this.isWindowsStyledButtons) || (isRightSide && !this.isWindowsStyledButtons) || ( isCompactMode && isSingleToolbar && !( (!this.isWindowsStyledButtons && !isRightSide) ) - )) { + )) && isSingleToolbar) { appContentNavbarContaienr.setAttribute('should-hide', 'true'); + shouldHide = true; } else { appContentNavbarContaienr.removeAttribute('should-hide'); } @@ -403,6 +405,10 @@ var gZenVerticalTabsManager = { } } + if (shouldHide) { + appContentNavbarContaienr.append(windowButtons); + } + gZenCompactModeManager.updateCompactModeContext(isSingleToolbar); // Always move the splitter next to the sidebar diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn index 63233196a..7756c5659 100644 --- a/src/browser/base/content/zen-assets.jar.inc.mn +++ b/src/browser/base/content/zen-assets.jar.inc.mn @@ -55,6 +55,9 @@ # Images content/browser/zen-images/gradient.png (content/zen-images/gradient.png) content/browser/zen-images/gradient-display.png (content/zen-images/gradient-display.png) + content/browser/zen-images/layouts/collapsed.png (content/zen-images/layouts/collapsed.png) + content/browser/zen-images/layouts/multiple-toolbar.png (content/zen-images/layouts/multiple-toolbar.png) + content/browser/zen-images/layouts/single-toolbar.png (content/zen-images/layouts/single-toolbar.png) # Actors content/browser/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs (zen-components/actors/ZenThemeMarketplaceParent.sys.mjs) diff --git a/src/browser/base/content/zen-images/layouts/collapsed.png b/src/browser/base/content/zen-images/layouts/collapsed.png new file mode 100644 index 000000000..a971725e3 Binary files /dev/null and b/src/browser/base/content/zen-images/layouts/collapsed.png differ diff --git a/src/browser/base/content/zen-images/layouts/multiple-toolbar.png b/src/browser/base/content/zen-images/layouts/multiple-toolbar.png new file mode 100644 index 000000000..3fc9de94a Binary files /dev/null and b/src/browser/base/content/zen-images/layouts/multiple-toolbar.png differ diff --git a/src/browser/base/content/zen-images/layouts/single-toolbar.png b/src/browser/base/content/zen-images/layouts/single-toolbar.png new file mode 100644 index 000000000..0c09f5c7f Binary files /dev/null and b/src/browser/base/content/zen-images/layouts/single-toolbar.png differ diff --git a/src/browser/base/content/zen-styles/zen-branding.css b/src/browser/base/content/zen-styles/zen-branding.css index 957165227..504287434 100644 --- a/src/browser/base/content/zen-styles/zen-branding.css +++ b/src/browser/base/content/zen-styles/zen-branding.css @@ -14,7 +14,7 @@ line-height: 0.9; margin-bottom: 0.4rem; font-family: 'Zen-Junicode', serif; - font-weight: 600; + font-weight: 400; font-style: normal; font-feature-settings: 'swsh' 1; diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css index 09ce101fe..ffd4af204 100644 --- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css +++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css @@ -237,11 +237,11 @@ transition: scale 0.1s ease-in-out; &[fadein='true']:not([zen-essential='true']) { #tabbrowser-tabs[zen-workspace-animation='previous'] & { - animation: zen-slide-in-reverse 0.2s ease-in-out; + animation: zen-slide-in 0.2s ease-in-out; } #tabbrowser-tabs[zen-workspace-animation='next'] & { - animation: zen-slide-in 0.2s ease-in-out; + animation: zen-slide-in-reverse 0.2s ease-in-out; } } diff --git a/src/browser/components/BrowserGlue-sys-mjs.patch b/src/browser/components/BrowserGlue-sys-mjs.patch index 9e1923e07..042d3a1d4 100644 --- a/src/browser/components/BrowserGlue-sys-mjs.patch +++ b/src/browser/components/BrowserGlue-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs -index f4ea0c87a35a19c09f811576201a7adb865ed74c..89e44ab4d3b6f0ce0ecf89c4b8b484b7da5fa2ea 100644 +index 2de73e75bf98b21dde9ec05213a66f9e9039200f..04ab3ea4c47d674778e8965654867c4cf0f99161 100644 --- a/browser/components/BrowserGlue.sys.mjs +++ b/browser/components/BrowserGlue.sys.mjs -@@ -4436,6 +4436,7 @@ BrowserGlue.prototype = { +@@ -4643,6 +4643,7 @@ BrowserGlue.prototype = { }, async _maybeShowDefaultBrowserPrompt() { @@ -10,14 +10,14 @@ index f4ea0c87a35a19c09f811576201a7adb865ed74c..89e44ab4d3b6f0ce0ecf89c4b8b484b7 // Highest priority is about:welcome window modal experiment // Second highest priority is the upgrade dialog, which can include a "primary // browser" request and is limited in various ways, e.g., major upgrades. -@@ -4894,6 +4895,16 @@ BrowserGlue.prototype = { +@@ -5169,6 +5170,16 @@ BrowserGlue.prototype = { "nsIObserver", "nsISupportsWeakReference", ]), + + _ZenMaybeShowWelcomeScreen() { -+ const welcomeEnabled = Services.prefs.getBoolPref("zen.welcomeScreen.enabled", true) -+ const welcomeSeen = Services.prefs.getBoolPref("zen.welcomeScreen.seen", false) ++ const welcomeEnabled = Services.prefs.getBoolPref("zen.welcome-screen.enabled", true) ++ const welcomeSeen = Services.prefs.getBoolPref("zen.welcome-screen.seen", false) + if (welcomeEnabled && !welcomeSeen) { + lazy.BrowserWindowTracker.getTopWindow().gDialogBox.open( + "chrome://browser/content/zen-welcome/welcome.html" diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js index ae4c55813..9675f4c89 100644 --- a/src/browser/components/preferences/zen-settings.js +++ b/src/browser/components/preferences/zen-settings.js @@ -485,6 +485,9 @@ var gZenMarketplaceManager = { }, }; +const kZenExtendedSidebar = 'zen.view.sidebar-expanded'; +const kZenSingleToolbar = 'zen.view.use-single-toolbar'; + var gZenLooksAndFeel = { init() { if (this.__hasInitialized) return; @@ -495,12 +498,57 @@ var gZenLooksAndFeel = { gZenMarketplaceManager.init(); var onPreferColorSchemeChange = this.onPreferColorSchemeChange.bind(this); window.matchMedia('(prefers-color-scheme: dark)').addListener(onPreferColorSchemeChange); + for (const pref of [kZenExtendedSidebar, kZenSingleToolbar]) { + Services.prefs.addObserver(pref, this); + } this.onPreferColorSchemeChange(); window.addEventListener('unload', () => { window.matchMedia('(prefers-color-scheme: dark)').removeListener(onPreferColorSchemeChange); + for (const pref of [kZenExtendedSidebar, kZenSingleToolbar]) { + Services.prefs.removeObserver(pref, this); + } }); this.setDarkThemeListener(); this.setCompactModeStyle(); + + this.applySidebarLayout(); + }, + + observe(subject, topic, data) { + this.applySidebarLayout(); + }, + + applySidebarLayout() { + const isSingleToolbar = Services.prefs.getBoolPref(kZenSingleToolbar); + const isExtendedSidebar = Services.prefs.getBoolPref(kZenExtendedSidebar); + for (const layout of document.getElementById('zenLayoutList').children) { + layout.classList.remove('selected'); + if (layout.getAttribute('layout') == 'single' && isSingleToolbar) { + layout.classList.add('selected'); + } else if (layout.getAttribute('layout') == 'multiple' && !isSingleToolbar && isExtendedSidebar) { + layout.classList.add('selected'); + } else if (layout.getAttribute('layout') == 'collapsed' && !isExtendedSidebar) { + layout.classList.add('selected'); + } + } + if (this.__hasInitializedLayout) return; + this.__hasInitializedLayout = true; + for (const layout of document.getElementById('zenLayoutList').children) { + layout.addEventListener('click', () => { + if (layout.hasAttribute('disabled')) { + return; + } + + for (const el of document.getElementById('zenLayoutList').children) { + el.classList.remove('selected'); + } + + layout.classList.add('selected'); + + Services.prefs.setBoolPref(kZenExtendedSidebar, layout.getAttribute('layout') != 'collapsed'); + Services.prefs.setBoolPref(kZenSingleToolbar, layout.getAttribute('layout') == 'single'); + }); + } }, onPreferColorSchemeChange(event) { diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml index 2c92b5fd5..d13ab9b6d 100644 --- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml +++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml @@ -1,6 +1,50 @@