Merge branch 'dev' into dev

This commit is contained in:
mr. m
2025-04-17 11:00:18 +02:00
committed by GitHub
6 changed files with 16 additions and 7 deletions

View File

@@ -1,8 +1,8 @@
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 97acbf826f9427b06e0a54679b30269ce7b695f5..aeadcd0c72816612cd5c1ca1199fe2a363c637f4 100644
index 78572e5480a6137c5b7de89c489956f5d68ef698..1c72fe9a5419e211dea25271113981aeda46ec66 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -3362,3 +3362,5 @@ pref("toolkit.contentRelevancy.enabled", false);
@@ -3363,3 +3363,5 @@ pref("toolkit.contentRelevancy.enabled", false);
pref("toolkit.contentRelevancy.ingestEnabled", false);
// Pref to enable extra logging for the content relevancy feature
pref("toolkit.contentRelevancy.log", false);

View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index 5f406ea5d09273c9b70b84eee24c6267f88692f8..22d077e528387a6fbe59a170784dd8caa0c65b26 100644
index 5f406ea5d09273c9b70b84eee24c6267f88692f8..3e6b06aef1f74416f67e2e4bba39e5918bec2d47 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -424,11 +424,67 @@
@@ -590,6 +590,15 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..22d077e528387a6fbe59a170784dd8ca
}
// If no qualifying visible tab was found, see if there is a tab in
@@ -5202,7 +5367,7 @@
});
}
- return tab;
+ return ZenWorkspaces.findTabToBlur(tab);
}
_blurTab(aTab) {
@@ -5599,10 +5764,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}

View File

@@ -35,7 +35,7 @@ index 849b62c9976a7bc5fee35e074e54c8f556ed9c38..a9742c7ff30d417a18f41f9c12025919
}
}
@@ -78,6 +95,7 @@ static NSVisualEffectBlendingMode VisualEffectBlendingModeForVibrancyType(
@@ -78,6 +95,7 @@ - (NSView*)hitTest:(NSPoint)aPoint {
- (void)prefChanged {
self.blendingMode = VisualEffectBlendingModeForVibrancyType(mType);

View File

@@ -296,7 +296,6 @@
--zen-toolbox-top-align: var(--zen-element-separation);
}
& #sidebar-box,
& #titlebar,
& #zen-appcontent-wrapper,
& #zen-sidebar-web-panel-wrapper:has(#zen-sidebar-web-panel:not([pinned='true'])) {

View File

@@ -1379,6 +1379,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
}
const browser = tab.linkedBrowser.closest('.browserSidebarContainer');
if (active) {
tab.removeAttribute('pending');
browser.setAttribute('zen-split', 'true');
browser.addEventListener('dragstart', this.onBrowserDragStart);

View File

@@ -1122,7 +1122,7 @@
--zen-essential-bg-margin: 2px;
&::before {
background: light-dark(rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65));
background: light-dark(rgba(255, 255, 255, 0.85), rgba(68, 64, 64, 0.85));
margin: var(--zen-essential-bg-margin);
border-radius: calc(var(--border-radius-medium) - var(--zen-essential-bg-margin));
position: absolute;
@@ -1134,7 +1134,7 @@
}
&[visuallyselected]:hover .tab-background::before {
background: light-dark(rgba(255, 255, 255, 0.80), rgba(255, 255, 255, 0.45));
background: light-dark(rgba(255, 255, 255, 0.80), rgba(68, 64, 64, 0.75));
}
}
}