diff --git a/src/zen/folders/zen-folders.css b/src/zen/folders/zen-folders.css index 829b191e..2d5436e2 100644 --- a/src/zen/folders/zen-folders.css +++ b/src/zen/folders/zen-folders.css @@ -23,6 +23,10 @@ tab-group[split-view-group] { transition: margin-inline-start 0.15s ease-in-out; } + & .tab-group-label { + height: 100% !important; + } + & .tab-group-container { display: flex; flex-wrap: nowrap; @@ -208,7 +212,7 @@ zen-folder { :root:not([zen-sidebar-expanded]) & { width: var(--tab-min-width) !important; - margin: var(--tab-block-margin) auto !important; + margin: 0 !important; & .tab-group-label { visibility: hidden !important; diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs index 83eb5c06..8a1aa4a1 100644 --- a/src/zen/glance/ZenGlanceManager.mjs +++ b/src/zen/glance/ZenGlanceManager.mjs @@ -149,7 +149,6 @@ this.browserWrapper?.removeAttribute('animate'); this.browserWrapper?.removeAttribute('animate-end'); - this.browserWrapper?.removeAttribute('animate-full'); this.browserWrapper?.removeAttribute('has-finished-animation'); this.overlay?.removeAttribute('post-fade-out'); @@ -610,7 +609,6 @@ finishOpeningGlance() { gBrowser.tabContainer._invalidateCachedTabs(); gZenWorkspaces.updateTabsContainers(); - this.browserWrapper.removeAttribute('animate-full'); this.overlay.classList.remove('zen-glance-overlay'); this._clearContainerStyles(this.browserWrapper); this.animatingFullOpen = false; @@ -627,8 +625,6 @@ const browserRect = window.windowUtils.getBoundsWithoutFlushing(this.browserWrapper); this.#currentTab.removeAttribute('zen-glance-tab'); this._clearContainerStyles(this.browserWrapper); - this.browserWrapper.removeAttribute('has-finished-animation'); - this.browserWrapper.setAttribute('animate-full', true); this.#currentTab.removeAttribute('glance-id'); this.#currentParentTab.removeAttribute('glance-id'); gBrowser.selectedTab = this.#currentTab; @@ -651,6 +647,7 @@ return; } // Write the styles early to avoid flickering + this.browserWrapper.style.opacity = 1; this.browserWrapper.style.width = `${browserRect.width}px`; this.browserWrapper.style.height = `${browserRect.height}px`; await gZenUIManager.motion.animate( @@ -660,10 +657,13 @@ height: ['100%', '100%'], }, { - duration: 0.4, + duration: 0.5, type: 'spring', } ); + this.browserWrapper.style.width = ''; + this.browserWrapper.style.height = ''; + this.browserWrapper.style.opacity = ''; gZenViewSplitter.deactivateCurrentSplitView({ removeDeckSelected: true }); this.finishOpeningGlance(); } diff --git a/src/zen/glance/zen-glance.css b/src/zen/glance/zen-glance.css index 1fbb161a..40de8005 100644 --- a/src/zen/glance/zen-glance.css +++ b/src/zen/glance/zen-glance.css @@ -142,13 +142,6 @@ transition: opacity 0.2s ease-in-out; } - &[animate-full='true'] { - transform: translate(-50%, -50%); - & .zen-glance-sidebar-container { - opacity: 0 !important; - } - } - &[animate='true'] { position: absolute; } diff --git a/src/zen/tabs/ZenPinnedTabsStorage.mjs b/src/zen/tabs/ZenPinnedTabsStorage.mjs index 605c8f72..425dbf2d 100644 --- a/src/zen/tabs/ZenPinnedTabsStorage.mjs +++ b/src/zen/tabs/ZenPinnedTabsStorage.mjs @@ -331,7 +331,7 @@ var ZenPinnedTabsStorage = { } if (!tabCheck[0].getResultByName('folder_parent_uuid')) { - throw new Error(`Tab with UUID ${tabUuid} is not in a group`); + return; } const now = Date.now();