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

scripts/update_ff.py

@@ -63,8 +63,7 @@ def update_l10n_last_commit_hash():
     os.system(f"git clone {L10N_REPO} l10n-temp")
     if not os.path.exists("firefox-cache"):
       os.mkdir("firefox-cache")
-    with open("l10n-last-commit-hash", "w") as f:
-      os.system("cat l10n-temp/.git/refs/heads/main > firefox-cache/l10n-last-commit-hash")
+    os.system("cat l10n-temp/.git/refs/heads/main > firefox-cache/l10n-last-commit-hash")
   except KeyboardInterrupt:
     print("Exiting...")
   shutil.rmtree("l10n-temp")

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

@@ -100,7 +100,7 @@ pref('zen.injections.match-urls', 'http://localhost/*', locked);
 pref('zen.rice.share.notice.accepted', false);
 
 #ifdef XP_MACOSX
-pref('zen.theme.border-radius', 12); // In pixels
+pref('zen.theme.border-radius', 10); // In pixels
 #else
 #ifdef XP_WIN
 pref('zen.theme.border-radius', 12); // In pixels

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

@@ -361,7 +361,7 @@
   align-items: center;
 
   padding-top: var(--zen-element-separation);
-  --toolbarbutton-inner-padding: 4px;
+  --toolbarbutton-inner-padding: 5px;
 
   & > toolbarbutton:not(#zen-workspaces-button) {
     padding: 0 !important;

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

@@ -141,14 +141,6 @@
 
   & #zen-workspaces-button .zen-workspace-sidebar-icon {
     margin-inline-end: 5px;
-
-    & [no-icon='true'] {
-      display: none;
-    }
-  }
-
-  & #zen-workspaces-button .zen-workspace-sidebar-icon[no-icon='true'] + .zen-workspace-sidebar-name {
-    margin-left: 0;
   }
 
   & #zen-workspaces-button {
@@ -431,8 +423,8 @@
   min-height: 1px !important;
   padding: 3px;
   border-radius: 4px;
-  width: 20px;
-  height: 20px;
+  width: 24px;
+  height: 24px;
 }
 
 #PanelUI-zen-workspaces-create-footer,
@@ -477,7 +469,7 @@
   &:hover,
   &[open='true'] {
     &::before {
-      background: var(--zen-toolbar-element-bg);
+      background: var(--tab-hover-background-color);
     }
   }
 

src/browser/base/zen-components/ZenTabUnloader.mjs

@@ -226,7 +226,7 @@
     unloadTab() {
       const tabs = TabContextMenu.contextTab.multiselected ? gBrowser.selectedTabs : [TabContextMenu.contextTab];
       for (let i = 0; i < tabs.length; i++) {
-        if (this.canUnloadTab(tabs[i], Date.now(), [], true)) {
+        if (this.canUnloadTab(tabs[i], Date.now(), this.intervalUnloader.excludedUrls, true)) {
           this.unload(tabs[i]);
         }
       }
@@ -258,6 +258,7 @@
         !tab.linkedPanel ||
         tab.splitView ||
         tab.attention ||
+        tab.hasAttribute('glance-id') ||
         tab.linkedBrowser?.zenModeActive ||
         (tab.pictureinpicture && !ignoreTimestamp) ||
         (tab.soundPlaying && !ignoreTimestamp) ||

src/browser/themes/shared/tabbrowser/tabs-css.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026ad23e9c7 100644
+index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..3c10b8f0d893d313fa208dba8f47007b587f1428 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
 @@ -33,7 +33,7 @@
@@ -21,7 +21,15 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
    }
  
    #tabbrowser-tabs[movingtab] &:is([selected], [multiselected]) {
-@@ -252,6 +251,7 @@
+@@ -238,7 +237,6 @@
+   }
+ 
+   :root:not([uidensity=compact]) &[pinned] {
+-    padding: 0 10px;
+   }
+ 
+   &:is([selected], [multiselected]) {
+@@ -252,6 +250,7 @@
      border-radius: inherit;
      position: relative;
      overflow: hidden;
@@ -29,7 +37,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
  
      &::before {
        position: absolute;
-@@ -511,7 +511,7 @@
+@@ -511,7 +510,7 @@
        background-repeat: no-repeat;
        border-radius: 10px;
        -moz-context-properties: fill;
@@ -38,7 +46,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
      }
    }
  
-@@ -569,14 +569,14 @@
+@@ -569,14 +568,14 @@
    }
  
    &[textoverflow] {
@@ -57,7 +65,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
        direction: rtl;
        mask-image: linear-gradient(to right, transparent, black var(--tab-label-mask-size));
      }
-@@ -1146,7 +1146,7 @@
+@@ -1146,7 +1145,7 @@
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -66,7 +74,15 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
    }
  
    &:hover {
-@@ -1347,7 +1347,7 @@
+@@ -1194,7 +1193,6 @@
+ }
+ 
+ #vertical-pinned-tabs-container {
+-  --tab-inline-padding: calc((calc(var(--tab-collapsed-background-width) + 2 * var(--tab-pinned-margin-inline-expanded) - var(--icon-size-default)) / 2));
+   display: none;
+   grid-template-columns: repeat(auto-fit, minmax(var(--tab-pinned-min-width-expanded), auto));
+   overflow-y: auto;
+@@ -1347,7 +1345,7 @@
    toolbarbutton:not(#firefox-view-button),
    toolbarpaletteitem:not(#wrapper-firefox-view-button)
  ) ~ #tabbrowser-tabs {
@@ -75,7 +91,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
    padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px);
    margin-inline-start: 2px;
  }
-@@ -1381,7 +1381,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -1381,7 +1379,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  

surfer.json

@@ -39,7 +39,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.7.2t",
+        "displayVersion": "1.7.5t",
         "github": {
           "repo": "zen-browser/desktop"
         }