From e8f7cdbbdc0382a447a400daf18f0b810bcfa97c Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Thu, 11 May 2023 18:23:16 +1000 Subject: [PATCH 01/10] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20Firefox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gluon.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gluon.json b/gluon.json index ebc9eaa..32eea72 100644 --- a/gluon.json +++ b/gluon.json @@ -5,7 +5,7 @@ "binaryName": "pulse-browser", "version": { "product": "firefox", - "version": "112.0" + "version": "113.0" }, "buildOptions": { "generateBranding": true @@ -93,9 +93,7 @@ } }, "license": { - "ignoredFiles": [ - ".*\\.json" - ], + "ignoredFiles": [".*\\.json"], "licenseType": "MPL-2.0" }, "updateHostname": "updates.pulsebrowser.app" From c8c78a7e3ac137b26c262bd3c7834939386d33b5 Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Thu, 11 May 2023 18:53:18 +1000 Subject: [PATCH 02/10] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Remove=20macos=20?= =?UTF-8?q?vibrancy=20Fixes=20#203=20I=20don't=20have=20an=20up-to-date=20?= =?UTF-8?q?mac=20machine=20to=20test=20these=20patches=20anymore.=20Soo...?= =?UTF-8?q?.=20they=20are=20going=20to=20get=20vanished?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/themes/osx/browser-css.patch | 15 ----------- src/browser/themes/osx/jar-mn.patch | 12 --------- src/browser/themes/osx/vibrancy.css | 34 ------------------------ 3 files changed, 61 deletions(-) delete mode 100644 src/browser/themes/osx/browser-css.patch delete mode 100644 src/browser/themes/osx/jar-mn.patch delete mode 100644 src/browser/themes/osx/vibrancy.css diff --git a/src/browser/themes/osx/browser-css.patch b/src/browser/themes/osx/browser-css.patch deleted file mode 100644 index 0b94e7d..0000000 --- a/src/browser/themes/osx/browser-css.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css -index e39e14ca04edb171c1da6b7545c51accbd53535c..68d8e2ea0ae440eb1c00c6a0a1894450085ecc8a 100644 ---- a/browser/themes/osx/browser.css -+++ b/browser/themes/osx/browser.css -@@ -2,6 +2,10 @@ - * 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/. */ - -+ -+/* Pulse vibrancy themes */ -+@import url("chrome://browser/skin/vibrancy.css"); -+ - @import url("chrome://browser/skin/browser-shared.css"); - @import url("chrome://browser/skin/browser-custom-colors.css"); - diff --git a/src/browser/themes/osx/jar-mn.patch b/src/browser/themes/osx/jar-mn.patch deleted file mode 100644 index 26cb141..0000000 --- a/src/browser/themes/osx/jar-mn.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn -index 6245c67a8d2957e301f9888603f504ce091fb70c..9b017fe3a7ce3fc27d0219916d793e46694d812b 100644 ---- a/browser/themes/osx/jar.mn -+++ b/browser/themes/osx/jar.mn -@@ -7,6 +7,7 @@ browser.jar: - #include ../shared/jar.inc.mn - skin/classic/browser/sanitizeDialog.css - skin/classic/browser/browser.css -+ skin/classic/browser/vibrancy.css - skin/classic/browser/browser-custom-colors.css (../shared/browser-custom-colors.css) - skin/classic/browser/pageInfo.css - skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css) diff --git a/src/browser/themes/osx/vibrancy.css b/src/browser/themes/osx/vibrancy.css deleted file mode 100644 index 5db8483..0000000 --- a/src/browser/themes/osx/vibrancy.css +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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/. - */ -#main-window { - background: transparent !important; -} - -#TabsToolbar, -.table-widget-empty-text { - -moz-appearance: -moz-mac-vibrant-titlebar-light; -} - -#TabsToolbar[brighttext], -.table-widget-empty-text[brighttext] { - -moz-appearance: -moz-mac-vibrant-titlebar-dark !important; -} - -.tabbrowser-tab[selected='true'] .tab-label[brighttext] { - color: white !important; -} - -.tabbrowser-tab .tab-label[brighttext] { - color: rgba(255, 255, 255, 0.7) !important; -} - -.tabbrowser-tab[selected='true'] .tab-background[brighttext] { - box-shadow: inset 0em -4em 0em var(--toolbar-bgcolor) !important; -} - -#navigator-toolbox { - background-color: transparent !important; -} From f887e4f8d958727e9dc58e4c8dc61cdb7c48b45d Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Thu, 11 May 2023 18:58:38 +1000 Subject: [PATCH 03/10] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Update=20firefox?= =?UTF-8?q?=20patches?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/app/profile/firefox-js.patch | 8 ++-- .../base/content/browser-sidebar-js.patch | 47 +++++++++---------- .../locales/en-US/browser/browser-ftl.patch | 10 ++-- src/toolkit/content/aboutProfiles-xhtml.patch | 4 +- .../aboutwebrtc/aboutWebrtc-html.patch | 8 ++-- 5 files changed, 38 insertions(+), 39 deletions(-) diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch index 0d03c7a..5990992 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 81f4d49068c285049d49db6c8fc5c0fbe042ff6b..39ef13fb66567c31ebf932d7a6f528fa1d635069 100644 +index 56c8022ec4bbeda70e09c3b8780afcbf21ba0579..4d637ea6263799f9574ac23f0c8900949540dfec 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2804,3 +2804,5 @@ pref("cookiebanners.ui.desktop.cfrVariant", 0); - pref("browser.swipe.navigation-icon-min-radius", 12); - pref("browser.swipe.navigation-icon-max-radius", 20); +@@ -2837,3 +2837,5 @@ pref("cookiebanners.ui.desktop.cfrVariant", 0); + #ifdef MOZ_ARTIFACT_BUILDS + pref("telemetry.fog.artifact_build", true); #endif + +#include pulse-browser.js diff --git a/src/browser/base/content/browser-sidebar-js.patch b/src/browser/base/content/browser-sidebar-js.patch index ca58aae..cd77542 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 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e492783860a67c28 100644 +index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..ba6785d74e6ca20aff569c3f18ff3bc688cf9b14 100644 --- a/browser/base/content/browser-sidebar.js +++ b/browser/base/content/browser-sidebar.js @@ -11,6 +11,9 @@ var SidebarUI = { @@ -74,17 +74,17 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838 ])); }, -@@ -63,6 +98,10 @@ var SidebarUI = { +@@ -62,6 +97,10 @@ var SidebarUI = { + }, POSITION_START_PREF: "sidebar.position_start", DEFAULT_SIDEBAR_ID: "viewBookmarksSidebar", - ++ + SIDEBAR_KEEP_TABS_ACTIVE_PREF: "pulse.sidebar.keeptabsactive.enabled", + SIDEBAR_TABS_PREF: "pulse.sidebar.enabled", + SIDEBAR_EXTENSIONS_PREF: "pulse.sidebar.extensions.enabled", -+ + // lastOpenedId is set in show() but unlike currentID it's not cleared out on hide // and isn't persisted across windows - lastOpenedId: null, @@ -83,6 +122,15 @@ var SidebarUI = { _switcherArrow: null, _inited: false, @@ -101,7 +101,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838 /** * @type {MutationObserver | null} */ -@@ -112,20 +160,80 @@ var SidebarUI = { +@@ -112,20 +160,79 @@ var SidebarUI = { this.toggleSwitcherPanel(); }); @@ -176,14 +176,13 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838 if (!enumerator.hasMoreElements()) { let xulStore = Services.xulStore; - xulStore.persist(this._box, "sidebarcommand"); -+ + if (!this._keepTabsActivePref) { + xulStore.persist(this._box, "sidebarcommand"); + } if (this._box.hasAttribute("positionend")) { xulStore.persist(this._box, "positionend"); -@@ -157,7 +265,7 @@ var SidebarUI = { +@@ -157,7 +264,7 @@ var SidebarUI = { /** * The handler for Services.obs.addObserver. **/ @@ -192,7 +191,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838 switch (topic) { case "intl:app-locales-changed": { if (this.isOpen) { -@@ -168,6 +276,54 @@ var SidebarUI = { +@@ -168,6 +275,54 @@ var SidebarUI = { this.showInitially(this.lastOpenedId); break; } @@ -247,7 +246,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838 } } }, -@@ -284,17 +440,32 @@ var SidebarUI = { +@@ -284,17 +439,33 @@ var SidebarUI = { // First reset all ordinals to match DOM ordering. let browser = document.getElementById("browser"); [...browser.children].forEach((node, i) => { @@ -255,8 +254,8 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838 + if (node.id == "TabsToolbar" || node.id == "verticaltabs-splitter") { + return; + } -+ - node.style.MozBoxOrdinalGroup = i + 1; ++ + node.style.order = i + 1; }); if (!this._positionStart) { @@ -271,17 +270,18 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838 + + // sidebar-container and appcontent let appcontent = document.getElementById("appcontent"); -- let boxOrdinal = this._box.style.MozBoxOrdinalGroup; -- this._box.style.MozBoxOrdinalGroup = appcontent.style.MozBoxOrdinalGroup; +- let boxOrdinal = this._box.style.order; +- this._box.style.order = appcontent.style.order; + let boxOrdinal = this._sidebarTabs.style.MozBoxOrdinalGroup; + this._sidebarTabs.style.MozBoxOrdinalGroup = + appcontent.style.MozBoxOrdinalGroup; - appcontent.style.MozBoxOrdinalGroup = boxOrdinal; + appcontent.style.order = boxOrdinal; + + // splitter and sidebar-box + const splitterBoxOrdinal = this._splitter.style.MozBoxOrdinalGroup; + this._splitter.style.MozBoxOrdinalGroup = this._box.style.MozBoxOrdinalGroup; + this._box.style.MozBoxOrdinalGroup = splitterBoxOrdinal; ++ // Indicate we've switched ordering to the box this._box.setAttribute("positionend", true); } else { @@ -347,7 +347,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838 + browser.setAttribute("hidden", "true"); + } + } -+ ++ this.selectMenuItem(commandID); this._box.hidden = this._splitter.hidden = false; @@ -366,29 +366,25 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838 this.browser.addEventListener( "load", event => { -@@ -618,12 +833,19 @@ var SidebarUI = { +@@ -618,11 +833,14 @@ var SidebarUI = { // create a new content viewer because the old one doesn't get destroyed // until about:blank has loaded (which does not happen as long as the // element is hidden). - this.browser.setAttribute("src", "about:blank"); - this.browser.docShell.createAboutBlankContentViewer(null, null); +- + if (!this._keepTabsActivePref) { + this.browser.setAttribute("src", "about:blank"); + this.browser.docShell.createAboutBlankContentViewer(null, null); + } - ++ this._box.removeAttribute("checked"); this._box.hidden = this._splitter.hidden = true; + this._sidebarIcons.removeAttribute("checked"); -+ // Note: This was was commented out but had no description for its removed -+ // reason. I am bringing it back unless there is any other justification - tricky -+ // -+ // Removed in: :mute: Remove Test Logs let selBrowser = gBrowser.selectedBrowser; selBrowser.focus(); - if (triggerNode) { -@@ -636,10 +858,27 @@ var SidebarUI = { +@@ -636,10 +854,28 @@ var SidebarUI = { * none if the argument is an empty string. */ selectMenuItem(commandID) { @@ -405,6 +401,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838 - let triggerbutton = + let dropdownTriggerButton = triggerButtonId && document.getElementById(triggerButtonId); ++ + const sidebarTriggerButton = document.getElementById( + `sidebar-background-${id}` + ); @@ -417,7 +414,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838 if (id == commandID) { menu.setAttribute("checked", "true"); if (triggerbutton) { -@@ -655,6 +894,107 @@ var SidebarUI = { +@@ -655,6 +891,107 @@ var SidebarUI = { } } }, diff --git a/src/browser/locales/en-US/browser/browser-ftl.patch b/src/browser/locales/en-US/browser/browser-ftl.patch index c49d4f3..21178b2 100644 --- a/src/browser/locales/en-US/browser/browser-ftl.patch +++ b/src/browser/locales/en-US/browser/browser-ftl.patch @@ -1,12 +1,14 @@ diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl -index e86de659cda8d8f8bbc4df8346f97697e75848f5..91262ca49165a753dfdd644fd6ef2fd278f7a2d2 100644 +index 710e5248557993012830e41d025b530c7bf33ade..8f58c6b9a2e6d726a30f49b40839b2c70e8d7195 100644 --- a/browser/locales/en-US/browser/browser.ftl +++ b/browser/locales/en-US/browser/browser.ftl -@@ -963,3 +963,7 @@ firefox-relay-offer-how-we-integrate = By continuing, you’ll be able to genera - # $sitename (String): name of the site where user enters their Relay mask +@@ -982,6 +982,9 @@ firefox-relay-offer-how-we-integrate = By continuing, you’ll be able to genera # $useremail (String): user email that will receive messages firefox-relay-offer-what-relay-does = We’ll forward all emails from { $sitename } to { $useremail }. -+ + +sidebar-context-delete = + .label = Delete + + ## Popup Notification + + popup-notification-xpinstall-prompt-learn-more = Learn more about installing add-ons safely diff --git a/src/toolkit/content/aboutProfiles-xhtml.patch b/src/toolkit/content/aboutProfiles-xhtml.patch index 198245e..8190511 100644 --- a/src/toolkit/content/aboutProfiles-xhtml.patch +++ b/src/toolkit/content/aboutProfiles-xhtml.patch @@ -1,5 +1,5 @@ diff --git a/toolkit/content/aboutProfiles.xhtml b/toolkit/content/aboutProfiles.xhtml -index 85e2cff36776d82e66dd8b9f9c31f3af88cf8532..9019beb54690bb9562bd0c17c982c31b425e6a32 100644 +index d7079a022d0f5a8d44381580bd54cc2f99df53d2..1e9188a382b6676243c479fb2544fcea8387d800 100644 --- a/toolkit/content/aboutProfiles.xhtml +++ b/toolkit/content/aboutProfiles.xhtml @@ -16,6 +16,7 @@ @@ -9,4 +9,4 @@ index 85e2cff36776d82e66dd8b9f9c31f3af88cf8532..9019beb54690bb9562bd0c17c982c31b + -
+

