diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index 5d974e558..22d6805c9 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -118,6 +118,7 @@ pref('zen.view.compact.animate-sidebar', true); pref('zen.view.compact.show-sidebar-and-toolbar-on-hover', true); pref('zen.urlbar.replace-newtab', true); +pref('zen.urlbar.show-protections-icon', false); pref('zen.urlbar.behavior', 'floating-on-type'); // default, floating-on-type, float pref('zen.urlbar.wait-to-clear', 45000); // in ms (default 45s) pref('zen.urlbar.show-domain-only-in-sidebar', true); diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css index 568790c0b..064bfb6b0 100644 --- a/src/browser/base/content/zen-styles/zen-urlbar.css +++ b/src/browser/base/content/zen-styles/zen-urlbar.css @@ -16,6 +16,10 @@ --urlbarView-highlight-background: var(--toolbarbutton-hover-background); border-radius: var(--toolbarbutton-border-radius); padding: 1px; + + :root:not([zen-single-toolbar='true']) &[zen-floating-urlbar='true'] { + --urlbar-container-padding: 2px !important; + } } .urlbar-input::placeholder { @@ -90,6 +94,12 @@ justify-content: center !important; align-items: center !important; margin: 0; + + :root[zen-single-toolbar='true'] & { + padding: 6px !important; + width: unset !important; + height: unset !important; + } } #tracking-protection-icon-container { @@ -454,6 +464,12 @@ button.popup-notification-dropmarker { } } +@media not (-moz-bool-pref: 'zen.urlbar.show-protections-icon') { + #tracking-protection-icon-container { + display: none !important; + } +} + /* Code ~~stolen~~ taken inspiration from https://github.com/greeeen-dev/zen-arc-cmd-bar * * MIT License diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs index c29a15432..fa7dc68f0 100644 --- a/src/browser/base/zen-components/ZenGlanceManager.mjs +++ b/src/browser/base/zen-components/ZenGlanceManager.mjs @@ -211,7 +211,6 @@ return; } - console.log(hasFocused); if (onTabClose && hasFocused && !this.#confirmationTimeout) { const cancelButton = document.getElementById('zen-glance-sidebar-close'); cancelButton.setAttribute('waitconfirmation', true); diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch index da59666c3..d288a20db 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 628aa6596627c85efe361fc1ece8fd58f7ee653e..6bd5149f4be6c18cbf733b5b9ee01534af61bef9 100644 +index 628aa6596627c85efe361fc1ece8fd58f7ee653e..cd3ad53dbe399383178d0eff459ad72079b02024 100644 --- a/browser/components/tabbrowser/content/tabbrowser.js +++ b/browser/components/tabbrowser/content/tabbrowser.js @@ -412,11 +412,50 @@ @@ -529,13 +529,11 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..6bd5149f4be6c18cbf733b5b9ee01534 } else { aIndex = Math.max(aIndex, this.pinnedTabCount); } -@@ -5684,11 +5821,18 @@ - } +@@ -5685,10 +5822,17 @@ this._handleTabMove(aTab, () => { -- let neighbor = this.tabs[aIndex]; + let neighbor = this.tabs[aIndex]; - if (forceStandaloneTab && neighbor.group) { -+ let neighbor = this.tabs.filter(tab => !tab.hasAttribute("zen-glance-tab"))[aIndex]; + const _tPos = aTab._tPos; + if ((forceStandaloneTab && neighbor.group) || neighbor.group?.hasAttribute("split-view-group")) { neighbor = neighbor.group; diff --git a/surfer.json b/surfer.json index 6d8f16315..ca8a24aae 100644 --- a/surfer.json +++ b/surfer.json @@ -6,7 +6,7 @@ "version": { "product": "firefox", "version": "136.0.1", - "candidate": "136.0" + "candidate": "136.0.1" }, "buildOptions": { "generateBranding": true