diff --git a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch index 5cf0f5381..3a849bafb 100644 --- a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch +++ b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs -index d5fd707b98e4b163a624c97ff4a8f2574e0b0180..a3ac939aa9133a678396c16bc6746444a3f3ac1f 100644 +index d5fd707b98e4b163a624c97ff4a8f2574e0b0180..b5d7e84c3567e83b95a6493e8333d3036dc88f36 100644 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs @@ -183,7 +183,7 @@ export var ToolbarContextMenu = { @@ -23,3 +23,11 @@ index d5fd707b98e4b163a624c97ff4a8f2574e0b0180..a3ac939aa9133a678396c16bc6746444 let toggleVerticalTabsItem = document.getElementById( "toolbar-context-toggle-vertical-tabs" +@@ -267,6 +264,7 @@ export var ToolbarContextMenu = { + document.getElementById("sidebarRevampSeparator").hidden = + !showSidebarActions || isVerticalTabStripMenu; + document.getElementById("customizationMenuSeparator").hidden = ++ true || + toolbarItem?.id == "tabbrowser-tabs" || + (toolbarItem?.localName == "toolbarspring" && + !CustomizationHandler.isCustomizing()) || diff --git a/src/zen/common/modules/ZenHasPolyfill.mjs b/src/zen/common/modules/ZenHasPolyfill.mjs index 986559d7f..44a7c685a 100644 --- a/src/zen/common/modules/ZenHasPolyfill.mjs +++ b/src/zen/common/modules/ZenHasPolyfill.mjs @@ -26,6 +26,12 @@ class nsHasPolyfill { if (selected?.tagName?.toLowerCase() === "menu") { return null; } + if (selected) { + gZenCompactModeManager.log( + `Selector "${selector}" exists for: `, + element + ); + } return selected; }); const { exists: shouldExist = true } = descendantSelectors; diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs index 0914fb89b..112014547 100644 --- a/src/zen/compact-mode/ZenCompactMode.mjs +++ b/src/zen/compact-mode/ZenCompactMode.mjs @@ -177,7 +177,6 @@ window.gZenCompactModeManager = { const attributes = [ "panelopen", "open", - "opening", "breakout-extend", "zen-floating-urlbar", ]; @@ -186,7 +185,7 @@ window.gZenCompactModeManager = { [ { selector: - ":where([panelopen='true'], [open='true'], [showing='true'], [breakout-extend='true'])" + + ":where([panelopen='true'], [open='true'], [breakout-extend='true'])" + ":not(#urlbar[zen-floating-urlbar='true']):not(tab):not(.zen-compact-mode-ignore)", }, ], @@ -198,7 +197,7 @@ window.gZenCompactModeManager = { [ { selector: - ":where([panelopen='true'], [open='true'], [showing='true'], #urlbar:focus-within, [breakout-extend='true'])" + + ":where([panelopen='true'], [open='true'], [breakout-extend='true'])" + ":not(.zen-compact-mode-ignore)", }, ], diff --git a/src/zen/images/brand-header.svg b/src/zen/images/brand-header.svg deleted file mode 100644 index 21b542840..000000000 --- a/src/zen/images/brand-header.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/src/zen/images/jar.inc.mn b/src/zen/images/jar.inc.mn index 39b41d70c..d5ac5ccd7 100644 --- a/src/zen/images/jar.inc.mn +++ b/src/zen/images/jar.inc.mn @@ -2,7 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. - content/browser/zen-images/brand-header.svg (../../zen/images/brand-header.svg) content/browser/zen-images/layouts/collapsed.png (../../zen/images/layouts/collapsed.png) content/browser/zen-images/layouts/multiple-toolbar.png (../../zen/images/layouts/multiple-toolbar.png) content/browser/zen-images/layouts/single-toolbar.png (../../zen/images/layouts/single-toolbar.png) diff --git a/surfer.json b/surfer.json index a1ae58cdd..0d514c975 100644 --- a/surfer.json +++ b/surfer.json @@ -20,7 +20,7 @@ "brandShortName": "Zen", "brandFullName": "Zen Browser", "release": { - "displayVersion": "1.19.7b", + "displayVersion": "1.19.8b", "github": { "repo": "zen-browser/desktop" },