diff --git a/.gluon/patchCount b/.gluon/patchCount index 8fdd954df..cabf43b5d 100644 --- a/.gluon/patchCount +++ b/.gluon/patchCount @@ -1 +1 @@ -22 \ No newline at end of file +24 \ No newline at end of file diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index 09713fc74..434e702ad 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -13,6 +13,9 @@ pref("devtools.debugger.prompt-connection", false); // Mozilla Services pref('browser.privatebrowsing.vpnpromourl', ''); +pref("browser.vpn_promo.enabled", false); +pref("browser.contentblocking.report.show_mobile_app", false); +pref("browser.protections_panel.infoMessage.seen", true); pref('extensions.getAddons.showPane', false); pref('extensions.htmlaboutaddons.recommendations.enabled', false); pref('browser.discovery.enabled', false); @@ -23,7 +26,7 @@ pref( ); pref('browser.preferences.moreFromMozilla', false); pref('browser.aboutwelcome.enabled', true); -pref("browser.aboutwelcome.showModal", true); +pref("browser.aboutwelcome.showModal", false); // Theme pref('toolkit.legacyUserProfileCustomizations.stylesheets', true); @@ -41,6 +44,7 @@ pref('cookiebanners.service.mode.privateBrowsing', 1); // Url bar pref('browser.urlbar.unitConversion.enabled', true); pref('browser.urlbar.trending.featureGate', false); +pref('browser.urlbar.weather.featureGate', true); // new tab page pref('browser.newtabpage.activity-stream.feeds.topsites', false); diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch index 079d132fc..b4459eb39 100644 --- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch +++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch @@ -1,8 +1,17 @@ diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml -index dce7bacdb3678a95dc97085390a7e6102090ffb2..95fe3eeebb13f3804049bb080576572f5df17c09 100644 +index dce7bacdb3678a95dc97085390a7e6102090ffb2..a49f7baf69b653f4c87d081fae2b8517574867e7 100644 --- a/browser/base/content/navigator-toolbox.inc.xhtml +++ b/browser/base/content/navigator-toolbox.inc.xhtml -@@ -107,476 +107,6 @@ +@@ -30,8 +30,6 @@ + context="toolbar-context-menu" + flex="1"> + +- +- + + + +@@ -107,476 +105,6 @@ diff --git a/src/browser/components/controlcenter/content/protectionsPanel-inc-xhtml.patch b/src/browser/components/controlcenter/content/protectionsPanel-inc-xhtml.patch index e62f42e72..4cbed317f 100644 --- a/src/browser/components/controlcenter/content/protectionsPanel-inc-xhtml.patch +++ b/src/browser/components/controlcenter/content/protectionsPanel-inc-xhtml.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/controlcenter/content/protectionsPanel.inc.xhtml b/browser/components/controlcenter/content/protectionsPanel.inc.xhtml -index 29927139181e40fa9779038f996a08a2afc6f76b..60189b023e12fdbfe17bea5a28c34de6e54a3b7d 100644 +index 29927139181e40fa9779038f996a08a2afc6f76b..ddb95da98de6aba014d69f040aabe6b311fb6772 100644 --- a/browser/components/controlcenter/content/protectionsPanel.inc.xhtml +++ b/browser/components/controlcenter/content/protectionsPanel.inc.xhtml @@ -8,6 +8,7 @@ @@ -10,3 +10,21 @@ index 29927139181e40fa9779038f996a08a2afc6f76b..60189b023e12fdbfe17bea5a28c34de6 aria-labelledby="protections-popup-main-header-label" onpopupshown="gProtectionsHandler.onPopupShown(event);ReportBrokenSite.updateParentMenu(event)" onpopuphidden="gProtectionsHandler.onPopupHidden(event);" +@@ -28,7 +29,7 @@ + + + ++ data-l10n-id="protections-panel-etp-more-info" checked=""> + + + +@@ -36,7 +37,7 @@ + + + +- ++ + + + diff --git a/src/browser/components/tabpreview/tabpreview-css.patch b/src/browser/components/tabpreview/tabpreview-css.patch new file mode 100644 index 000000000..0466f0142 --- /dev/null +++ b/src/browser/components/tabpreview/tabpreview-css.patch @@ -0,0 +1,50 @@ +diff --git a/browser/components/tabpreview/tabpreview.css b/browser/components/tabpreview/tabpreview.css +index 8b288cb95da0e5fe307437e300d2c03ae19ab397..93827f8088fc21db201f69aee1517a5125b83704 100644 +--- a/browser/components/tabpreview/tabpreview.css ++++ b/browser/components/tabpreview/tabpreview.css +@@ -3,9 +3,9 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + + .tab-preview-container { +- background-color: #ffffff; ++ background-color: #fdfdfd; + color: #15141a; +- border-radius: 9px; ++ border-radius: 5px; + display: inline-block; + width: 280px; + overflow: hidden; +@@ -38,7 +38,7 @@ + + @media (prefers-color-scheme: dark) { + .tab-preview-container { +- background-color: #42414d; ++ background-color: #333237; + color: #fbfbfe; + } + .tab-preview-uri { +@@ -61,3 +61,24 @@ + display: none; + } + } ++ ++/** ++ * Zen overrides (try to avoid git conflicts as much as possible) ++ */ ++ ++.tab-preview-container { ++ --zen-border-color: #bdbcbc; ++ border: 2px solid var(--zen-border-color); ++ box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); ++} ++ ++@media (prefers-color-scheme: dark) { ++ .tab-preview-container { ++ --zen-border-color: #565656; ++ } ++} ++ ++.tab-preview-thumbnail-container img, ++.tab-preview-thumbnail-container canvas { ++ border-top: 2px solid var(--zen-border-color); ++} diff --git a/src/browser/components/tabpreview/tabpreview-mjs.patch b/src/browser/components/tabpreview/tabpreview-mjs.patch new file mode 100644 index 000000000..859ac38da --- /dev/null +++ b/src/browser/components/tabpreview/tabpreview-mjs.patch @@ -0,0 +1,13 @@ +diff --git a/browser/components/tabpreview/tabpreview.mjs b/browser/components/tabpreview/tabpreview.mjs +index 5256ab22ff3a79d9c020dac2ce375f5e42f9c13c..40b278b294740d96fedba7509ba12c6efa241b46 100644 +--- a/browser/components/tabpreview/tabpreview.mjs ++++ b/browser/components/tabpreview/tabpreview.mjs +@@ -44,7 +44,7 @@ export default class TabPreview extends MozLitElement { + this, + "_prefDisplayThumbnail", + TAB_PREVIEW_USE_THUMBNAILS_PREF, +- false ++ true + ); + } +