diff --git a/.gluon/patchCount b/.gluon/patchCount index b74e882ae..597975b41 100644 --- a/.gluon/patchCount +++ b/.gluon/patchCount @@ -1 +1 @@ -31 \ No newline at end of file +35 \ No newline at end of file diff --git a/src/browser/components/aboutwelcome/actors/AboutWelcomeParent-sys-mjs.patch b/src/browser/components/aboutwelcome/actors/AboutWelcomeParent-sys-mjs.patch new file mode 100644 index 000000000..7e6f6b5db --- /dev/null +++ b/src/browser/components/aboutwelcome/actors/AboutWelcomeParent-sys-mjs.patch @@ -0,0 +1,17 @@ +diff --git a/browser/components/aboutwelcome/actors/AboutWelcomeParent.sys.mjs b/browser/components/aboutwelcome/actors/AboutWelcomeParent.sys.mjs +index 1eb77da0d8f9db02b3afad9d3cdd438cb6f58cd7..25806b026b4da05add168f2f0e556a877d772e1a 100644 +--- a/browser/components/aboutwelcome/actors/AboutWelcomeParent.sys.mjs ++++ b/browser/components/aboutwelcome/actors/AboutWelcomeParent.sys.mjs +@@ -42,9 +42,9 @@ const AWTerminate = { + }; + const LIGHT_WEIGHT_THEMES = { + AUTOMATIC: "default-theme@mozilla.org", +- DARK: "firefox-compact-dark@mozilla.org", +- LIGHT: "firefox-compact-light@mozilla.org", +- ALPENGLOW: "firefox-alpenglow@mozilla.org", ++ DARK: "zen-compact-dark@mozilla.org", ++ LIGHT: "zen-compact-light@mozilla.org", ++ ALPENGLOW: "zen-compact-universe@mozilla.org", + }; + + class AboutWelcomeObserver { diff --git a/src/browser/locales/en-US/browser/appExtensionFields-ftl.patch b/src/browser/locales/en-US/browser/appExtensionFields-ftl.patch new file mode 100644 index 000000000..f5aa15300 --- /dev/null +++ b/src/browser/locales/en-US/browser/appExtensionFields-ftl.patch @@ -0,0 +1,23 @@ +diff --git a/browser/locales/en-US/browser/appExtensionFields.ftl b/browser/locales/en-US/browser/appExtensionFields.ftl +index 09d7a076eccd4235fac66156770d8b9ae01a7d16..a4937b9470fffc187eb521f45362703909ec09b9 100644 +--- a/browser/locales/en-US/browser/appExtensionFields.ftl ++++ b/browser/locales/en-US/browser/appExtensionFields.ftl +@@ -8,14 +8,14 @@ + extension-default-theme-name-auto=System theme — auto + extension-default-theme-description=Follow the operating system setting for buttons, menus, and windows. + +-extension-firefox-compact-light-name=Light ++extension-firefox-compact-light-name=Zen Light + extension-firefox-compact-light-description=A theme with a light color scheme. + +-extension-firefox-compact-dark-name=Dark ++extension-firefox-compact-dark-name=Zen Dark + extension-firefox-compact-dark-description=A theme with a dark color scheme. + +-extension-firefox-alpenglow-name=Firefox Alpenglow +-extension-firefox-alpenglow-description=Use a colorful appearance for buttons, menus, and windows. ++extension-zen-compact-universe-name=Zen Universe ++extension-zen-compact-universe-description=Use a colorful appearance for buttons, menus, and windows. + + ## Colorway Themes + ## These themes are variants of a colorway. The colorway is specified in the diff --git a/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch b/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch new file mode 100644 index 000000000..11673465e --- /dev/null +++ b/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch @@ -0,0 +1,27 @@ +diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs +index 7cfea4b705a1338b1eb5c4f255808aeac4bdb819..58bf9d46222f1032c71a1385109ca4734b777629 100644 +--- a/browser/themes/BuiltInThemeConfig.sys.mjs ++++ b/browser/themes/BuiltInThemeConfig.sys.mjs +@@ -22,19 +22,19 @@ export const BuiltInThemeConfig = new Map([ + [ + "firefox-compact-light@mozilla.org", + { +- version: "1.2", ++ version: "1.3", + path: "resource://builtin-themes/light/", + }, + ], + [ + "firefox-compact-dark@mozilla.org", + { +- version: "1.2", ++ version: "1.3", + path: "resource://builtin-themes/dark/", + }, + ], + [ +- "firefox-alpenglow@mozilla.org", ++ "zen-compact-universe@mozilla.org", + { + version: "1.4", + path: "resource://builtin-themes/alpenglow/", diff --git a/src/browser/themes/addons/alpenglow/manifest-json.patch b/src/browser/themes/addons/alpenglow/manifest-json.patch index 6a54b796b..b08a3f71b 100644 --- a/src/browser/themes/addons/alpenglow/manifest-json.patch +++ b/src/browser/themes/addons/alpenglow/manifest-json.patch @@ -1,5 +1,5 @@ diff --git a/browser/themes/addons/alpenglow/manifest.json b/browser/themes/addons/alpenglow/manifest.json -index 05a25e13915edee3ba51ed1c1b5569faa70cd536..58c3a124156748ec07e828a7a3a969e523383e1d 100644 +index 05a25e13915edee3ba51ed1c1b5569faa70cd536..9f4e2274cfc82abc420ea543e360222305a37585 100644 --- a/browser/themes/addons/alpenglow/manifest.json +++ b/browser/themes/addons/alpenglow/manifest.json @@ -3,137 +3,99 @@ @@ -7,7 +7,7 @@ index 05a25e13915edee3ba51ed1c1b5569faa70cd536..58c3a124156748ec07e828a7a3a969e5 "browser_specific_settings": { "gecko": { - "id": "firefox-alpenglow@mozilla.org" -+ "id": "firefox-compact-light@mozilla.org" ++ "id": "zen-compact-universe@mozilla.org" } }, diff --git a/src/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes-sys-mjs.patch b/src/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes-sys-mjs.patch new file mode 100644 index 000000000..cab472c7e --- /dev/null +++ b/src/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes-sys-mjs.patch @@ -0,0 +1,13 @@ +diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.sys.mjs +index 91c3349ec737aa12518b596f1e6278eb27f0f5ec..15331c3d170acb1b12c7f4a9ac6134e497b31a96 100644 +--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.sys.mjs ++++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.sys.mjs +@@ -42,7 +42,7 @@ export var LightweightThemes = { + selectors: [], + async applyConfig() { + let addon = await AddonManager.getAddonByID( +- "firefox-alpenglow@mozilla.org" ++ "zen-compact-universe@mozilla.org" + ); + await addon.enable(); + },