diff --git a/src/toolkit/content/aboutwebrtc/aboutWebrtc-html.patch b/src/toolkit/content/aboutwebrtc/aboutWebrtc-html.patch index bfad02d..61195cd 100644 --- a/src/toolkit/content/aboutwebrtc/aboutWebrtc-html.patch +++ b/src/toolkit/content/aboutwebrtc/aboutWebrtc-html.patch @@ -1,10 +1,10 @@ diff --git a/toolkit/content/aboutwebrtc/aboutWebrtc.html b/toolkit/content/aboutwebrtc/aboutWebrtc.html -index 14ffab8c5fc61dc51a32a981bdbc4b4d9b8cf301..1af13b9478941ea6ed0b34b92765bad223845a17 100644 +index 7396948d1e036489b0464da74d4066b1e3300656..deceb5177ecd30daabb4a4ec29f7e38c6707a5c2 100644 --- a/toolkit/content/aboutwebrtc/aboutWebrtc.html +++ b/toolkit/content/aboutwebrtc/aboutWebrtc.html -@@ -16,6 +16,7 @@ - +@@ -17,6 +17,7 @@ + defer="defer" + type="module"> + From 25aeb42a663282a4880f548e1f049a9cf2ac2c9e Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Thu, 11 May 2023 19:04:58 +1000 Subject: [PATCH 04/10] =?UTF-8?q?=F0=9F=90=9B=20Reenable=20accessability?= =?UTF-8?q?=20Fixes=20#248?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/app/profile/pulse-browser.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/browser/app/profile/pulse-browser.js b/src/browser/app/profile/pulse-browser.js index b82ed02..09fcd7b 100644 --- a/src/browser/app/profile/pulse-browser.js +++ b/src/browser/app/profile/pulse-browser.js @@ -92,3 +92,10 @@ pref("app.releaseNotesURL.aboutDialog", "https://discord.gg/Y3khyEtAgS"); // This pref needs to be here to not break context menus (GH#169) pref("extensions.pocket.enabled", false); + +// Reenable accessability. Should have a low enough performance impact with the +// changes in 113 +// 0: auto-detect +// 1: force disable +// -1: force enable +pref('accessibility.force_disabled', 0); From 1df1035e613b582e36eef80f5b6a9c7ed7f58e52 Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Thu, 11 May 2023 19:59:49 +1000 Subject: [PATCH 05/10] =?UTF-8?q?=F0=9F=90=9B=20Fix=20vertical=20tabs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/base/content/browser-verticaltabs.js | 6 +++--- src/browser/themes/pulse/vertical_tabs.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/browser/base/content/browser-verticaltabs.js b/src/browser/base/content/browser-verticaltabs.js index 501926e..519968a 100644 --- a/src/browser/base/content/browser-verticaltabs.js +++ b/src/browser/base/content/browser-verticaltabs.js @@ -157,11 +157,11 @@ var VerticalTabs = { 'class', 'chromeclass-extrachrome verticaltabs-splitter' ) - separator.setAttribute('resizebefore', 'none') - separator.setAttribute('resizeafter', 'sibling') + separator.setAttribute('resizebefore', 'sibling') + separator.setAttribute('resizeafter', 'none') const tabs = this.tabsToolbar - if (tabs) tabs.parentElement?.insertBefore(separator, tabs) + if (tabs) insertAfter(tabs, separator) } }, diff --git a/src/browser/themes/pulse/vertical_tabs.css b/src/browser/themes/pulse/vertical_tabs.css index d4c4909..a0f82ca 100644 --- a/src/browser/themes/pulse/vertical_tabs.css +++ b/src/browser/themes/pulse/vertical_tabs.css @@ -68,7 +68,7 @@ /* Put the new tab button on the bottom */ #browser #TabsToolbar #TabsToolbar-customization-target { - -moz-box-orient: vertical; + flex-direction: column; height: 100%; /* Not sure why, but this forces the scroll box to scroll */ max-height: 100%; From ae804abf5a040b4877ad6d43d301c2eff56aa103 Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Thu, 11 May 2023 20:14:19 +1000 Subject: [PATCH 06/10] =?UTF-8?q?=F0=9F=90=9B=20Fix=20right=20docked=20sid?= =?UTF-8?q?ebar=20tabs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/content/browser-sidebar-js.patch | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/browser/base/content/browser-sidebar-js.patch b/src/browser/base/content/browser-sidebar-js.patch index cd77542..dde8901 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 d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..ba6785d74e6ca20aff569c3f18ff3bc688cf9b14 100644 +index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..738502d7c0dd9336a48270249818861dcdff9c1a 100644 --- a/browser/base/content/browser-sidebar.js +++ b/browser/base/content/browser-sidebar.js @@ -11,6 +11,9 @@ var SidebarUI = { @@ -246,7 +246,7 @@ index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..ba6785d74e6ca20aff569c3f18ff3bc6 } } }, -@@ -284,17 +439,33 @@ var SidebarUI = { +@@ -284,17 +439,32 @@ var SidebarUI = { // First reset all ordinals to match DOM ordering. let browser = document.getElementById("browser"); [...browser.children].forEach((node, i) => { @@ -272,20 +272,19 @@ index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..ba6785d74e6ca20aff569c3f18ff3bc6 let appcontent = document.getElementById("appcontent"); - let boxOrdinal = this._box.style.order; - this._box.style.order = appcontent.style.order; -+ let boxOrdinal = this._sidebarTabs.style.MozBoxOrdinalGroup; -+ this._sidebarTabs.style.MozBoxOrdinalGroup = -+ appcontent.style.MozBoxOrdinalGroup; ++ let boxOrdinal = this._sidebarTabs.style.order; ++ this._sidebarTabs.style.order = appcontent.style.order; appcontent.style.order = boxOrdinal; + + // splitter and sidebar-box -+ const splitterBoxOrdinal = this._splitter.style.MozBoxOrdinalGroup; -+ this._splitter.style.MozBoxOrdinalGroup = this._box.style.MozBoxOrdinalGroup; -+ this._box.style.MozBoxOrdinalGroup = splitterBoxOrdinal; ++ const splitterBoxOrdinal = this._splitter.style.order; ++ this._splitter.style.order = this._box.style.order; ++ this._box.style.order = splitterBoxOrdinal; + // Indicate we've switched ordering to the box this._box.setAttribute("positionend", true); } else { -@@ -483,6 +654,10 @@ var SidebarUI = { +@@ -483,6 +653,10 @@ var SidebarUI = { }, _loadSidebarExtension(commandID) { @@ -296,7 +295,7 @@ index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..ba6785d74e6ca20aff569c3f18ff3bc6 let sidebar = this.sidebars.get(commandID); let { extensionId } = sidebar; if (extensionId) { -@@ -521,6 +696,7 @@ var SidebarUI = { +@@ -521,6 +695,7 @@ var SidebarUI = { } this._fireFocusedEvent(); @@ -304,7 +303,7 @@ index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..ba6785d74e6ca20aff569c3f18ff3bc6 return true; }); }, -@@ -544,6 +720,7 @@ var SidebarUI = { +@@ -544,6 +719,7 @@ var SidebarUI = { } return this._show(commandID).then(() => { this._loadSidebarExtension(commandID); @@ -312,7 +311,7 @@ index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..ba6785d74e6ca20aff569c3f18ff3bc6 return true; }); }, -@@ -557,6 +734,38 @@ var SidebarUI = { +@@ -557,6 +733,38 @@ var SidebarUI = { */ _show(commandID) { return new Promise(resolve => { @@ -351,7 +350,7 @@ index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..ba6785d74e6ca20aff569c3f18ff3bc6 this.selectMenuItem(commandID); this._box.hidden = this._splitter.hidden = false; -@@ -574,7 +783,13 @@ var SidebarUI = { +@@ -574,7 +782,13 @@ var SidebarUI = { this.observeTitleChanges(sourceL10nEl); this.browser.setAttribute("src", url); // kick off async load @@ -366,7 +365,7 @@ index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..ba6785d74e6ca20aff569c3f18ff3bc6 this.browser.addEventListener( "load", event => { -@@ -618,11 +833,14 @@ var SidebarUI = { +@@ -618,11 +832,14 @@ var SidebarUI = { // create a new content viewer because the old one doesn't get destroyed // until about:blank has loaded (which does not happen as long as the // element is hidden). @@ -384,7 +383,7 @@ index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..ba6785d74e6ca20aff569c3f18ff3bc6 let selBrowser = gBrowser.selectedBrowser; selBrowser.focus(); -@@ -636,10 +854,28 @@ var SidebarUI = { +@@ -636,10 +853,28 @@ var SidebarUI = { * none if the argument is an empty string. */ selectMenuItem(commandID) { @@ -414,7 +413,7 @@ index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..ba6785d74e6ca20aff569c3f18ff3bc6 if (id == commandID) { menu.setAttribute("checked", "true"); if (triggerbutton) { -@@ -655,6 +891,107 @@ var SidebarUI = { +@@ -655,6 +890,107 @@ var SidebarUI = { } } }, From e732c9d38a22576fe264b61728f1d087a3d708b3 Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Thu, 11 May 2023 20:31:24 +1000 Subject: [PATCH 07/10] =?UTF-8?q?=F0=9F=92=84=20Some=20slight=20tweaks=20t?= =?UTF-8?q?o=20styling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/themes/pulse/addons/shared.css | 4 ++-- src/browser/themes/pulse/sidebar_tabs.css | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/browser/themes/pulse/addons/shared.css b/src/browser/themes/pulse/addons/shared.css index 0a5f406..e8721cc 100644 --- a/src/browser/themes/pulse/addons/shared.css +++ b/src/browser/themes/pulse/addons/shared.css @@ -153,8 +153,8 @@ tab.tabbrowser-tab:nth-child(1) { } /* Show the curve next to the sidebar panel */ -#sidebar-box[checked] ~ #appcontent::before, -#browser #TabsToolbar ~ #appcontent::before { +#sidebar-box[checked] ~ #sidebar-container::before, +#browser #TabsToolbar ~ #sidebar-container::before { content: ''; background-image: url('chrome://global/skin/icons/tab-rising-edge.svg'); diff --git a/src/browser/themes/pulse/sidebar_tabs.css b/src/browser/themes/pulse/sidebar_tabs.css index 92b8ae3..291dc91 100644 --- a/src/browser/themes/pulse/sidebar_tabs.css +++ b/src/browser/themes/pulse/sidebar_tabs.css @@ -115,15 +115,6 @@ max-height: 820px; } -/* Make it feel native on macos */ -%ifdef XP_MACOSX -#sidebar-container:not([lwt-sidebar]) { - appearance: auto; - -moz-default-appearance: -moz-mac-source-list; - -moz-font-smoothing-background-color: -moz-mac-source-list; -} -%endif - .sidebar-divider { margin: 6px; /* border-top: 1px solid var(--toolbarbutton-icon-fill); */ From 1ec0a4c462d879fbf00b3504cd8832d5107e47bd Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Sat, 13 May 2023 21:19:47 +1000 Subject: [PATCH 08/10] =?UTF-8?q?=F0=9F=92=84=20Fix=20sidebar=20browser=20?= =?UTF-8?q?height?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/themes/pulse/jar.inc.mn | 2 +- src/browser/themes/pulse/sidebar_tabs.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/browser/themes/pulse/jar.inc.mn b/src/browser/themes/pulse/jar.inc.mn index c192325..be6ea47 100644 --- a/src/browser/themes/pulse/jar.inc.mn +++ b/src/browser/themes/pulse/jar.inc.mn @@ -7,7 +7,7 @@ # be specified once. As a result, the source file paths are relative # to the location of the actual manifest. -* skin/classic/browser/pulse/sidebar_tabs.css (../pulse/sidebar_tabs.css) + skin/classic/browser/pulse/sidebar_tabs.css (../pulse/sidebar_tabs.css) skin/classic/browser/pulse/vertical_tabs.css (../pulse/vertical_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 291dc91..15fe749 100644 --- a/src/browser/themes/pulse/sidebar_tabs.css +++ b/src/browser/themes/pulse/sidebar_tabs.css @@ -119,3 +119,7 @@ margin: 6px; /* border-top: 1px solid var(--toolbarbutton-icon-fill); */ } + +.sidebar-tab { + flex: 1; +} From dec2b4a8191fe4b73592802b95004584529d52a6 Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Sat, 13 May 2023 21:36:16 +1000 Subject: [PATCH 09/10] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20firefox=20?= =?UTF-8?q?to=20`113.0.1`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gluon.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gluon.json b/gluon.json index 32eea72..c970963 100644 --- a/gluon.json +++ b/gluon.json @@ -5,7 +5,7 @@ "binaryName": "pulse-browser", "version": { "product": "firefox", - "version": "113.0" + "version": "113.0.1" }, "buildOptions": { "generateBranding": true @@ -93,8 +93,10 @@ } }, "license": { - "ignoredFiles": [".*\\.json"], + "ignoredFiles": [ + ".*\\.json" + ], "licenseType": "MPL-2.0" }, "updateHostname": "updates.pulsebrowser.app" -} +} \ No newline at end of file From 8e3a8a30de52ef52f92fab628ed51f8b7d6f0337 Mon Sep 17 00:00:00 2001 From: TrickyPR <23250792+trickypr@users.noreply.github.com> Date: Sat, 13 May 2023 22:03:01 +1000 Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=92=84=20Fix=20"Learn=20more"=20lin?= =?UTF-8?q?ks=20in=20settings=20Fixes=20#203,=20mentioned=20by=20@pvinis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/content/contentTheme-js.patch | 18 ++------------- .../themes/ThemeVariableMap-sys-mjs.patch | 23 +++++++++++++++++-- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/browser/base/content/contentTheme-js.patch b/src/browser/base/content/contentTheme-js.patch index ef441f3..520bb4a 100644 --- a/src/browser/base/content/contentTheme-js.patch +++ b/src/browser/base/content/contentTheme-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/contentTheme.js b/browser/base/content/contentTheme.js -index d634a17c2633dc2ead40082c71622fe1b7a491a2..73b2dedad1ccd3db43aca773f2e8bdcaa2737bda 100644 +index a2298986bae01a16c5306223a963119d37d2f8e4..64783d98f228c7ee373dfc1492d62ed84143b88a 100644 --- a/browser/base/content/contentTheme.js +++ b/browser/base/content/contentTheme.js -@@ -135,6 +135,119 @@ +@@ -135,6 +135,105 @@ lwtProperty: "sidebar_highlight_text", }, ], @@ -60,13 +60,6 @@ index d634a17c2633dc2ead40082c71622fe1b7a491a2..73b2dedad1ccd3db43aca773f2e8bdca + lwtProperty: "button_primary_color", + } + ], -+ [ -+ "--in-content-link-color", -+ { -+ lwtProperty: "button_primary_color", -+ } -+ ], -+ + + [ + "--in-content-primary-button-text-color-hover", @@ -86,13 +79,6 @@ index d634a17c2633dc2ead40082c71622fe1b7a491a2..73b2dedad1ccd3db43aca773f2e8bdca + lwtProperty: "button_primary_color", + } + ], -+ [ -+ "--in-content-link-color-hover", -+ { -+ lwtProperty: "button_primary_color", -+ } -+ ], -+ + + [ + "--in-content-page-background", diff --git a/src/browser/themes/ThemeVariableMap-sys-mjs.patch b/src/browser/themes/ThemeVariableMap-sys-mjs.patch index d367eb1..be73163 100644 --- a/src/browser/themes/ThemeVariableMap-sys-mjs.patch +++ b/src/browser/themes/ThemeVariableMap-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/themes/ThemeVariableMap.sys.mjs b/browser/themes/ThemeVariableMap.sys.mjs -index f2fd99193ddd0c24b7ad3ec953216973b162aaed..1810528d3b1d7b5cd2fb3f45548c8377a2f5f165 100644 +index f2fd99193ddd0c24b7ad3ec953216973b162aaed..6d03f796569080667910276c631fb6731547c9d7 100644 --- a/browser/themes/ThemeVariableMap.sys.mjs +++ b/browser/themes/ThemeVariableMap.sys.mjs @@ -126,7 +126,9 @@ export const ThemeVariableMap = [ @@ -13,7 +13,26 @@ index f2fd99193ddd0c24b7ad3ec953216973b162aaed..1810528d3b1d7b5cd2fb3f45548c8377 processColor(rgbaChannels, element) { if (!rgbaChannels) { element.removeAttribute("lwt-sidebar"); -@@ -187,4 +189,10 @@ export const ThemeContentPropertyList = [ +@@ -176,6 +178,18 @@ export const ThemeVariableMap = [ + }, + }, + ], ++ [ ++ "--in-content-link-color", ++ { ++ lwtProperty: "icon_color", ++ }, ++ ], ++ [ ++ "--in-content-link-color-hover", ++ { ++ lwtProperty: "icon_color", ++ }, ++ ], + ]; + + export const ThemeContentPropertyList = [ +@@ -187,4 +201,10 @@ export const ThemeContentPropertyList = [ "sidebar_highlight_text", "sidebar_text", "zap_gradient",