pulse-browser · trickypr · Dec 14, 2022 · Nov 17, 2022 · Nov 17, 2022 · Nov 18, 2022
diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
@@ -350,6 +350,8 @@ jobs:
     name: Release
     needs: [build-data, linux, source, mac, windows]
     runs-on: ubuntu-latest
+    if: ${{ github.ref == 'refs/heads/alpha' }}
+
     steps:
       - uses: actions/download-artifact@v2
 
@@ -397,6 +399,7 @@ jobs:
     name: Build flatpak repos
     needs: [build-data, release]
     runs-on: ubuntu-latest
+    if: ${{ github.ref == 'refs/heads/alpha' }}
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,7 +5,8 @@
     "moz.configure": "python",
     "app.mozbuild": "python",
     "Makefile.in": "makefile",
-    "mozconfig": "shellscript"
+    "mozconfig": "shellscript",
+    "src/browser/themes/**.json": "jsonc"
   },
   "files.watcherExclude": {
     "**/.git/objects/**": true,

diff --git a/package.json b/package.json
@@ -14,10 +14,11 @@
     "build:ui": "gluon build --ui",
     "bs": "yarn build && yarn start",
     "bus": "yarn build:ui && yarn start",
-    "start": "gluon run",
+    "start": "yarn clearStartupCache && gluon run",
     "export": "gluon export-file",
     "imp": "gluon import",
     "clearProfile": "rm -rf engine/obj-x86_64-pc-linux-gnu/tmp/profile-default",
+    "clearStartupCache": "rm -rf engine/obj-x86_64-pc-linux-gnu/tmp/profile-default/startupCache",
     "download": "gluon download",
     "package": "gluon package",
     "ff-version": "gluon ff-version",

diff --git a/src/browser/base/content/aboutRobots-xhtml.patch b/src/browser/base/content/aboutRobots-xhtml.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/base/content/aboutRobots.xhtml b/browser/base/content/aboutRobots.xhtml
+index 767b31067d6d82c1ddfdbf633ececc459c6480ae..21d09dfb758477930096b6c1b070642464a09e69 100644
+--- a/browser/base/content/aboutRobots.xhtml
++++ b/browser/base/content/aboutRobots.xhtml
+@@ -14,6 +14,7 @@
+     <linkset>
+       <link rel="localization" href="browser/aboutRobots.ftl"/>
+     </linkset>
++    <script src="chrome://browser/content/contentTheme.js"></script>
+   </head>
+
+   <body>
diff --git 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..e1833bbfd8a8ed7da767349f886d554f3dd795f3 100644
+index c5ac301416d2d820ba95e21c0ce1fe305e63b554..ef82cb7bf931d7601c2116ee0d1828d6aa593cae 100644
 --- a/browser/base/content/browser-sidebar.js
 +++ b/browser/base/content/browser-sidebar.js
 @@ -11,6 +11,10 @@ var SidebarUI = {
@@ -165,18 +165,21 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..e1833bbfd8a8ed7da767349f886d554f
        }
      }
    },
