Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

src/browser/app/profile/zen-browser.js

@@ -318,7 +318,7 @@ pref("dom.ipc.processPriorityManager.backgroundUsesEcoQoS", false);
 pref("widget.gtk.rounded-bottom-corners.enabled", true);
 #endif
 
-pref('browser.newtabpage.activity-stream.system.showWeather', true);
+pref('browser.newtabpage.activity-stream.system.showWeather', false);
 
 // Enable experimental settings page (Used for Zen Labs)
 pref('browser.preferences.experimental', true);
@@ -461,3 +461,6 @@ pref("layers.gpu-process.enabled", true);
 pref("media.videocontrols.picture-in-picture.video-toggle.enabled", true);
 // TODO: Enable once we have a proper settings page
 pref("media.videocontrols.picture-in-picture.enable-when-switching-tabs.enabled", false);
+
+// More Privacy
+pref("extensions.getAddons.cache.enabled", false);

src/build/moz-configure/init-configure.patch

@@ -1,12 +1,13 @@
 diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
-index 9bf4bb29a40045da21909dc1a2a49dbca5d6ac3e..e45bb12cabd7fb8a77b29e7e1e03ed3e92cd3625 100644
+index 9bf4bb29a40045da21909dc1a2a49dbca5d6ac3e..bb594ec0a0e00760763bb3f6313e9cf576f2c4b7 100644
 --- a/build/moz.configure/init.configure
 +++ b/build/moz.configure/init.configure
-@@ -1101,7 +1101,7 @@ def milestone(build_env, build_project, version_path, as_milestone, _):
+@@ -1101,7 +1101,8 @@ def milestone(build_env, build_project, version_path, as_milestone, _):
  
      is_nightly = is_release_or_beta = None
  
 -    if "a1" in milestone:
++    is_nightly = True
 +    if "t" in milestone:
          is_nightly = True
      elif "a" not in milestone:

src/zen/compact-mode/ZenCompactMode.mjs

@@ -445,7 +445,7 @@ var gZenCompactModeManager = {
         if (
           this.hoverableElements[i].keepHoverDuration &&
           !event.target.querySelector('#urlbar[zen-floating-urlbar]') &&
-          !this.sidebar.getAttribute('supress-primary-adjustment') === 'true'
+          !(this.sidebar.getAttribute('supress-primary-adjustment') === 'true')
         ) {
           this.flashElement(target, this.hoverableElements[i].keepHoverDuration, 'has-hover' + target.id, 'zen-has-hover');
         } else {

src/zen/compact-mode/zen-compact-mode.css

@@ -5,6 +5,16 @@
  */
 /* All overrides for compact mode go here */
 
+:root {
+  --zen-compact-mode-offset: 0.1px;
+
+  @media not (-moz-platform: macos) { 
+    &[sizemode='maximized'][zen-right-side='true'] {
+      --zen-compact-mode-offset: 1px;
+    }
+  }
+}
+
 :root[zen-compact-mode='true']:not([customizing]):not([inDOMFullscreen='true']) {
 %include ../tabs/zen-tabs/vertical-tabs-topbuttons-fix.css
   @media -moz-pref('zen.view.compact.hide-tabbar') or -moz-pref('zen.view.use-single-toolbar') {

src/zen/tabs/ZenPinnedTabManager.mjs

@@ -639,7 +639,7 @@
           ? gBrowser.selectedTabs
           : [TabContextMenu.contextTab];
       for (let i = 0; i < tabs.length; i++) {
-        const tab = tabs[i];
+        let tab = tabs[i];
         if (tab.hasAttribute('zen-essential')) {
           continue;
         }
@@ -653,7 +653,14 @@
             pin.isEssential = true;
             this.savePin(pin);
           }
-          ZenWorkspaces.getEssentialsSection(tab).appendChild(tab);
+          if (tab.ownerGlobal !== window) {
+            tab = gBrowser.adoptTab(tab, {
+              selectTab: tab.selected,
+            });
+            tab.setAttribute('zen-essential', 'true');
+          } else {
+            ZenWorkspaces.getEssentialsSection(tab).appendChild(tab);
+          }
           gBrowser.tabContainer._invalidateCachedTabs();
         } else {
           gBrowser.pinTab(tab);