diff --git a/gluon.json b/gluon.json index 6bb847c..f5e5ac0 100644 --- a/gluon.json +++ b/gluon.json @@ -5,7 +5,7 @@ "binaryName": "pulse-browser", "version": { "product": "firefox", - "version": "119.0" + "version": "120.0" }, "buildOptions": { "generateBranding": true @@ -99,4 +99,4 @@ "licenseType": "MPL-2.0" }, "updateHostname": "updates.pulsebrowser.app" -} +} \ No newline at end of file diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch index b457731..aff7dd5 100644 --- a/src/browser/app/profile/firefox-js.patch +++ b/src/browser/app/profile/firefox-js.patch @@ -1,10 +1,10 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index a7d255df89a42876d50f6e0648f7a397a9740141..d31c25f9d212efbb8a2107783206dd5c57eeb8cc 100644 +index 8a0558ae2e2d694fdb2a8ed20e712216edd046d1..13bd889df4977ccb9952457f043ca4a622006beb 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2836,3 +2836,5 @@ pref("cookiebanners.ui.desktop.cfrVariant", 0); - #ifdef NIGHTLY_BUILD - pref("dom.security.credentialmanagement.identity.enabled", true); +@@ -2880,3 +2880,5 @@ pref("browser.privatebrowsing.resetPBM.showConfirmationDialog", true); + #ifdef XP_MACOSX + pref("browser.attribution.macos.enabled", false); #endif + +#include pulse-browser.js diff --git a/src/browser/themes/ThemeVariableMap-sys-mjs.patch b/src/browser/themes/ThemeVariableMap-sys-mjs.patch index be73163..8617c48 100644 --- a/src/browser/themes/ThemeVariableMap-sys-mjs.patch +++ b/src/browser/themes/ThemeVariableMap-sys-mjs.patch @@ -1,19 +1,8 @@ diff --git a/browser/themes/ThemeVariableMap.sys.mjs b/browser/themes/ThemeVariableMap.sys.mjs -index f2fd99193ddd0c24b7ad3ec953216973b162aaed..6d03f796569080667910276c631fb6731547c9d7 100644 +index ff8e85336158e4d86fab047882d6430b9e781445..4da903c46d8597ab1f749c9464ebcc0fd2f99c92 100644 --- a/browser/themes/ThemeVariableMap.sys.mjs +++ b/browser/themes/ThemeVariableMap.sys.mjs -@@ -126,7 +126,9 @@ export const ThemeVariableMap = [ - "--sidebar-background-color", - { - lwtProperty: "sidebar", -- optionalElementID: "sidebar-box", -+ // Pulse: we want to use the sidebar color in the sidebar tabs, which are -+ // under the `browser` parent rather than the `sidebar-box` parent -+ optionalElementID: "browser", - processColor(rgbaChannels, element) { - if (!rgbaChannels) { - element.removeAttribute("lwt-sidebar"); -@@ -176,6 +178,18 @@ export const ThemeVariableMap = [ +@@ -159,6 +159,18 @@ export const ThemeVariableMap = [ }, }, ], @@ -32,7 +21,7 @@ index f2fd99193ddd0c24b7ad3ec953216973b162aaed..6d03f796569080667910276c631fb673 ]; export const ThemeContentPropertyList = [ -@@ -187,4 +201,10 @@ export const ThemeContentPropertyList = [ +@@ -170,4 +182,10 @@ export const ThemeContentPropertyList = [ "sidebar_highlight_text", "sidebar_text", "zap_gradient", diff --git a/src/browser/themes/shared/browser-shared-css.patch b/src/browser/themes/shared/browser-shared-css.patch index e945780..55db416 100644 --- a/src/browser/themes/shared/browser-shared-css.patch +++ b/src/browser/themes/shared/browser-shared-css.patch @@ -1,10 +1,10 @@ diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css -index 7be173de584171d037339ad2d276b2ccb18d74db..9923e6a0bfb320d262a8a5450192151e72f1cd1f 100644 +index 50d83deb36df9ccb52ba8fa10732dfc2d58ffc7f..82cfd9a498445dc79e835c62defca6b107b73ba9 100644 --- a/browser/themes/shared/browser-shared.css +++ b/browser/themes/shared/browser-shared.css -@@ -23,6 +23,10 @@ - @import url("chrome://browser/skin/customizableui/customizeMode.css"); +@@ -24,6 +24,10 @@ @import url("chrome://browser/skin/UITour.css"); + @import url("chrome://browser/skin/formautofill-notification.css"); +@import url("chrome://browser/skin/pulse/sidebar_tabs.css"); +@import url("chrome://browser/skin/pulse/tab_tweaks.css"); @@ -13,7 +13,7 @@ index 7be173de584171d037339ad2d276b2ccb18d74db..9923e6a0bfb320d262a8a5450192151e @namespace html url("http://www.w3.org/1999/xhtml"); :root { -@@ -234,7 +238,9 @@ toolbar[brighttext] :is(a, .text-link):-moz-lwtheme, +@@ -256,7 +260,9 @@ } :root[BookmarksToolbarOverlapsBrowser] .newTabBrowserPanel,