diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components index 893eead71..ed7ce7c8d 160000 --- a/src/browser/base/content/zen-components +++ b/src/browser/base/content/zen-components @@ -1 +1 @@ -Subproject commit 893eead7181a8f84b7defe32f1a1d19d71094f79 +Subproject commit ed7ce7c8d34b4d89f894ce069fa37e789f571ecf diff --git a/src/browser/base/content/zen-glance.inc.xhtml b/src/browser/base/content/zen-glance.inc.xhtml index 1d36c7de6..cbb78be24 100644 --- a/src/browser/base/content/zen-glance.inc.xhtml +++ b/src/browser/base/content/zen-glance.inc.xhtml @@ -9,4 +9,5 @@ + \ No newline at end of file diff --git a/src/browser/base/content/zen-styles/zen-animations.css b/src/browser/base/content/zen-styles/zen-animations.css index 354fb483c..f7e64157b 100644 --- a/src/browser/base/content/zen-styles/zen-animations.css +++ b/src/browser/base/content/zen-styles/zen-animations.css @@ -279,20 +279,10 @@ opacity: 1; } - 96% { + 80% { opacity: 1; } - 98% { - /* make the box grow to full width/height */ - opacity: 1; - transform: translateX(-50%); - top: -5px; - left: 50%; - width: 77%; - height: 102%; - } - 100% { transform: translateX(-50%); opacity: 1; diff --git a/src/browser/base/content/zen-styles/zen-glance.css b/src/browser/base/content/zen-styles/zen-glance.css index 43186e097..ebb52b0ae 100644 --- a/src/browser/base/content/zen-styles/zen-glance.css +++ b/src/browser/base/content/zen-styles/zen-glance.css @@ -7,7 +7,7 @@ top: 0; left: 0; z-index: 3; - background: color-mix(in srgb, var(--zen-colors-tertiary) 10%, transparent 90%); + background: color-mix(in srgb, var(--zen-colors-tertiary) 20%, transparent 80%); backdrop-filter: blur(2px); animation: zen-glance-overlay-animation 0.1s ease-in-out forwards; border-radius: var(--zen-border-radius); @@ -45,6 +45,7 @@ } & #zen-glance-content { + z-index: 1; width: 100%; height: 100%; display: flex; diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch index 562c78fca..6a1a00be8 100644 --- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch +++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js -index c89ae2cbb978d6218bd56a059c5ca1e371231607..58c05bd5c935f73e154e84f66b39f58e5741caf6 100644 +index c89ae2cbb978d6218bd56a059c5ca1e371231607..15cc611a9b08227abcf2e0137ed9e82a90704a89 100644 --- a/browser/components/tabbrowser/content/tabbrowser.js +++ b/browser/components/tabbrowser/content/tabbrowser.js @@ -456,11 +456,26 @@ @@ -39,6 +39,15 @@ index c89ae2cbb978d6218bd56a059c5ca1e371231607..58c05bd5c935f73e154e84f66b39f58e oldTab.updateLastAccessed(); // if this is the foreground window, update the last-seen timestamps. if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) { +@@ -2485,7 +2501,7 @@ + // hasSiblings=false on both the existing browser and the new browser. + if (this.tabs.length == 2) { + this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true; +- this.tabs[1].linkedBrowser.browsingContext.hasSiblings = true; ++ if (this.tabs[1].linkedBrowser.browsingContext) this.tabs[1].linkedBrowser.browsingContext.hasSiblings = true; + } else { + aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1; + } @@ -2705,6 +2721,11 @@ ); }