diff --git a/src/browser/base/content/aboutDialog-xhtml.patch b/src/browser/base/content/aboutDialog-xhtml.patch index 6913bb6a..1145f64d 100644 --- a/src/browser/base/content/aboutDialog-xhtml.patch +++ b/src/browser/base/content/aboutDialog-xhtml.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml -index c64980810570fcea84e33fdc2d66ac42a79f4e46..11fe00e84dbac781b3da90abb1251c70bd3b094a 100644 +index c64980810570fcea84e33fdc2d66ac42a79f4e46..aa629ebb38a9aa74048fe3fc759f716fad57d6f3 100644 --- a/browser/base/content/aboutDialog.xhtml +++ b/browser/base/content/aboutDialog.xhtml @@ -102,10 +102,6 @@ @@ -13,7 +13,13 @@ index c64980810570fcea84e33fdc2d66ac42a79f4e46..11fe00e84dbac781b3da90abb1251c70 #endif -@@ -125,21 +121,17 @@ +@@ -120,26 +116,22 @@ + diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css index 16655c8a..493c2b7f 100644 --- a/src/zen/common/styles/zen-theme.css +++ b/src/zen/common/styles/zen-theme.css @@ -117,8 +117,8 @@ --zen-button-padding: 0.6rem 1.2rem; --zen-toolbar-element-bg: light-dark( - color-mix(in srgb, currentColor 10%, transparent 90%), - color-mix(in srgb, currentColor 15%, transparent 85%) + color-mix(in srgb, var(--toolbox-textcolor) 10%, transparent 90%), + color-mix(in srgb, var(--toolbox-textcolor) 15%, transparent 85%) ); /* Toolbar */ diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css index 5984d47f..af40c17a 100644 --- a/src/zen/compact-mode/zen-compact-mode.css +++ b/src/zen/compact-mode/zen-compact-mode.css @@ -185,15 +185,7 @@ #navigator-toolbox:has(.tabbrowser-tab:active), &[zen-renaming-tab='true'] #navigator-toolbox, #navigator-toolbox:has( - *:is( - [panelopen='true'], - [open='true'], - #urlbar:focus-within, - [breakout-extend='true'] - ) - :not(#urlbar[zen-floating-urlbar='true']) - :not(tab) - :not(.zen-compact-mode-ignore) + *:is([panelopen='true'], [open='true'], #urlbar:focus-within, [breakout-extend='true']):not(#urlbar[zen-floating-urlbar='true']):not(tab):not(.zen-compact-mode-ignore) ) { &:not([animate='true']) { --zen-compact-mode-func: linear( diff --git a/src/zen/workspaces/ZenWorkspaceIcons.mjs b/src/zen/workspaces/ZenWorkspaceIcons.mjs index f04c41b6..6b1523df 100644 --- a/src/zen/workspaces/ZenWorkspaceIcons.mjs +++ b/src/zen/workspaces/ZenWorkspaceIcons.mjs @@ -62,6 +62,7 @@ } else { this.insertBefore(draggedTab, tab.nextSibling); } + Services.zen.playHapticFeedback(); } } } diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs index 07828890..8d0b9fa9 100644 --- a/src/zen/workspaces/ZenWorkspaces.mjs +++ b/src/zen/workspaces/ZenWorkspaces.mjs @@ -711,7 +711,7 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature { document.getElementById('zen-sidebar-splitter').getBoundingClientRect().width * 2; let translateX = this._swipeState.lastDelta + delta; // Add a force multiplier as we are translating the strip depending on how close to the edge we are - let forceMultiplier = Math.min(1, 1 - Math.abs(translateX) / (stripWidth * 5)); // 4.5 instead of 4 to add a bit of a buffer + let forceMultiplier = Math.min(1, 1 - Math.abs(translateX) / (stripWidth * 4.5)); // 4.5 instead of 4 to add a bit of a buffer if (forceMultiplier > 0.5) { translateX *= forceMultiplier; this._swipeState.lastDelta = delta + (translateX - delta) * 0.5;