Refactor SURFER_COMPAT handling in sign.ps1

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

@@ -202,4 +202,4 @@ pref('media.ffmpeg.vaapi.enabled', true);
 pref('media.ffmpeg.encoder.enabled', true);
 
 pref("media.hardware-video-decoding.enabled", true);
-pref("gfx.canvas.accelerated", true);
+pref("gfx.canvas.accelerated", true);

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

@@ -32,7 +32,7 @@
        * same shadow from the browser window on top. */
       box-shadow:
         var(--uc-tweak-rounded-corners-shadow, 0 0 transparent),
-        0 0 0 16px var(--zen-themed-toolbar-bg) !important;
+        0 0 0 16px var(--zen-main-browser-background) !important;
       clip-path: inset(0);
       pointer-events: none;
     }

src/browser/base/content/zen-styles/zen-compact-mode.css

@@ -30,6 +30,8 @@
     margin: 0;
     padding: var(--zen-compact-toolbox-margin) !important;
 
+    min-width: 500px !important;
+
     & #titlebar {
       border: 1px solid var(--zen-colors-border);
       transition-delay: 200ms;
@@ -48,6 +50,11 @@
     }
   }
 
+  #tabbrowser-tabpanels {
+    padding: var(--zen-element-separation) !important;
+    padding-top: 0 !important;
+  }
+
   @media not (-moz-bool-pref: 'zen.view.sidebar-expanded') {
     #navigator-toolbox {
       width: fit-content !important;
@@ -86,12 +93,10 @@
        *  3. Add element separation variable, to avoid overlaping with the toolbar
        *  4. Calculate toolbar height, taken from zen-urlbar.css
        */
-      --zen-compact-toolbox-margin: calc(
-          var(--zen-compact-toolbox-margin-single) + 0.15rem + var(--zen-element-separation) +
-            (18px + (var(--toolbarbutton-inner-padding) * 2))
-        )
-        var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single)
-        var(--zen-compact-toolbox-margin-single);
+      --zen-compact-toolbox-margin: calc( 
+        var(--zen-element-separation) + 0.8rem + 
+        (18px + (var(--toolbarbutton-inner-padding) * 2)) 
+      ) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
 
       :root[zen-sidebar-legacy='true'] & {
         --zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 2)

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

@@ -54,3 +54,8 @@ toolbar {
     }
   }
 }
+
+/* Menubar */
+#toolbar-menubar {
+  display: none !important;
+}

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

@@ -22,6 +22,8 @@
 
     padding: var(--zen-toolbox-padding);
     padding-top: var(--zen-toolbox-top-align);
+
+    margin-top: 0 !important;
   }
 
 
@@ -42,8 +44,14 @@
       max-width: unset !important;
       padding: 0 !important;
 
+      overflow: hidden;
+      position: relative;
+
+      border-radius: var(--border-radius-medium);
+
       & .tab-background {
         overflow: hidden;
+        margin: 2px 2px;
 
         & .tab-context-line {
           margin: 0 0px !important;
@@ -349,4 +357,13 @@
       order: 2;
     }
   }
+
+  /* Mark: Override the default tab close button */
+  #tabbrowser-tabs {
+    & .tabbrowser-tab {
+      &[pinned] .tab-close-button {
+        display: none !important;
+      }
+    }
+  }
 }

src/browser/components/tabbrowser/content/tabbrowser-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df236fcefae7 100644
+index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..c776348e776c1f9efc9b9f2ca479b1050f0a750b 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -453,10 +453,13 @@
+@@ -453,10 +453,12 @@
      },
  
      get _numPinnedTabs() {
@@ -13,12 +13,11 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
 +        if (!tab.pinned) {
            break;
          }
-+        if (tab.hidden) continue;
 +        i++;
        }
        return i;
      },
-@@ -2704,6 +2707,11 @@
+@@ -2704,6 +2706,11 @@
          );
        }
  
@@ -30,7 +29,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2771,6 +2779,9 @@
+@@ -2771,6 +2778,9 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -40,7 +39,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -3248,6 +3259,14 @@
+@@ -3248,6 +3258,14 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -55,7 +54,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3297,6 +3316,13 @@
+@@ -3297,6 +3315,13 @@
              preferredRemoteType,
            });
  
@@ -69,7 +68,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
            if (select) {
              tabToSelect = tab;
            }
-@@ -4184,6 +4210,7 @@
+@@ -4184,6 +4209,7 @@
          isLastTab ||
          aTab.pinned ||
          aTab.hidden ||
@@ -77,7 +76,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
          this._removingTabs.size >
            3 /* don't want lots of concurrent animations */ ||
          !aTab.hasAttribute(
-@@ -5117,10 +5144,10 @@
+@@ -5117,10 +5143,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      },
  

src/toolkit/modules/UpdateUtils-sys-mjs.patch

@@ -0,0 +1,13 @@
+diff --git a/toolkit/modules/UpdateUtils.sys.mjs b/toolkit/modules/UpdateUtils.sys.mjs
+index be9ce9d5402c30bf4a9712f1ce9026503c191a53..230882363b3e1bbe7f0977567db61f72494a19ea 100644
+--- a/toolkit/modules/UpdateUtils.sys.mjs
++++ b/toolkit/modules/UpdateUtils.sys.mjs
+@@ -81,7 +81,7 @@ export var UpdateUtils = {
+           replacement = Services.appinfo.name;
+           break;
+         case "VERSION":
+-          replacement = Services.appinfo.version;
++          replacement = AppConstants.ZEN_FIREFOX_VERSION;
+           break;
+         case "BUILD_ID":
+           replacement = Services.appinfo.appBuildID;