-@@ -573,6 +652,10 @@ var SidebarUI = {
+@@ -570,6 +649,13 @@ var SidebarUI = {
        this._box.setAttribute("sidebarcommand", commandID);
        this.lastOpenedId = commandID;
 
 +      // Pulse: Reset sidebar margin to zero to allow for correct animations to
 +      // take place (adapted from dot browser, se below)
 +      this._box.style.marginLeft = "0px";
++
++      // Pulse: Add checked to the sidebar-icons class to enable more css latter
++      this._sidebarIcons.setAttribute("checked", "true");
 +
        let { url, title, sourceL10nEl } = this.sidebars.get(commandID);
        this.title = title;
        // Keep the title element in sync with any l10n changes.
-@@ -618,6 +701,26 @@ var SidebarUI = {
+@@ -615,6 +701,27 @@ var SidebarUI = {
 
      this.selectMenuItem("");
 
@@ -198,12 +201,21 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..e1833bbfd8a8ed7da767349f886d554f
 +      this._splitter.hidden = true;
 +
 +      this._box.removeAttribute("checked");
++      this._sidebarIcons.removeAttribute("checked");
 +    }, 170);
 +
      // 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 +744,112 @@ var SidebarUI = {
+@@ -625,6 +732,7 @@ var SidebarUI = {
+
+     this._box.removeAttribute("checked");
+     this._box.hidden = this._splitter.hidden = true;
++    this._sidebarIcons.removeAttribute("checked");
+
+     let selBrowser = gBrowser.selectedBrowser;
+     selBrowser.focus();
+@@ -638,25 +746,112 @@ var SidebarUI = {
     * none if the argument is an empty string.
     */
    selectMenuItem(commandID) {

diff --git a/src/browser/base/content/contentTheme-js.patch b/src/browser/base/content/contentTheme-js.patch
@@ -0,0 +1,110 @@
+diff --git a/browser/base/content/contentTheme.js b/browser/base/content/contentTheme.js
+index d634a17c2633dc2ead40082c71622fe1b7a491a2..042c8120729f6c35ad0b49b91443a88ec6ed4fe8 100644
+--- a/browser/base/content/contentTheme.js
++++ b/browser/base/content/contentTheme.js
+@@ -135,6 +135,105 @@
+         lwtProperty: "sidebar_highlight_text",
+       },
+     ],
++
++    // Pulse: Force content styles to use the current css theme!
++    // Remember to add your keys to browser/themes/ThemeVariableMap.sys.mjs
++    [
++      "--in-content-primary-button-background",
++      {
++        lwtProperty: "button_primary",
++      }
++    ],
++    [
++      "--primary-button-background-color",
++      {
++        lwtProperty: "button_primary",
++      }
++    ],
++
++    [
++      "--in-content-primary-button-background-hover",
++      {
++        lwtProperty: "button_primary_hover",
++      }
++    ],
++    [
++      "--primary-button-hover-background-color",
++      {
++        lwtProperty: "button_primary_hover",
++      }
++    ],
++
++    [
++      "--in-content-primary-button-background-active",
++      {
++        lwtProperty: "button_primary_active",
++      }
++    ],
++    [
++      "--primary-button-active-background-color",
++      {
++        lwtProperty: "button_primary_active",
++      }
++    ],
++
++    [
++      "--in-content-primary-button-text-color",
++      {
++        lwtProperty: "button_primary_color",
++      }
++    ],
++    [
++      "--primary-button-color",
++      {
++        lwtProperty: "button_primary_color",
++      }
++    ],
++
++    [
++      "--in-content-primary-button-text-color-hover",
++      {
++        lwtProperty: "button_primary_color",
++      }
++    ],
++    [
++      "--newtab-primary-action-background",
++      {
++        lwtProperty: "button_primary",
++      }
++    ],
++    [
++      "--newtab-primary-element-text-color",
++      {
++        lwtProperty: "button_primary_color",
++      }
++    ],
++
++    [
++      "--in-content-page-background",
++      {
++        lwtProperty: "ntp_background",
++      }
++    ],
++    [
++      "--bg-color",
++      {
++        lwtProperty: "ntp_background",
++      }
++    ],
++
++    [
++      "--card-background-color",
++      {
++        lwtProperty: "ntp_card_background",
++      }
++    ],
++    [
++      "--in-content-box-background",
++      {
++        lwtProperty: "ntp_card_background",
++      }
++    ],
+   ];
+
+   /**
diff --git a/src/browser/components/BrowserGlue-jsm.patch b/src/browser/components/BrowserGlue-jsm.patch
@@ -1,8 +1,24 @@
 diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
-index cee46e6341f98441df743f4f5abccc380a67f74b..1102e374a8a93f2ae6142ff0bffaea71fdceb59c 100644
+index 43fbae6024d491379965937246c4900179d924eb..cbf5c219feeab92a3ecfcc991c605394ef29b8de 100644
 --- a/browser/components/BrowserGlue.jsm
 +++ b/browser/components/BrowserGlue.jsm
-@@ -4343,6 +4343,24 @@ BrowserGlue.prototype = {
+@@ -562,13 +562,8 @@ let JSWINDOWACTORS = {
+     includeChrome: true,
+     allFrames: true,
+     matches: [
+-      "about:home",
+-      "about:newtab",
+-      "about:welcome",
+-      "chrome://browser/content/syncedtabs/sidebar.xhtml",
+-      "chrome://browser/content/places/historySidebar.xhtml",
+-      "chrome://browser/content/places/bookmarksSidebar.xhtml",
+-      "about:firefoxview",
++      "about:*",
++      "chrome://*"
+     ],
+   },
+
+@@ -4361,6 +4356,24 @@ BrowserGlue.prototype = {
    },
 
    async _maybeShowDefaultBrowserPrompt() {
@@ -27,7 +43,7 @@ index cee46e6341f98441df743f4f5abccc380a67f74b..1102e374a8a93f2ae6142ff0bffaea71
      // 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 = 106;
-@@ -4809,6 +4827,17 @@ BrowserGlue.prototype = {
+@@ -4827,6 +4840,17 @@ BrowserGlue.prototype = {
      "nsIObserver",
      "nsISupportsWeakReference",
    ]),

diff --git a/src/browser/components/aboutlogins/content/aboutLogins-html.patch b/src/browser/components/aboutlogins/content/aboutLogins-html.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html
+index d53bc804177d414928dae9a2cb8e42a0a0dae9ac..b5190e9d556ab8b40840214fac15eed17a5fae25 100644
+--- a/browser/components/aboutlogins/content/aboutLogins.html
++++ b/browser/components/aboutlogins/content/aboutLogins.html
+@@ -31,6 +31,7 @@
+     <link rel="stylesheet" href="chrome://browser/content/aboutlogins/aboutLogins.css">
+     <link rel="stylesheet" href="chrome://browser/content/aboutlogins/common.css">
+     <link rel="icon" href="chrome://branding/content/icon32.png">
++    <script src="chrome://browser/content/contentTheme.js"></script>
+   </head>
+   <body>
+     <header>
diff --git a/src/browser/components/aboutlogins/content/aboutLoginsImportReport-html.patch b/src/browser/components/aboutlogins/content/aboutLoginsImportReport-html.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/components/aboutlogins/content/aboutLoginsImportReport.html b/browser/components/aboutlogins/content/aboutLoginsImportReport.html
+index c8a768c7d867464771b2a37e3fb7361e17370a59..2d770c8ad36febd9fc02dadca4ba88caa31c77db 100644
+--- a/browser/components/aboutlogins/content/aboutLoginsImportReport.html
++++ b/browser/components/aboutlogins/content/aboutLoginsImportReport.html
+@@ -19,6 +19,7 @@
+     <link rel="stylesheet" href="chrome://browser/content/aboutlogins/aboutLoginsImportReport.css">
+     <link rel="stylesheet" href="chrome://browser/content/aboutlogins/common.css">
+     <link rel="icon" href="chrome://branding/content/icon32.png">
++    <script src="chrome://browser/content/contentTheme.js"></script>
+   </head>
+   <body class="importreport">
+     <section id="report-body">
diff --git a/src/browser/components/enterprisepolicies/content/aboutPolicies-html.patch b/src/browser/components/enterprisepolicies/content/aboutPolicies-html.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/components/enterprisepolicies/content/aboutPolicies.html b/browser/components/enterprisepolicies/content/aboutPolicies.html
+index 83ae157605f1009588b1d6c87e5eff26a2e5d594..d470b3ab00d87bb43e088290693b7d74d4c354ef 100644
+--- a/browser/components/enterprisepolicies/content/aboutPolicies.html
++++ b/browser/components/enterprisepolicies/content/aboutPolicies.html
+@@ -18,6 +18,7 @@
+         <link rel="localization" href="browser/aboutPolicies.ftl">
+         <link rel="localization" href="browser/policies/policies-descriptions.ftl">
+         <script src="chrome://browser/content/policies/aboutPolicies.js"></script>
++        <script src="chrome://browser/content/contentTheme.js"></script>
+     </head>
+     <body id="body">
+         <div id="categories">
diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
+index 9921e0307b4af54bbb6fa4d85e1a5d1d0fbf07a7..2c5db086f1320d2e334ed2c1988f515dc5cace3c 100644
+--- a/browser/components/preferences/preferences.xhtml
++++ b/browser/components/preferences/preferences.xhtml
+@@ -63,6 +63,7 @@
+   <script src="chrome://browser/content/preferences/preferences.js"/>
+   <script src="chrome://browser/content/preferences/extensionControlled.js"/>
+   <script src="chrome://browser/content/preferences/findInPage.js"/>
++  <script src="chrome://browser/content/contentTheme.js"></script>
+ </head>
+
+ <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/src/browser/components/protections/content/protections-html.patch b/src/browser/components/protections/content/protections-html.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html
+index fd6dfbade23b78282cdb81fb9c9d80b1fa250731..edb12e3472881c709ee71ed88e786495916e576b 100644
+--- a/browser/components/protections/content/protections.html
++++ b/browser/components/protections/content/protections.html
+@@ -19,6 +19,7 @@
+     <link rel="icon" href="chrome://browser/skin/controlcenter/dashboard.svg">
+     <script type="module" src="chrome://browser/content/protections.mjs"></script>
+     <title data-l10n-id="protection-report-webpage-title"></title>
++    <script src="chrome://browser/content/contentTheme.js"></script>
+   </head>
+
+   <body>
diff --git a/src/browser/components/sessionstore/content/aboutSessionRestore-xhtml.patch b/src/browser/components/sessionstore/content/aboutSessionRestore-xhtml.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/components/sessionstore/content/aboutSessionRestore.xhtml b/browser/components/sessionstore/content/aboutSessionRestore.xhtml
+index bb0aff1b9e25cce2c8f9c95d73c5be4f63bbe46f..f8d68e0cbe198ca9010884c2e9add5a640e3013b 100644
+--- a/browser/components/sessionstore/content/aboutSessionRestore.xhtml
++++ b/browser/components/sessionstore/content/aboutSessionRestore.xhtml
+@@ -20,6 +20,7 @@
+     <link rel="localization" href="browser/aboutSessionRestore.ftl"/>
+     <link rel="localization" href="branding/brand.ftl"/>
+     <script src="chrome://browser/content/aboutSessionRestore.js"/>
++    <script src="chrome://browser/content/contentTheme.js"></script>
+   </head>
+
+   <body class="illustrated">
diff --git a/src/browser/components/tabunloader/content/aboutUnloads-html.patch b/src/browser/components/tabunloader/content/aboutUnloads-html.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/components/tabunloader/content/aboutUnloads.html b/browser/components/tabunloader/content/aboutUnloads.html
+index 8d1e846b61cbe16baf4f3d43b4b23502bb6f2be1..34e9395ebb0d8a619f249d463d72839ed6c0490f 100644
+--- a/browser/components/tabunloader/content/aboutUnloads.html
++++ b/browser/components/tabunloader/content/aboutUnloads.html
+@@ -17,6 +17,7 @@
+     <link rel="localization" href="branding/brand.ftl"/>
+     <script src="chrome://browser/content/tabunloader/aboutUnloads.js">
+     </script>
++    <script src="chrome://browser/content/contentTheme.js"></script>
+   </head>
+   <body>
+     <h1 data-l10n-id="about-unloads-page-title"></h1>
diff --git 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..2d07c599152d8b0329f84a6cb626a1a40fdd241d 100644
+index f2fd99193ddd0c24b7ad3ec953216973b162aaed..1810528d3b1d7b5cd2fb3f45548c8377a2f5f165 100644
 --- a/browser/themes/ThemeVariableMap.sys.mjs
 +++ b/browser/themes/ThemeVariableMap.sys.mjs
 @@ -126,7 +126,9 @@ export const ThemeVariableMap = [
@@ -13,3 +13,14 @@ index f2fd99193ddd0c24b7ad3ec953216973b162aaed..2d07c599152d8b0329f84a6cb626a1a4
        processColor(rgbaChannels, element) {
          if (!rgbaChannels) {
            element.removeAttribute("lwt-sidebar");
+@@ -187,4 +189,10 @@ export const ThemeContentPropertyList = [
+   "sidebar_highlight_text",
+   "sidebar_text",
+   "zap_gradient",
++
++  // Pulse
++  "button_primary",
++  "button_primary_hover",
++  "button_primary_active",
++  "button_primary_color",
+ ];
diff --git a/src/browser/themes/addons/dark/manifest-json.patch b/src/browser/themes/addons/dark/manifest-json.patch
@@ -1,13 +1,13 @@
 diff --git a/browser/themes/addons/dark/manifest.json b/browser/themes/addons/dark/manifest.json
-index e14118aa10ac81c35ad4e70217503332b4cba397..eedaad10acebf90030f0deb8a5db1fead05c60e3 100644
+index 3ab1378a042996445ec77c8cad46b0fc44604d70..24cb568177ad3b68ad31785595073287bc06173c 100644
 --- a/browser/themes/addons/dark/manifest.json
 +++ b/browser/themes/addons/dark/manifest.json
-@@ -17,7 +17,7 @@
-   "theme": {
-     "colors": {
-       "tab_background_text": "#fbfbfe",
--      "tab_selected": "rgb(66,65,77)",
-+      "tab_selected": "rgb(43,42,51)",
-       "tab_text": "rgb(251,251,254)",
-       "icons": "rgb(251,251,254)",
-       "frame": "#1c1b22",
+@@ -7,7 +7,7 @@
+     }
+   },
+
+-  "name": "Dark",
++  "name": "Mozilla Dark",
+   "description": "A theme with a dark color scheme.",
+   "author": "Mozilla",
+   "version": "1.2",