diff --git a/l10n b/l10n index fb2f27225..19e2af33c 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit fb2f27225e6ec810354ce4c95913d6a2105e200b +Subproject commit 19e2af33c4d901a4edece2b95c4372b40d50a942 diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs index 67760034c..fc4f13942 100644 --- a/src/browser/base/zen-components/ZenGlanceManager.mjs +++ b/src/browser/base/zen-components/ZenGlanceManager.mjs @@ -491,8 +491,6 @@ index: this.getTabPosition(this.#currentTab), }); - this.#currentParentTab._visuallySelected = false; - this.browserWrapper.removeAttribute('style'); this.browserWrapper.removeAttribute('has-finished-animation'); this.browserWrapper.setAttribute('animate-full', true); @@ -501,6 +499,7 @@ this.#currentParentTab.removeAttribute('glance-id'); gBrowser.selectedTab = this.#currentTab; this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background'); + this.#currentParentTab._visuallySelected = false; this.hideSidebarButtons(); gZenUIManager.motion .animate( diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js index ca5f3d2a9..87618112a 100644 --- a/src/browser/components/preferences/zen-settings.js +++ b/src/browser/components/preferences/zen-settings.js @@ -495,14 +495,10 @@ var gZenLooksAndFeel = { this._initializeColorPicker(this._getInitialAccentColor()); window.zenPageAccentColorChanged = this._handleAccentColorChange.bind(this); 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); } @@ -549,16 +545,6 @@ var gZenLooksAndFeel = { } }, - onPreferColorSchemeChange(event) { - const darkTheme = window.matchMedia('(prefers-color-scheme: dark)').matches; - let elem = document.getElementById('ZenDarkThemeStyles'); - if (darkTheme) { - elem.removeAttribute('hidden'); - } else { - elem.setAttribute('hidden', 'true'); - } - }, - setCompactModeStyle() { const chooser = document.getElementById('zen-compact-mode-styles-form'); const radios = [...chooser.querySelectorAll('input')]; diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch index e888b83a4..06ba6a423 100644 --- a/src/browser/components/tabbrowser/content/tab-js.patch +++ b/src/browser/components/tabbrowser/content/tab-js.patch @@ -1,12 +1,12 @@ diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js -index d41c486c02a6f09dcff5741a59ad8b617294c481..0328460c7eb45d8ffb9de4f9b8d4a7bdd7a5b7b3 100644 +index d41c486c02a6f09dcff5741a59ad8b617294c481..abaccd1935fc117924c44dd22cae0b322fc6a0c4 100644 --- a/browser/components/tabbrowser/content/tab.js +++ b/browser/components/tabbrowser/content/tab.js @@ -37,6 +37,7 @@ -+ ++ `;