From 605feffaa9a7533f9619c35270bef029eedbc917 Mon Sep 17 00:00:00 2001 From: PressJump <40802367+PressJump@users.noreply.github.com> Date: Sat, 22 Oct 2022 09:37:20 +1100 Subject: [PATCH 01/21] =?UTF-8?q?=E2=9E=96=20Remove=20FirePicker=20?= =?UTF-8?q?=E2=9E=95=20Add=20Qr-Generator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gluon.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gluon.json b/gluon.json index 337d092c..ac41863b 100644 --- a/gluon.json +++ b/gluon.json @@ -24,11 +24,11 @@ "amoId": "850407", "version": "2.6.0" }, - "firepicker": { - "id": "fire-picker@browser.fushra.com", + "firefox-qr-generator": { + "id": "qr-generator@browser.fushra.com", "platform": "github", - "repo": "pulse-browser/fire-picker", - "version": "v1.1.2", + "repo": "pulse-browser/firefox-qr-generator", + "version": "v0.0.0", "fileGlob": "release.zip" }, "sidebar-tabs": { From 5ca3aa921f2cab849956d2fd09d93762e8efc537 Mon Sep 17 00:00:00 2001 From: PressJump <40802367+PressJump@users.noreply.github.com> Date: Sun, 23 Oct 2022 13:04:27 +1100 Subject: [PATCH 02/21] =?UTF-8?q?=F0=9F=90=9B=20=F0=9F=92=84=20Fix=20SVG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/toolkit/themes/shared/icons/bookmark-outline.svg | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/toolkit/themes/shared/icons/bookmark-outline.svg b/src/toolkit/themes/shared/icons/bookmark-outline.svg index 812ba2c4..fb933fb8 100644 --- a/src/toolkit/themes/shared/icons/bookmark-outline.svg +++ b/src/toolkit/themes/shared/icons/bookmark-outline.svg @@ -3,9 +3,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/. --> - - - Date: Wed, 26 Oct 2022 10:34:07 +1100 Subject: [PATCH 03/21] Update QR-Generator --- gluon.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gluon.json b/gluon.json index ac41863b..9d8f80aa 100644 --- a/gluon.json +++ b/gluon.json @@ -28,7 +28,7 @@ "id": "qr-generator@browser.fushra.com", "platform": "github", "repo": "pulse-browser/firefox-qr-generator", - "version": "v0.0.0", + "version": "v0.1.0", "fileGlob": "release.zip" }, "sidebar-tabs": { @@ -99,4 +99,4 @@ "licenseType": "MPL-2.0" }, "updateHostname": "updates.pulsebrowser.app" -} \ No newline at end of file +} From 4862e42a7d8f40e3a65f95ae93fa83cfd806ae5f Mon Sep 17 00:00:00 2001 From: SplatboyDev <64037464+splatboydev@users.noreply.github.com> Date: Mon, 31 Oct 2022 10:29:38 +0100 Subject: [PATCH 04/21] =?UTF-8?q?=E2=9C=8D=EF=B8=8FReplace=20Fire-Picker?= =?UTF-8?q?=20with=20QR=20Code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaces fire-picker with qr-code-generator in the README. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2fc88e3b..ccbbeaf2 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ An experimental Firefox fork that enhances focus and increases work productivity |--|--| |🛡️|Removed **Telemetry**| |🗡️|Built in **Ad-Block** (uBlock Origin)| -|💃|Built in light-weight **Emoji Picker**| +|💃|Built in light-weight **QR Code Generator**| |🦊|Firefox source based browser with regular security updates| |🍫|A sidebar to put tools you love within the reach of a click| |📖|Hyper minimalistic UI to increase pure focus| @@ -53,6 +53,6 @@ For bug reports, support, and just having a friendly chat with the team, feel fr - Dot HQ's [melon build tool](https://github.com/dothq/melon), which was extracted from Dot Browser. They have been driving development of firefox forks and have made incredible progress. - [MPL-2.0 License](https://github.com/dothq/melon/blob/main/LICENSE) - The [BetterFox](https://github.com/yokoffing/Better-Fox) user.js tweaks, which are used throughout the browser. - [MIT License](https://github.com/yokoffing/Better-Fox/blob/master/LICENSE) - [uBlock](https://github.com/gorhill/uBlock) extension from GitHub for blocking ads. - [GNU General Public License v3.0](https://github.com/gorhill/uBlock/blob/master/LICENSE.txt) -- [Fire-Picker](https://github.com/pulse-browser/fire-picker) extension from GitHub for light-weight emoji management. - [MPL-2.0 License](https://github.com/pulse-browser/fire-picker/blob/main/LICENSE) +- [Firefox-QR-Code-Generator](https://github.com/pulse-browser/firefox-qr-generator) extension from GitHub for a QR Code generator. - [MPL-2.0 License](https://github.com/pulse-browser/firefox-qr-generator/blob/main/LICENSE) - [Tabliss](https://github.com/joelshepherd/tabliss) extension to provide a better new-tab experience. - [GNU General Public License v3.0](hhttps://github.com/joelshepherd/tabliss/blob/main/LICENSE.txt) - [Firefox](https://firefox.com) and the rest of the mozilla team. - [MPL Version 2.0](https://www.mozilla.org/en-US/MPL/2.0/) From f215e436e6a2806d4a8b160477df52a7e54798a8 Mon Sep 17 00:00:00 2001 From: PressJump <40802367+PressJump@users.noreply.github.com> Date: Wed, 9 Nov 2022 00:59:16 +1100 Subject: [PATCH 05/21] Upgrade to 106.0.5 --- gluon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon.json b/gluon.json index b40270aa..8490d1c4 100644 --- a/gluon.json +++ b/gluon.json @@ -5,7 +5,7 @@ "binaryName": "pulse-browser", "version": { "product": "firefox", - "version": "105.0.1" + "version": "106.0.5" }, "buildOptions": { "generateBranding": true From 073537871b4419f4da78c84d25e58fda10c9e95a Mon Sep 17 00:00:00 2001 From: PressJump <40802367+PressJump@users.noreply.github.com> Date: Wed, 9 Nov 2022 00:59:42 +1100 Subject: [PATCH 06/21] Fix Patches --- src/browser/components/BrowserGlue-jsm.patch | 28 ++++++++++---------- src/browser/components/moz-build.patch | 6 ++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/browser/components/BrowserGlue-jsm.patch b/src/browser/components/BrowserGlue-jsm.patch index 87ff46d0..80c8cb45 100644 --- a/src/browser/components/BrowserGlue-jsm.patch +++ b/src/browser/components/BrowserGlue-jsm.patch @@ -1,20 +1,20 @@ diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm -index 64ac529d54270758b6dfa7a0a04b604b89a92402..e4b7844fd1df5c3ff09432c6d1664f72dba02320 100644 +index cee46e6341f98441df743f4f5abccc380a67f74b..728e4e6d4b708d75a266181052e4af54c17b6180 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm -@@ -4321,6 +4321,23 @@ BrowserGlue.prototype = { +@@ -4343,6 +4343,24 @@ BrowserGlue.prototype = { }, async _maybeShowDefaultBrowserPrompt() { + // ========================================================================= + // Pulse browser welcome -+ ++ + const welcomeEnabledPref = 'pulse.welcome.enabled' + const welcomeSeenPref = 'pulse.welcome.seen' -+ ++ + // NOTE: Get bool prefs takes in two options, the pref string and a default + // value if it is not defined -+ ++ + const welcomeEnabled = Services.prefs.getBoolPref(welcomeEnabledPref, true) + const welcomeSeen = Services.prefs.getBoolPref(welcomeSeenPref, false) + @@ -22,24 +22,24 @@ index 64ac529d54270758b6dfa7a0a04b604b89a92402..e4b7844fd1df5c3ff09432c6d1664f72 + this._showWelcomeDialog() + + // ========================================================================= ++ + // Highest priority is the upgrade dialog, which can include a "primary // browser" request and is limited in various ways, e.g., major upgrades. - const dialogVersion = 100; -@@ -4780,6 +4797,18 @@ BrowserGlue.prototype = { + const dialogVersion = 106; +@@ -4809,6 +4827,17 @@ BrowserGlue.prototype = { "nsIObserver", "nsISupportsWeakReference", ]), -+ + /** -+ * Displays the welcome dialog. Trigured `_maybeShowDefaultBrowserPrompt`. -+ * -+ * @todo Add gluon docs for how to show custom popups on startup -+ * @patch Pulse Browser -+ */ ++ * Displays the welcome dialog. Trigured `_maybeShowDefaultBrowserPrompt`. ++ * ++ * @todo Add gluon docs for how to show custom popups on startup ++ * @patch Pulse Browser ++ */ + _showWelcomeDialog() { + lazy.BrowserWindowTracker.getTopWindow().gDialogBox.open( -+ "chrome://browser/content/welcome/welcome.html" ++ "chrome://browser/content/welcome/welcome.html" + ); + }, }; diff --git a/src/browser/components/moz-build.patch b/src/browser/components/moz-build.patch index 6fb2867a..71be36ce 100644 --- a/src/browser/components/moz-build.patch +++ b/src/browser/components/moz-build.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/moz.build b/browser/components/moz.build -index 38f6b2c0ca72f55985a27256a028ba5d552c03ec..4bdc2faebce245267fac031a6fa93f0ad198b50a 100644 +index 3b2126e66efa27d4b941ceb93b46a04aa3cdef30..bbc1b8b248f32bf17764813402abf224b4bc38c1 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build -@@ -60,6 +60,9 @@ DIRS += [ +@@ -63,6 +63,9 @@ DIRS += [ "urlbar", ] @@ -11,4 +11,4 @@ index 38f6b2c0ca72f55985a27256a028ba5d552c03ec..4bdc2faebce245267fac031a6fa93f0a + DIRS += ["build"] - if CONFIG["NIGHTLY_BUILD"]: + From 1c133130e68448931c24d47457708c28f4332002 Mon Sep 17 00:00:00 2001 From: PressJump <40802367+PressJump@users.noreply.github.com> Date: Wed, 9 Nov 2022 01:18:43 +1100 Subject: [PATCH 07/21] Remove Firefox-view --- src/browser/app/profile/firefox-js.patch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch index cfc1229c..933e3a26 100644 --- a/src/browser/app/profile/firefox-js.patch +++ b/src/browser/app/profile/firefox-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index e91b0d5b4198b7e3967b6d144ae195da954f3ef3..ff38f32739948842a74499aa56f7487e3351ec7c 100644 +index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d746984613 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -19,6 +19,8 @@ @@ -19,6 +19,15 @@ index e91b0d5b4198b7e3967b6d144ae195da954f3ef3..ff38f32739948842a74499aa56f7487e pref("xpinstall.signatures.devInfoURL", "https://wiki.mozilla.org/Addons/Extension_Signing"); // Enable extensionStorage storage actor by default +@@ -773,7 +774,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true); + pref("browser.tabs.tooltipsShowPidAndActiveness", false); + #endif + +-pref("browser.tabs.firefox-view", true); ++pref("browser.tabs.firefox-view", false); + pref("browser.tabs.firefox-view.logLevel", "Warn"); + + // allow_eval_* is enabled on Firefox Desktop only at this @@ -1937,7 +1938,6 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua"); @@ -49,7 +58,7 @@ index e91b0d5b4198b7e3967b6d144ae195da954f3ef3..ff38f32739948842a74499aa56f7487e // Enable Pocket button home panel for non link pages. pref("extensions.pocket.showHome", true); -@@ -2246,9 +2238,6 @@ pref("toolkit.coverage.enabled", false); +@@ -2243,9 +2235,6 @@ pref("toolkit.coverage.enabled", false); pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org"); // Discovery prefs From d775d5544f4f4c8ef646232a6f4cf67cecaa0310 Mon Sep 17 00:00:00 2001 From: PressJump <40802367+PressJump@users.noreply.github.com> Date: Fri, 11 Nov 2022 18:21:04 +1100 Subject: [PATCH 08/21] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Triggered?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/components/BrowserGlue-jsm.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/browser/components/BrowserGlue-jsm.patch b/src/browser/components/BrowserGlue-jsm.patch index 80c8cb45..8ef65748 100644 --- a/src/browser/components/BrowserGlue-jsm.patch +++ b/src/browser/components/BrowserGlue-jsm.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm -index cee46e6341f98441df743f4f5abccc380a67f74b..728e4e6d4b708d75a266181052e4af54c17b6180 100644 +index cee46e6341f98441df743f4f5abccc380a67f74b..1102e374a8a93f2ae6142ff0bffaea71fdceb59c 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -4343,6 +4343,24 @@ BrowserGlue.prototype = { @@ -32,7 +32,7 @@ index cee46e6341f98441df743f4f5abccc380a67f74b..728e4e6d4b708d75a266181052e4af54 "nsISupportsWeakReference", ]), + /** -+ * Displays the welcome dialog. Trigured `_maybeShowDefaultBrowserPrompt`. ++ * Displays the welcome dialog. Triggered `_maybeShowDefaultBrowserPrompt`. + * + * @todo Add gluon docs for how to show custom popups on startup + * @patch Pulse Browser From 160ac926431766787927dbf1a2aab6c5c5f9d794 Mon Sep 17 00:00:00 2001 From: trickypr Date: Sun, 13 Nov 2022 20:01:12 +1100 Subject: [PATCH 09/21] =?UTF-8?q?=F0=9F=90=9B=20Fix=20set=20default=20sear?= =?UTF-8?q?ch=20engine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/components/welcome/welcome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/components/welcome/welcome.js b/src/browser/components/welcome/welcome.js index 046475ce..215f697e 100644 --- a/src/browser/components/welcome/welcome.js +++ b/src/browser/components/welcome/welcome.js @@ -65,7 +65,7 @@ class EngineStore { } async setDefaultEngine(engine) { - await Services.search.setDefault(engine) + await Services.search.setDefault(engine, Ci.nsISearchService.CHANGE_REASON_USER) } } From c4ac25b2e8ef8fb56e4bd18b67e10d8bc045c215 Mon Sep 17 00:00:00 2001 From: PressJump <40802367+PressJump@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:11:39 +1100 Subject: [PATCH 10/21] =?UTF-8?q?=E2=9C=A8=20Downloads=20Tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/content/browser-sidebar-js.patch | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/browser/base/content/browser-sidebar-js.patch b/src/browser/base/content/browser-sidebar-js.patch index f837a538..e51299a7 100644 --- a/src/browser/base/content/browser-sidebar-js.patch +++ b/src/browser/base/content/browser-sidebar-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js -index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafcf1d66f5a 100644 +index f09e37fc42f7754f7f3687884ead25124c1b2076..5c75aaac3396ee8a837458942fc9bfc949f6d8df 100644 --- a/browser/base/content/browser-sidebar.js +++ b/browser/base/content/browser-sidebar.js @@ -11,6 +11,10 @@ var SidebarUI = { @@ -37,7 +37,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc }), ], [ -@@ -47,8 +54,27 @@ var SidebarUI = { +@@ -47,8 +54,36 @@ var SidebarUI = { elementId: "sidebar-switcher-tabs", url: "chrome://browser/content/syncedtabs/sidebar.xhtml", menuId: "menu_tabsSidebar", @@ -45,6 +45,15 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc }), ], + [ ++ "sidebar-downloads", ++ { ++ title: "Downloads", ++ url: "about:downloads", ++ iconurl: "chrome://browser/skin/downloads/downloads.svg", ++ isBottom: false, ++ }, ++ ], ++ [ + "sidebar-view-addons", + { + title: "Add-ons", @@ -65,7 +74,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc ])); }, -@@ -61,6 +87,8 @@ var SidebarUI = { +@@ -61,6 +96,8 @@ var SidebarUI = { return (this._browser = document.getElementById("sidebar")); }, POSITION_START_PREF: "sidebar.position_start", @@ -74,7 +83,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc DEFAULT_SIDEBAR_ID: "viewBookmarksSidebar", // lastOpenedId is set in show() but unlike currentID it's not cleared out on hide -@@ -78,6 +106,8 @@ var SidebarUI = { +@@ -78,6 +115,8 @@ var SidebarUI = { }, _splitter: null, _icon: null, @@ -83,7 +92,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc _reversePositionButton: null, _switcherPanel: null, _switcherTarget: null, -@@ -110,10 +140,40 @@ var SidebarUI = { +@@ -110,10 +149,40 @@ var SidebarUI = { this._switcherTarget = document.getElementById("sidebar-switcher-target"); this._switcherArrow = document.getElementById("sidebar-switcher-arrow"); @@ -124,7 +133,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc this._inited = true; Services.obs.addObserver(this, "intl:app-locales-changed"); -@@ -159,17 +219,26 @@ var SidebarUI = { +@@ -159,17 +228,26 @@ var SidebarUI = { /** * The handler for Services.obs.addObserver. **/ @@ -155,7 +164,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc } } }, -@@ -573,6 +642,10 @@ var SidebarUI = { +@@ -573,6 +651,10 @@ var SidebarUI = { this._box.setAttribute("sidebarcommand", commandID); this.lastOpenedId = commandID; @@ -166,7 +175,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc let { url, title, sourceL10nEl } = this.sidebars.get(commandID); this.title = title; // Keep the title element in sync with any l10n changes. -@@ -618,6 +691,26 @@ var SidebarUI = { +@@ -618,6 +700,26 @@ var SidebarUI = { this.selectMenuItem(""); @@ -193,7 +202,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc // Replace the document currently displayed in the sidebar with about:blank // so that we can free memory by unloading the page. We need to explicitly // create a new content viewer because the old one doesn't get destroyed -@@ -641,25 +734,112 @@ var SidebarUI = { +@@ -641,25 +743,112 @@ var SidebarUI = { * none if the argument is an empty string. */ selectMenuItem(commandID) { From 72aa106d458428cbbff7b1cd2595ff6e21411f7c Mon Sep 17 00:00:00 2001 From: trickypr Date: Mon, 14 Nov 2022 19:16:20 +1100 Subject: [PATCH 11/21] =?UTF-8?q?=F0=9F=94=A7=20Hide=20`.gluon`=20temp=20d?= =?UTF-8?q?irectory?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 18ad11e1..d800add1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,7 +15,8 @@ }, "javascript.updateImportsOnFileMove.enabled": "always", "files.exclude": { - "**/node_modules": true + "**/node_modules": true, + "**/.gluon": true }, "[html]": { "editor.formatOnSave": false From 1c272a2c638e18a1cdb95d40448c891c6fff6b04 Mon Sep 17 00:00:00 2001 From: trickypr Date: Mon, 14 Nov 2022 19:17:56 +1100 Subject: [PATCH 12/21] =?UTF-8?q?=F0=9F=90=9B=20Allow=20for=20signed=20&?= =?UTF-8?q?=20unsigned=20ublock=20releases?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit uBlock seems to flip-flop between having signed and unsigned releases, so we should allow both. Maybe there is something that I am missing here? --- gluon.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gluon.json b/gluon.json index 8490d1c4..439fc9ab 100644 --- a/gluon.json +++ b/gluon.json @@ -16,7 +16,7 @@ "id": "uBlock0@raymondhill.net", "repo": "gorhill/uBlock", "version": "1.44.4", - "fileGlob": "uBlock0_*.firefox.xpi" + "fileGlob": "uBlock0_*.firefox(.signed)?.xpi" }, "tabliss": { "platform": "amo", @@ -99,4 +99,4 @@ "licenseType": "MPL-2.0" }, "updateHostname": "updates.pulsebrowser.app" -} +} \ No newline at end of file From a39cc1cf4dce72d2b5dd0005a89f0b0d17d937aa Mon Sep 17 00:00:00 2001 From: trickypr Date: Mon, 14 Nov 2022 19:16:20 +1100 Subject: [PATCH 13/21] =?UTF-8?q?=F0=9F=94=A7=20Hide=20`.gluon`=20temp=20d?= =?UTF-8?q?irectory?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 18ad11e1..d800add1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,7 +15,8 @@ }, "javascript.updateImportsOnFileMove.enabled": "always", "files.exclude": { - "**/node_modules": true + "**/node_modules": true, + "**/.gluon": true }, "[html]": { "editor.formatOnSave": false From eb05bbb8de83750dd8fe2211cd24e2a89c855323 Mon Sep 17 00:00:00 2001 From: trickypr Date: Mon, 14 Nov 2022 19:17:56 +1100 Subject: [PATCH 14/21] =?UTF-8?q?=F0=9F=90=9B=20Allow=20for=20signed=20&?= =?UTF-8?q?=20unsigned=20ublock=20releases?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit uBlock seems to flip-flop between having signed and unsigned releases, so we should allow both. Maybe there is something that I am missing here? --- gluon.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gluon.json b/gluon.json index 8490d1c4..439fc9ab 100644 --- a/gluon.json +++ b/gluon.json @@ -16,7 +16,7 @@ "id": "uBlock0@raymondhill.net", "repo": "gorhill/uBlock", "version": "1.44.4", - "fileGlob": "uBlock0_*.firefox.xpi" + "fileGlob": "uBlock0_*.firefox(.signed)?.xpi" }, "tabliss": { "platform": "amo", @@ -99,4 +99,4 @@ "licenseType": "MPL-2.0" }, "updateHostname": "updates.pulsebrowser.app" -} +} \ No newline at end of file From b330a9280c2615c4ca44e49f02942ebe8357f77b Mon Sep 17 00:00:00 2001 From: trickypr Date: Tue, 15 Nov 2022 13:28:45 +1100 Subject: [PATCH 15/21] =?UTF-8?q?=F0=9F=92=84=20Restyle=20downloads=20side?= =?UTF-8?q?bar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This includes some slight refactoring to make things work better --- .../themes/pulse/content/downloads.css | 33 +++++++++++++++++++ src/browser/themes/pulse/jar.inc.mn | 3 +- src/browser/themes/pulse/sidebar_tabs.css | 2 +- .../downloads/allDownloadsView-inc-css.patch | 12 +++++++ 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 src/browser/themes/pulse/content/downloads.css create mode 100644 src/browser/themes/shared/downloads/allDownloadsView-inc-css.patch diff --git a/src/browser/themes/pulse/content/downloads.css b/src/browser/themes/pulse/content/downloads.css new file mode 100644 index 00000000..fdb694b4 --- /dev/null +++ b/src/browser/themes/pulse/content/downloads.css @@ -0,0 +1,33 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ + +/* ========================================================================== */ +/* about:downloads */ + +#contentAreaDownloadsView { + background: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)); +} + +#downloadsListBox { + border: none; + border-radius: 0; + background: none; +} + +#downloadsListBox > richlistitem { + border-radius: 4px; + transition: background-color 0.2s ease-in-out; + + margin-bottom: 8px; +} + +#downloadsListBox > richlistitem:not([selected]):hover { + background-color: var(--in-content-box-background); +} + +@media (prefers-reduced-motion) { + #downloadsListBox > richlistitem { + transition: none; + } +} diff --git a/src/browser/themes/pulse/jar.inc.mn b/src/browser/themes/pulse/jar.inc.mn index cc536668..f1dd059d 100644 --- a/src/browser/themes/pulse/jar.inc.mn +++ b/src/browser/themes/pulse/jar.inc.mn @@ -7,5 +7,6 @@ # be specified once. As a result, the source file paths are relative # to the location of the actual manifest. -* skin/classic/browser/sidebar_tabs.css (../pulse/sidebar_tabs.css) +* skin/classic/browser/pulse/sidebar_tabs.css (../pulse/sidebar_tabs.css) + skin/classic/browser/pulse/downloads.css (../pulse/content/downloads.css) skin/classic/browser/addons/shared.css (../pulse/addons/shared.css) diff --git a/src/browser/themes/pulse/sidebar_tabs.css b/src/browser/themes/pulse/sidebar_tabs.css index 79b5babc..0d876ff6 100644 --- a/src/browser/themes/pulse/sidebar_tabs.css +++ b/src/browser/themes/pulse/sidebar_tabs.css @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* ========================================================================== */ -/* SIDE BAR STYLES */ +/* SIDEBAR TABS STYLES */ :root { --sidebar-inside-padding: 8px; diff --git a/src/browser/themes/shared/downloads/allDownloadsView-inc-css.patch b/src/browser/themes/shared/downloads/allDownloadsView-inc-css.patch new file mode 100644 index 00000000..99364b87 --- /dev/null +++ b/src/browser/themes/shared/downloads/allDownloadsView-inc-css.patch @@ -0,0 +1,12 @@ +diff --git a/browser/themes/shared/downloads/allDownloadsView.inc.css b/browser/themes/shared/downloads/allDownloadsView.inc.css +index 204e6a95a17a58789c5992983196542104f6cf84..43f7cae36b9b60d27d2442efe3f48f7cbea8bcaa 100644 +--- a/browser/themes/shared/downloads/allDownloadsView.inc.css ++++ b/browser/themes/shared/downloads/allDownloadsView.inc.css +@@ -4,6 +4,7 @@ + + @import "chrome://browser/skin/downloads/progressmeter.css"; + @import "chrome://browser/skin/downloads/download-blockedStates.css"; ++@import "chrome://browser/skin/pulse/downloads.css"; + + /*** View and outer controls ***/ + From 78f8630fb825a01688d56ed22fa4c66ae11b6dc1 Mon Sep 17 00:00:00 2001 From: trickypr Date: Tue, 15 Nov 2022 15:51:35 +1100 Subject: [PATCH 16/21] =?UTF-8?q?=F0=9F=90=9B=20Fix=20the=20sidebar=20crea?= =?UTF-8?q?tion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- .../base/content/browser-menubar-inc.patch | 14 ++++++++ .../base/content/browser-sidebar-js.patch | 35 ++++++++++--------- 3 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 src/browser/base/content/browser-menubar-inc.patch diff --git a/package.json b/package.json index 2467c985..4ed18ae2 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "package": "gluon package", "ff-version": "gluon ff-version", "licenseCheck": "gluon license-check", - "gluon": "gluon" + "gluon": "gluon", + "reset": "gluon reset" } } diff --git a/src/browser/base/content/browser-menubar-inc.patch b/src/browser/base/content/browser-menubar-inc.patch new file mode 100644 index 00000000..f1c75636 --- /dev/null +++ b/src/browser/base/content/browser-menubar-inc.patch @@ -0,0 +1,14 @@ +diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc +index f3134d5a9a01b7965eede5695def5afef4a66d6b..626fba18a7e9341731f6b71a98197695d63d7c6c 100644 +--- a/browser/base/content/browser-menubar.inc ++++ b/browser/base/content/browser-menubar.inc +@@ -153,6 +153,9 @@ + type="checkbox" + class="sync-ui-item" + oncommand="SidebarUI.toggle('viewTabsSidebar');" data-l10n-id="menu-view-synced-tabs-sidebar"/> ++ + + + diff --git a/src/browser/base/content/browser-sidebar-js.patch b/src/browser/base/content/browser-sidebar-js.patch index e51299a7..219af6c2 100644 --- a/src/browser/base/content/browser-sidebar-js.patch +++ b/src/browser/base/content/browser-sidebar-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js -index f09e37fc42f7754f7f3687884ead25124c1b2076..5c75aaac3396ee8a837458942fc9bfc949f6d8df 100644 +index f09e37fc42f7754f7f3687884ead25124c1b2076..e1833bbfd8a8ed7da767349f886d554f3dd795f3 100644 --- a/browser/base/content/browser-sidebar.js +++ b/browser/base/content/browser-sidebar.js @@ -11,6 +11,10 @@ var SidebarUI = { @@ -37,22 +37,23 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..5c75aaac3396ee8a837458942fc9bfc9 }), ], [ -@@ -47,8 +54,36 @@ var SidebarUI = { +@@ -47,8 +54,37 @@ var SidebarUI = { elementId: "sidebar-switcher-tabs", url: "chrome://browser/content/syncedtabs/sidebar.xhtml", menuId: "menu_tabsSidebar", + iconurl: "chrome://browser/skin/tab.svg", - }), - ], ++ }), ++ ], + [ -+ "sidebar-downloads", -+ { ++ "viewDownloadsSidebar", ++ makeSidebar({ ++ elementId: "sidebar-switcher-downloads", + title: "Downloads", + url: "about:downloads", -+ iconurl: "chrome://browser/skin/downloads/downloads.svg", -+ isBottom: false, -+ }, -+ ], ++ menuId: "menu_downloadsSidebar", ++ iconurl: "chrome://browser/skin/downloads/downloads.svg" + }), + ], + [ + "sidebar-view-addons", + { @@ -74,7 +75,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..5c75aaac3396ee8a837458942fc9bfc9 ])); }, -@@ -61,6 +96,8 @@ var SidebarUI = { +@@ -61,6 +97,8 @@ var SidebarUI = { return (this._browser = document.getElementById("sidebar")); }, POSITION_START_PREF: "sidebar.position_start", @@ -83,7 +84,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..5c75aaac3396ee8a837458942fc9bfc9 DEFAULT_SIDEBAR_ID: "viewBookmarksSidebar", // lastOpenedId is set in show() but unlike currentID it's not cleared out on hide -@@ -78,6 +115,8 @@ var SidebarUI = { +@@ -78,6 +116,8 @@ var SidebarUI = { }, _splitter: null, _icon: null, @@ -92,7 +93,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..5c75aaac3396ee8a837458942fc9bfc9 _reversePositionButton: null, _switcherPanel: null, _switcherTarget: null, -@@ -110,10 +149,40 @@ var SidebarUI = { +@@ -110,10 +150,40 @@ var SidebarUI = { this._switcherTarget = document.getElementById("sidebar-switcher-target"); this._switcherArrow = document.getElementById("sidebar-switcher-arrow"); @@ -133,7 +134,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..5c75aaac3396ee8a837458942fc9bfc9 this._inited = true; Services.obs.addObserver(this, "intl:app-locales-changed"); -@@ -159,17 +228,26 @@ var SidebarUI = { +@@ -159,17 +229,26 @@ var SidebarUI = { /** * The handler for Services.obs.addObserver. **/ @@ -164,7 +165,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..5c75aaac3396ee8a837458942fc9bfc9 } } }, -@@ -573,6 +651,10 @@ var SidebarUI = { +@@ -573,6 +652,10 @@ var SidebarUI = { this._box.setAttribute("sidebarcommand", commandID); this.lastOpenedId = commandID; @@ -175,7 +176,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..5c75aaac3396ee8a837458942fc9bfc9 let { url, title, sourceL10nEl } = this.sidebars.get(commandID); this.title = title; // Keep the title element in sync with any l10n changes. -@@ -618,6 +700,26 @@ var SidebarUI = { +@@ -618,6 +701,26 @@ var SidebarUI = { this.selectMenuItem(""); @@ -202,7 +203,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..5c75aaac3396ee8a837458942fc9bfc9 // Replace the document currently displayed in the sidebar with about:blank // so that we can free memory by unloading the page. We need to explicitly // create a new content viewer because the old one doesn't get destroyed -@@ -641,25 +743,112 @@ var SidebarUI = { +@@ -641,25 +744,112 @@ var SidebarUI = { * none if the argument is an empty string. */ selectMenuItem(commandID) { From 4492b3bc78e8df63d015a39d45e947fa40158460 Mon Sep 17 00:00:00 2001 From: trickypr Date: Wed, 16 Nov 2022 12:43:03 +1100 Subject: [PATCH 17/21] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20firefox=20?= =?UTF-8?q?and=20uBlock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gluon.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gluon.json b/gluon.json index 439fc9ab..9a4505fd 100644 --- a/gluon.json +++ b/gluon.json @@ -5,7 +5,7 @@ "binaryName": "pulse-browser", "version": { "product": "firefox", - "version": "106.0.5" + "version": "107.0" }, "buildOptions": { "generateBranding": true @@ -15,7 +15,7 @@ "platform": "github", "id": "uBlock0@raymondhill.net", "repo": "gorhill/uBlock", - "version": "1.44.4", + "version": "1.45.2", "fileGlob": "uBlock0_*.firefox(.signed)?.xpi" }, "tabliss": { From 5dff374b9cfdd0e60e9c8a628fe8c9fdc75a8069 Mon Sep 17 00:00:00 2001 From: trickypr Date: Wed, 16 Nov 2022 12:52:58 +1100 Subject: [PATCH 18/21] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Fix=20patches=20f?= =?UTF-8?q?or=20upstream=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/app/profile/firefox-js.patch | 28 ++++++++++++------- ...patch => BuiltInThemeConfig-sys-mjs.patch} | 10 +++---- src/browser/themes/ThemeVariableMap-jsm.patch | 13 --------- .../themes/ThemeVariableMap-sys-mjs.patch | 15 ++++++++++ src/browser/themes/shared/jar-inc-mn.patch | 4 +-- .../LightweightThemeConsumer-jsm.patch | 19 ------------- .../LightweightThemeConsumer-sys-mjs.patch | 19 +++++++++++++ src/toolkit/modules/moz-build.patch | 10 +++---- 8 files changed, 64 insertions(+), 54 deletions(-) rename src/browser/themes/{BuiltInThemeConfig-jsm.patch => BuiltInThemeConfig-sys-mjs.patch} (52%) delete mode 100644 src/browser/themes/ThemeVariableMap-jsm.patch create mode 100644 src/browser/themes/ThemeVariableMap-sys-mjs.patch delete mode 100644 src/toolkit/modules/LightweightThemeConsumer-jsm.patch create mode 100644 src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch index 933e3a26..f49777a8 100644 --- a/src/browser/app/profile/firefox-js.patch +++ b/src/browser/app/profile/firefox-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d746984613 100644 +index 14ecab77149f5645e24c8bffff57c223f64730bb..09bf8bebc166fb1e316e2c0c425f8117468281fc 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -19,6 +19,8 @@ @@ -19,32 +19,36 @@ index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d7 pref("xpinstall.signatures.devInfoURL", "https://wiki.mozilla.org/Addons/Extension_Signing"); // Enable extensionStorage storage actor by default -@@ -773,7 +774,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true); +@@ -774,7 +775,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true); pref("browser.tabs.tooltipsShowPidAndActiveness", false); #endif -pref("browser.tabs.firefox-view", true); +pref("browser.tabs.firefox-view", false); pref("browser.tabs.firefox-view.logLevel", "Warn"); + pref("browser.tabs.firefox-view.notify-for-tabs", false); - // allow_eval_* is enabled on Firefox Desktop only at this -@@ -1937,7 +1938,6 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f +@@ -1945,7 +1946,7 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua"); // Default to enabling VPN promo messages to be shown when specified and allowed -pref("browser.vpn_promo.enabled", true); ++pref("browser.vpn_promo.enabled", false); // Only show vpn card to certain regions. Comma separated string of two letter ISO 3166-1 country codes. // The most recent list of supported countries can be found at https://support.mozilla.org/en-US/kb/mozilla-vpn-countries-available-subscribe // The full list of supported country codes can also be found at https://github.com/mozilla/bedrock/search?q=VPN_COUNTRY_CODES -@@ -2060,7 +2060,6 @@ pref("browser.tabs.crashReporting.includeURL", false); +@@ -2066,10 +2067,6 @@ pref("browser.tabs.remote.warmup.unloadDelayMs", 2000); + pref("browser.tabs.crashReporting.sendReport", true); + pref("browser.tabs.crashReporting.includeURL", false); - // If true, unprivileged extensions may use experimental APIs on - // nightly and developer edition. +-// If true, unprivileged extensions may use experimental APIs on +-// nightly and developer edition. -pref("extensions.experiments.enabled", false); - +- #if defined(XP_LINUX) || defined(XP_WIN) // Allows us to adjust the priority of child processes at the OS level -@@ -2108,13 +2107,6 @@ pref("browser.migrate.chrome.history.limit", 2000); + pref("dom.ipc.processPriorityManager.enabled", true); +@@ -2116,13 +2113,6 @@ pref("browser.migrate.chrome.history.limit", 2000); pref("browser.migrate.chrome.history.maxAgeInDays", 180); pref("browser.migrate.showBookmarksToolbarAfterMigration", true); @@ -58,13 +62,17 @@ index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d7 // Enable Pocket button home panel for non link pages. pref("extensions.pocket.showHome", true); -@@ -2243,9 +2235,6 @@ pref("toolkit.coverage.enabled", false); +@@ -2251,9 +2241,10 @@ pref("toolkit.coverage.enabled", false); pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org"); // Discovery prefs -pref("browser.discovery.enabled", true); -pref("browser.discovery.containers.enabled", true); -pref("browser.discovery.sites", "addons.mozilla.org"); ++// ++// From memory, these connect to Google Analytics, so they are a no go ++pref("browser.discovery.enabled", false); ++pref("browser.discovery.containers.enabled", false); pref("browser.engagement.recent_visited_origins.expiry", 86400); // 24 * 60 * 60 (24 hours in seconds) pref("browser.engagement.downloads-button.has-used", false); diff --git a/src/browser/themes/BuiltInThemeConfig-jsm.patch b/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch similarity index 52% rename from src/browser/themes/BuiltInThemeConfig-jsm.patch rename to src/browser/themes/BuiltInThemeConfig-sys-mjs.patch index e770a8dd..e9587e09 100644 --- a/src/browser/themes/BuiltInThemeConfig-jsm.patch +++ b/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch @@ -1,8 +1,8 @@ -diff --git a/browser/themes/BuiltInThemeConfig.jsm b/browser/themes/BuiltInThemeConfig.jsm -index 05bc07ac54fa43dd6bcce1f4ab619bc054cb8084..8ace74cac976889ca0e92910388fb5128436d013 100644 ---- a/browser/themes/BuiltInThemeConfig.jsm -+++ b/browser/themes/BuiltInThemeConfig.jsm -@@ -32,6 +32,20 @@ const BuiltInThemeConfig = new Map([ +diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs +index 9c93c0d39ad11d95ecb4ad119d3c21da2528af23..e00efac497130363a41c0ecdbe07df761076b368 100644 +--- a/browser/themes/BuiltInThemeConfig.sys.mjs ++++ b/browser/themes/BuiltInThemeConfig.sys.mjs +@@ -32,6 +32,20 @@ export const BuiltInThemeConfig = new Map([ path: "resource://builtin-themes/dark/", }, ], diff --git a/src/browser/themes/ThemeVariableMap-jsm.patch b/src/browser/themes/ThemeVariableMap-jsm.patch deleted file mode 100644 index 72841a1d..00000000 --- a/src/browser/themes/ThemeVariableMap-jsm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/browser/themes/ThemeVariableMap.jsm b/browser/themes/ThemeVariableMap.jsm -index dbd936100907ace650de67a7ca882067fb65f038..3f20307d018a5be1a7de0130d008496d58851c9a 100644 ---- a/browser/themes/ThemeVariableMap.jsm -+++ b/browser/themes/ThemeVariableMap.jsm -@@ -130,7 +130,7 @@ const ThemeVariableMap = [ - "--sidebar-background-color", - { - lwtProperty: "sidebar", -- optionalElementID: "sidebar-box", -+ optionalElementID: "browser", - processColor(rgbaChannels, element) { - if (!rgbaChannels) { - element.removeAttribute("lwt-sidebar"); diff --git a/src/browser/themes/ThemeVariableMap-sys-mjs.patch b/src/browser/themes/ThemeVariableMap-sys-mjs.patch new file mode 100644 index 00000000..940a8be5 --- /dev/null +++ b/src/browser/themes/ThemeVariableMap-sys-mjs.patch @@ -0,0 +1,15 @@ +diff --git a/browser/themes/ThemeVariableMap.sys.mjs b/browser/themes/ThemeVariableMap.sys.mjs +index f2fd99193ddd0c24b7ad3ec953216973b162aaed..2d07c599152d8b0329f84a6cb626a1a40fdd241d 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"); diff --git a/src/browser/themes/shared/jar-inc-mn.patch b/src/browser/themes/shared/jar-inc-mn.patch index d6ae8703..df095097 100644 --- a/src/browser/themes/shared/jar-inc-mn.patch +++ b/src/browser/themes/shared/jar-inc-mn.patch @@ -1,5 +1,5 @@ diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn -index 26f209ad704739db88ead4ccfc7075d23b4b666d..31a1e45a8f7729f50b95fb4ea68962faaee02446 100644 +index 14ef7ff731145a42b28cbb9afe192bf56f756ed5..25d12586b7e8ce29d694dd6c0028ad176da96b1d 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -7,6 +7,8 @@ @@ -9,5 +9,5 @@ index 26f209ad704739db88ead4ccfc7075d23b4b666d..31a1e45a8f7729f50b95fb4ea68962fa +#include ../pulse/jar.inc.mn + skin/classic/browser/aboutFrameCrashed.css (../shared/aboutFrameCrashed.css) - skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css) skin/classic/browser/aboutRestartRequired.css (../shared/aboutRestartRequired.css) + skin/classic/browser/aboutSessionRestore.css (../shared/aboutSessionRestore.css) diff --git a/src/toolkit/modules/LightweightThemeConsumer-jsm.patch b/src/toolkit/modules/LightweightThemeConsumer-jsm.patch deleted file mode 100644 index 0d9cc539..00000000 --- a/src/toolkit/modules/LightweightThemeConsumer-jsm.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/toolkit/modules/LightweightThemeConsumer.jsm b/toolkit/modules/LightweightThemeConsumer.jsm -index b5b0da07cbcf503791bba1df9aa071181a857b70..e78b368532d2f8408d396585c1358218dc8b993a 100644 ---- a/toolkit/modules/LightweightThemeConsumer.jsm -+++ b/toolkit/modules/LightweightThemeConsumer.jsm -@@ -209,6 +209,14 @@ const toolkitVariableMap = [ - lwtProperty: "toolbar_field_highlight_text", - }, - ], -+ // Pulse browser: Sidebar colors -+ // Expose some light weight theme variables to be available for use within css -+ [ -+ '--lwt-sidebar-background-color', -+ { -+ lwtProperty: "sidebar", -+ } -+ ] - ]; - - function LightweightThemeConsumer(aDocument) { diff --git a/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch b/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch new file mode 100644 index 00000000..cc88b08c --- /dev/null +++ b/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch @@ -0,0 +1,19 @@ +diff --git a/toolkit/modules/LightweightThemeConsumer.sys.mjs b/toolkit/modules/LightweightThemeConsumer.sys.mjs +index 3a3ac065afb636d6ceb1ca568c3eabd10a7127f6..db44fb7b9bc4c0f5b714154be0cc00d91e3ef44b 100644 +--- a/toolkit/modules/LightweightThemeConsumer.sys.mjs ++++ b/toolkit/modules/LightweightThemeConsumer.sys.mjs +@@ -183,6 +183,14 @@ const toolkitVariableMap = [ + lwtProperty: "toolbar_field_highlight_text", + }, + ], ++ // Pulse browser: Sidebar colors ++ // Expose some light weight theme variables to be available for use within css ++ [ ++ '--lwt-sidebar-background-color', ++ { ++ lwtProperty: "sidebar", ++ } ++ ] + ]; + + export function LightweightThemeConsumer(aDocument) { diff --git a/src/toolkit/modules/moz-build.patch b/src/toolkit/modules/moz-build.patch index 9c5d6e1a..b6d46b5d 100644 --- a/src/toolkit/modules/moz-build.patch +++ b/src/toolkit/modules/moz-build.patch @@ -1,12 +1,12 @@ diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build -index 26acb92b37b7c0989a117a082de1861710ca65d7..ff7101147f0e14ec32ec2bd0d4afff535cd14a9a 100644 +index c0c6e76515978b05ae9ed0281f0106469df2b573..12f3a1820f79430f5baeaf7ad51dcf61c1bb0c29 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build -@@ -163,6 +163,7 @@ EXTRA_JS_MODULES += [ - "Color.jsm", +@@ -160,6 +160,7 @@ EXTRA_JS_MODULES += [ + "Color.sys.mjs", "Console.jsm", "ContentDOMReference.jsm", + "ContextMenu.jsm", - "CreditCard.jsm", - "DateTimePickerPanel.jsm", + "CreditCard.sys.mjs", + "DateTimePickerPanel.sys.mjs", "DeferredTask.jsm", From 851af75c60dcc1f3c3cb73cac3c1865480802512 Mon Sep 17 00:00:00 2001 From: trickypr Date: Thu, 17 Nov 2022 11:32:13 +1100 Subject: [PATCH 19/21] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Change=20skin=20loca?= =?UTF-8?q?tion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/themes/shared/browser-shared-css.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/browser/themes/shared/browser-shared-css.patch b/src/browser/themes/shared/browser-shared-css.patch index c01534a0..9cf002a9 100644 --- a/src/browser/themes/shared/browser-shared-css.patch +++ b/src/browser/themes/shared/browser-shared-css.patch @@ -1,12 +1,12 @@ diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css -index ea4e59523027b51ecea12a45dc3844f17136c918..b542ece71a64cfe8747f494e67362f188b618321 100644 +index b3f83092c310fe2378f79d5a07726ad8c215e2a3..c4b32e71b153a02c8505a2f879321c7006fd76a2 100644 --- a/browser/themes/shared/browser-shared.css +++ b/browser/themes/shared/browser-shared.css @@ -23,6 +23,8 @@ @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); -+@import url("chrome://browser/skin/sidebar_tabs.css"); ++@import url("chrome://browser/skin/pulse/sidebar_tabs.css"); + @namespace html url("http://www.w3.org/1999/xhtml"); From bc4f5a4bda58ff5d7d02067133b33051e7108e74 Mon Sep 17 00:00:00 2001 From: trickypr Date: Thu, 17 Nov 2022 11:40:07 +1100 Subject: [PATCH 20/21] =?UTF-8?q?=F0=9F=93=9D=20Change=20emoji=20to=20qrco?= =?UTF-8?q?de=20generator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/PULL_REQUEST_TEMPLATE/ff_update.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/ff_update.md b/.github/PULL_REQUEST_TEMPLATE/ff_update.md index de9be180..fde800b1 100644 --- a/.github/PULL_REQUEST_TEMPLATE/ff_update.md +++ b/.github/PULL_REQUEST_TEMPLATE/ff_update.md @@ -22,7 +22,7 @@ This bumps Firefox up to `{NEW_VERSION}` for security and performance reasons. R - [ ] Tabliss is loading correctly - [ ] Tabliss does not have the webextention symbol in the title bar - [ ] uBlock origin is loading correctly - - [ ] FirePicker is loading correctly + - [ ] QRCode generator is loading correctly - [ ] About dialog From 7972a4a42623462b5beb1d3a49c44d1a8de69904 Mon Sep 17 00:00:00 2001 From: trickypr Date: Thu, 17 Nov 2022 11:55:32 +1100 Subject: [PATCH 21/21] =?UTF-8?q?=F0=9F=92=84=20Fix=20sidebar=20tabs=20for?= =?UTF-8?q?=20mozilla=20theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/themes/pulse/sidebar_tabs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/themes/pulse/sidebar_tabs.css b/src/browser/themes/pulse/sidebar_tabs.css index 0d876ff6..b57e4965 100644 --- a/src/browser/themes/pulse/sidebar_tabs.css +++ b/src/browser/themes/pulse/sidebar_tabs.css @@ -18,7 +18,7 @@ background-color: -moz-Dialog; overflow: hidden; - max-width: var(--tab-min-height); + max-width: calc(var(--tab-min-height) + var(--tab-block-margin) * 2); /* Makes the sidebar slide out from below */ position: relative;