Merge branch 'dev' into glance-buttons-overflow

src/browser/base/content/ZenStartup.mjs

@@ -41,7 +41,9 @@
       } catch (e) {
         console.error('ZenThemeModifier: Error initializing browser layout', e);
       }
-      this.closeWatermark();
+      ZenWorkspaces.promiseInitialized.then(() => {
+        this.closeWatermark();
+      });
     },
 
     openWatermark() {

src/browser/base/content/ZenUIManager.mjs

@@ -9,6 +9,7 @@ var gZenUIManager = {
     XPCOMUtils.defineLazyPreferenceGetter(this, 'sidebarHeightThrottle', 'zen.view.sidebar-height-throttle', 500);
     XPCOMUtils.defineLazyPreferenceGetter(this, 'contentElementSeparation', 'zen.theme.content-element-separation', 0);
     XPCOMUtils.defineLazyPreferenceGetter(this, 'urlbarWaitToClear', 'zen.urlbar.wait-to-clear', 0);
+    XPCOMUtils.defineLazyPreferenceGetter(this, 'urlbarShowDomainOnly', 'zen.urlbar.show-domain-only-in-sidebar', true);
 
     gURLBar._zenTrimURL = this.urlbarTrim.bind(this);
 
@@ -218,7 +219,7 @@ var gZenUIManager = {
   },
 
   urlbarTrim(aURL) {
-    if (gZenVerticalTabsManager._hasSetSingleToolbar) {
+    if (gZenVerticalTabsManager._hasSetSingleToolbar && this.urlbarShowDomainOnly) {
       let url = BrowserUIUtils.removeSingleTrailingSlashFromURL(aURL);
       return url.startsWith('https://') ? url.split('/')[2] : url;
     }

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

@@ -34,6 +34,7 @@
   margin-left: 0 !important;
   position: absolute !important;
   overflow: hidden;
+  transition: inset 0.1s;
 }
 
 #tabbrowser-tabpanels[zen-split-view='true']:not([zen-split-resizing]) > [zen-split-anim='true'] {
@@ -221,15 +222,6 @@
   background-color: var(--zen-colors-secondary);
   align-items: center;
   z-index: 100;
-}
-
-.zen-view-splitter-drag-handle {
-  flex-grow: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
   cursor: move;
 }
 
@@ -245,6 +237,7 @@
   height: 24px;
   cursor: pointer;
   appearance: none;
+  margin-left: auto;
   outline: var(--toolbarbutton-outline);
   list-style-image: url('chrome://global/skin/icons/close-fill.svg') !important;
   &:hover {

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

@@ -1,29 +1,70 @@
 tab-group[split-view-group] {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(calc(var(--tab-pinned-min-width-expanded) + 20px), auto));
-  gap: 1px;
+  display: flex;
+  flex-wrap: nowrap;
   border-radius: var(--border-radius-medium);
-  padding: 0;
+  padding: 0 2px;
   margin-inline: var(--tab-block-margin);
   margin-block: var(--tab-block-margin);
   min-height: var(--tab-min-height);
   outline: var(--tab-outline);
   outline-offset: var(--tab-outline-offset);
   outline-color: var(--tab-selected-outline-color);
-  padding: 1px;
   transition: scale 0.1s ease;
+  align-items: center;
+  --zen-split-view-active-tab-bg: color-mix(in srgb, var(--zen-toolbar-element-bg), transparent 40%);
 
-  & > * {
-    --tab-min-height: 32px;
-    --tab-selected-bgcolor: var(--zen-toolbar-element-bg);
-    --tab-selected-shadow: none;
-    --border-radius-medium: calc(2px + var(--tab-border-radius));
-    --zen-active-tab-scale: 1;
+  :root:not([zen-sidebar-expanded='true']) & {
+    padding: 2px 0;
   }
 
-  &:has(tab[visuallyselected]) {
+  & > .tabbrowser-tab {
+    --tab-selected-bgcolor: var(--zen-split-view-active-tab-bg);
+    --tab-hover-background-color: transparent;
+    --tab-selected-shadow: none;
+    --border-radius-medium: var(--tab-border-radius);
+    --zen-active-tab-scale: 1;
+
+    :root[zen-sidebar-expanded='true'] & {
+      --tab-min-height: 28px;
+    }
+
+    flex: 1 !important;
+
+    &:not(:last-child)::after {
+      content: '';
+      width: 1px;
+      height: 16px;
+      background-color: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.2));
+      position: absolute;
+      right: 0;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    :root:not([zen-sidebar-expanded='true']) &:not(:last-child)::after {
+      width: 16px;
+      height: 1px;
+      top: auto;
+      bottom: 0;
+      right: 50%;
+      transform: translateX(50%);
+    }
+  }
+
+  &:has(> tab[visuallyselected]) {
     background-color: var(--tab-selected-bgcolor);
     box-shadow: var(--tab-selected-shadow);
+
+    & > .tabbrowser-tab {
+      --tab-hover-background-color: var(--zen-split-view-active-tab-bg);
+      & .tab-background {
+        background-color: var(--zen-split-view-active-tab-bg) !important;
+      }
+
+      &::after {
+        display: none;
+      }
+    }
   }
 
   &:active {
@@ -37,6 +78,18 @@ tab-group[split-view-group] {
   & .tab-close-button {
     display: none !important;
   }
+
+  @media (prefers-reduced-motion: no-preference) {
+    #tabbrowser-tabs[movingtab] & {
+      transition: var(--tab-dragover-transition);
+    }
+  }
+}
+
+:root:not([zen-sidebar-expanded='true']) {
+  tab-group {
+    flex-direction: column;
+  }
 }
 
 tab-group[split-view-group] .tabbrowser-tab {

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

@@ -391,7 +391,7 @@
   max-height: unset !important;
 
   & .tabbrowser-tab:not(:hover) .tab-background:not([selected]):not([multiselected]) {
-    background: transparent !important;
+    background: transparent;
   }
 
   & .tabbrowser-tab .tab-content {
@@ -872,7 +872,7 @@
     display: block;
     width: 2.5px;
     height: 16px;
-    background: light-dark(rgba(88, 79, 79, 0.02), rgba(255, 255, 255, 0.3));
+    background: light-dark(rgba(66, 61, 61, 0.3), rgba(255, 255, 255, 0.3));
     position: absolute;
     right: 0;
     top: 50%;

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

@@ -104,7 +104,7 @@
   --zen-button-border-radius: 5px;
   --zen-button-padding: 0.6rem 1.2rem;
 
-  --zen-toolbar-element-bg: light-dark(rgba(89, 89, 89, 0.1), rgba(255, 255, 255, 0.125));
+  --zen-toolbar-element-bg: light-dark(rgba(89, 89, 89, 0.1), rgba(255, 255, 255, 0.1));
 
   /* Toolbar */
   --zen-toolbar-height: 38px;