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

src/zen/common/styles/zen-theme.css

@@ -86,7 +86,7 @@
   --button-hover-color: var(--in-content-button-text-color-hover) !important;
   --focus-outline-color: var(--color-accent-primary) !important;
 
-  --toolbarbutton-icon-fill-attention: var(--zen-primary-color) !important;
+  --toolbarbutton-icon-fill-attention: var(--toolbar-color) !important;
   --toolbarbutton-icon-fill: currentColor !important;
 
   --button-primary-bgcolor: var(--in-content-primary-button-background) !important;

src/zen/folders/ZenFolders.mjs

@@ -817,7 +817,7 @@
       if (!group) return;
 
       gZenEmojiPicker
-        .open(group, { onlySvgIcons: true })
+        .open(group.labelElement, { onlySvgIcons: true })
         .then((icon) => {
           this.setFolderUserIcon(group, icon);
           group.dispatchEvent(new CustomEvent('ZenFolderIconChanged', { bubbles: true }));

src/zen/folders/zen-folders.css

@@ -144,7 +144,10 @@ tab-group[split-view-group] .tabbrowser-tab {
 }
 
 tab-group[split-view-group] .tab-group-label-container {
-  visibility: collapse;
+  position: absolute;
+  width: 100%;
+  height: 40px;
+  visibility: hidden;
   padding: 0 !important;
   margin: 0 !important;
 }
@@ -227,6 +230,7 @@ zen-folder {
   }
 
   margin: 0 var(--tab-block-margin);
+  margin-inline-end: 0;
 
   & > .tab-group-label-container {
     flex: 0 0 auto !important;
@@ -282,6 +286,11 @@ zen-folder {
       display: none;
     }
 
+    & > label,
+    & > #tab-label-input {
+      padding: 0 0 0 30px !important;
+    }
+
     & > label {
       width: 100% !important;
       background: transparent !important;
@@ -289,7 +298,6 @@ zen-folder {
       color: var(--sidebar-text-color) !important;
       margin: 0 !important;
       font-weight: 500;
-      padding: 0 0 0 30px !important;
       display: flex;
       align-items: center;
       height: 100% !important;

src/zen/tabs/ZenPinnedTabManager.mjs

@@ -1260,6 +1260,7 @@
             for (const tab of tabs) {
               gBrowser.pinTab(tab);
             }
+            gBrowser.tabContainer.finishAnimateTabMove(true);
             Services.zen.playHapticFeedback();
           } else {
             shouldAddDragOverElement = true;
@@ -1280,6 +1281,7 @@
             for (const tab of tabs) {
               gBrowser.unpinTab(tab);
             }
+            gBrowser.tabContainer.finishAnimateTabMove(true);
             Services.zen.playHapticFeedback();
           } else {
             shouldAddDragOverElement = true;

src/zen/workspaces/ZenWorkspaces.mjs

@@ -407,7 +407,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
         if (tabs.length) {
           const defaultSelectedContainer = this.workspaceElement(
             this.activeWorkspace
-          ).querySelector('.zen-workspace-normal-tabs-section');
+          )?.querySelector('.zen-workspace-normal-tabs-section');
           const pinnedContainer = this.workspaceElement(this.activeWorkspace).querySelector(
             '.zen-workspace-pinned-tabs-section'
           );