Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 8ae019a

Browse files
committed
⬆️ Upgrade firefox to 120.0
1 parent 28301ff commit 8ae019a

File tree

4 files changed

+13
-24
lines changed

4 files changed

+13
-24
lines changed

gluon.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"binaryName": "pulse-browser",
66
"version": {
77
"product": "firefox",
8-
"version": "119.0"
8+
"version": "120.0"
99
},
1010
"buildOptions": {
1111
"generateBranding": true
@@ -99,4 +99,4 @@
9999
"licenseType": "MPL-2.0"
100100
},
101101
"updateHostname": "updates.pulsebrowser.app"
102-
}
102+
}
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
2-
index a7d255df89a42876d50f6e0648f7a397a9740141..d31c25f9d212efbb8a2107783206dd5c57eeb8cc 100644
2+
index 8a0558ae2e2d694fdb2a8ed20e712216edd046d1..13bd889df4977ccb9952457f043ca4a622006beb 100644
33
--- a/browser/app/profile/firefox.js
44
+++ b/browser/app/profile/firefox.js
5-
@@ -2836,3 +2836,5 @@ pref("cookiebanners.ui.desktop.cfrVariant", 0);
6-
#ifdef NIGHTLY_BUILD
7-
pref("dom.security.credentialmanagement.identity.enabled", true);
5+
@@ -2880,3 +2880,5 @@ pref("browser.privatebrowsing.resetPBM.showConfirmationDialog", true);
6+
#ifdef XP_MACOSX
7+
pref("browser.attribution.macos.enabled", false);
88
#endif
99
+
1010
+#include pulse-browser.js

src/browser/themes/ThemeVariableMap-sys-mjs.patch

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
11
diff --git a/browser/themes/ThemeVariableMap.sys.mjs b/browser/themes/ThemeVariableMap.sys.mjs
2-
index f2fd99193ddd0c24b7ad3ec953216973b162aaed..6d03f796569080667910276c631fb6731547c9d7 100644
2+
index ff8e85336158e4d86fab047882d6430b9e781445..4da903c46d8597ab1f749c9464ebcc0fd2f99c92 100644
33
--- a/browser/themes/ThemeVariableMap.sys.mjs
44
+++ b/browser/themes/ThemeVariableMap.sys.mjs
5-
@@ -126,7 +126,9 @@ export const ThemeVariableMap = [
6-
"--sidebar-background-color",
7-
{
8-
lwtProperty: "sidebar",
9-
- optionalElementID: "sidebar-box",
10-
+ // Pulse: we want to use the sidebar color in the sidebar tabs, which are
11-
+ // under the `browser` parent rather than the `sidebar-box` parent
12-
+ optionalElementID: "browser",
13-
processColor(rgbaChannels, element) {
14-
if (!rgbaChannels) {
15-
element.removeAttribute("lwt-sidebar");
16-
@@ -176,6 +178,18 @@ export const ThemeVariableMap = [
5+
@@ -159,6 +159,18 @@ export const ThemeVariableMap = [
176
},
187
},
198
],
@@ -32,7 +21,7 @@ index f2fd99193ddd0c24b7ad3ec953216973b162aaed..6d03f796569080667910276c631fb673
3221
];
3322

3423
export const ThemeContentPropertyList = [
35-
@@ -187,4 +201,10 @@ export const ThemeContentPropertyList = [
24+
@@ -170,4 +182,10 @@ export const ThemeContentPropertyList = [
3625
"sidebar_highlight_text",
3726
"sidebar_text",
3827
"zap_gradient",

src/browser/themes/shared/browser-shared-css.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
2-
index 7be173de584171d037339ad2d276b2ccb18d74db..9923e6a0bfb320d262a8a5450192151e72f1cd1f 100644
2+
index 50d83deb36df9ccb52ba8fa10732dfc2d58ffc7f..82cfd9a498445dc79e835c62defca6b107b73ba9 100644
33
--- a/browser/themes/shared/browser-shared.css
44
+++ b/browser/themes/shared/browser-shared.css
5-
@@ -23,6 +23,10 @@
6-
@import url("chrome://browser/skin/customizableui/customizeMode.css");
5+
@@ -24,6 +24,10 @@
76
@import url("chrome://browser/skin/UITour.css");
7+
@import url("chrome://browser/skin/formautofill-notification.css");
88

99
+@import url("chrome://browser/skin/pulse/sidebar_tabs.css");
1010
+@import url("chrome://browser/skin/pulse/tab_tweaks.css");
@@ -13,7 +13,7 @@ index 7be173de584171d037339ad2d276b2ccb18d74db..9923e6a0bfb320d262a8a5450192151e
1313
@namespace html url("http://www.w3.org/1999/xhtml");
1414

1515
:root {
16-
@@ -234,7 +238,9 @@ toolbar[brighttext] :is(a, .text-link):-moz-lwtheme,
16+
@@ -256,7 +260,9 @@
1717
}
1818

1919
:root[BookmarksToolbarOverlapsBrowser] .newTabBrowserPanel,

0 commit comments

Comments
 (0)