diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
index 61c5dc174af7..dba5e6063fb9 100644
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -22,8 +22,6 @@ var isDevtools = SimpleTest.harnessParameters.subsuite == "devtools";
// If you need to whitelist specific files, please use the 'whitelist' object.
var gExceptionPaths = [
"chrome://browser/content/defaultthemes/",
- "resource://app/modules/themes/alpenglow/",
- "resource://gre/modules/themes/alpenglow/",
"resource://app/defaults/settings/blocklists/",
"resource://app/defaults/settings/security-state/",
"resource://app/defaults/settings/main/",
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index fc78cde15bb2..84f0ce187991 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -1306,11 +1306,6 @@ BrowserGlue.prototype = {
"1.0",
"resource:///modules/themes/dark/"
);
- AddonManager.maybeInstallBuiltinAddon(
- "firefox-alpenglow@mozilla.org",
- "1.0",
- "resource:///modules/themes/alpenglow/"
- );
if (AppConstants.MOZ_NORMANDY) {
Normandy.init();
diff --git a/browser/components/customizableui/CustomizeMode.jsm b/browser/components/customizableui/CustomizeMode.jsm
index 8e708ceb3d9c..5a7e9d58e74f 100644
--- a/browser/components/customizableui/CustomizeMode.jsm
+++ b/browser/components/customizableui/CustomizeMode.jsm
@@ -1465,7 +1465,6 @@ CustomizeMode.prototype = {
const DEFAULT_THEME_ID = "default-theme@mozilla.org";
const LIGHT_THEME_ID = "firefox-compact-light@mozilla.org";
const DARK_THEME_ID = "firefox-compact-dark@mozilla.org";
- const ALPENGLOW_THEME_ID = "firefox-alpenglow@mozilla.org";
const MAX_THEME_COUNT = 6;
this._clearThemesMenu(aEvent.target);
@@ -1510,7 +1509,6 @@ CustomizeMode.prototype = {
DEFAULT_THEME_ID,
LIGHT_THEME_ID,
DARK_THEME_ID,
- ALPENGLOW_THEME_ID,
]);
if (currentTheme) {
importantThemes.add(currentTheme.id);
diff --git a/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js b/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js
index fe975a9ed3ec..89c4bb0e783f 100644
--- a/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js
+++ b/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js
@@ -75,9 +75,9 @@ add_task(async function() {
is(
header.nextElementSibling.nextElementSibling.nextElementSibling
- .nextElementSibling.nextElementSibling,
+ .nextElementSibling,
footer,
- "There should only be four themes (default, light, dark, alpenglow) in the 'My Themes' section by default"
+ "There should only be three themes (default, light, dark) in the 'My Themes' section by default"
);
is(
header.nextElementSibling.theme.id,
diff --git a/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm b/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm
index 2e23e26e738e..76b4ccb65cc9 100644
--- a/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm
+++ b/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm
@@ -47,7 +47,6 @@ const LIGHT_WEIGHT_THEMES = {
DARK: "firefox-compact-dark@mozilla.org",
LIGHT: "firefox-compact-light@mozilla.org",
AUTOMATIC: "default-theme@mozilla.org",
- ALPENGLOW: "firefox-alpenglow@mozilla.org",
};
async function getImportableSites() {
diff --git a/browser/components/newtab/aboutwelcome/content/aboutwelcome.bundle.js b/browser/components/newtab/aboutwelcome/content/aboutwelcome.bundle.js
index f8357e0d0c98..b7d7bd76ff5a 100644
--- a/browser/components/newtab/aboutwelcome/content/aboutwelcome.bundle.js
+++ b/browser/components/newtab/aboutwelcome/content/aboutwelcome.bundle.js
@@ -923,14 +923,6 @@ const DEFAULT_WELCOME_CONTENT = {
tooltip: {
string_id: "onboarding-multistage-theme-tooltip-dark"
}
- }, {
- theme: "alpenglow",
- label: {
- string_id: "onboarding-multistage-theme-label-alpenglow"
- },
- tooltip: {
- string_id: "onboarding-multistage-theme-tooltip-alpenglow"
- }
}]
},
primary_button: {
diff --git a/browser/components/newtab/aboutwelcome/content/aboutwelcome.css b/browser/components/newtab/aboutwelcome/content/aboutwelcome.css
index 9f124227b6e5..bd44891b2a3c 100644
--- a/browser/components/newtab/aboutwelcome/content/aboutwelcome.css
+++ b/browser/components/newtab/aboutwelcome/content/aboutwelcome.css
@@ -335,7 +335,7 @@ body {
.multistageContainer .tiles-theme-section {
display: grid;
grid-gap: 21px;
- grid-template-columns: repeat(4, auto);
+ grid-template-columns: repeat(3, auto);
/* --newtab-background-color-1 will be invisible, but it's necessary to
* keep the content from jumping around when it gets focus-within and
* does sprout a dotted border. This way it keeps a 1 pixel wide border
@@ -371,8 +371,6 @@ body {
background-image: url("chrome://mozapps/content/extensions/firefox-compact-dark.svg"); }
.multistageContainer .tiles-theme-section .theme .icon.automatic {
background-image: url("chrome://mozapps/content/extensions/default-theme.svg"); }
- .multistageContainer .tiles-theme-section .theme .icon.alpenglow {
- background-image: url("chrome://mozapps/content/extensions/firefox-alpenglow.svg"); }
.multistageContainer .tiles-theme-section .theme .text {
display: flex;
font-size: 14px;
diff --git a/browser/components/newtab/content-src/aboutwelcome/aboutwelcome.scss b/browser/components/newtab/content-src/aboutwelcome/aboutwelcome.scss
index a13a9d5754ea..7ea7d107755e 100644
--- a/browser/components/newtab/content-src/aboutwelcome/aboutwelcome.scss
+++ b/browser/components/newtab/content-src/aboutwelcome/aboutwelcome.scss
@@ -345,7 +345,7 @@ body {
.tiles-theme-section {
display: grid;
grid-gap: 21px;
- grid-template-columns: repeat(4, auto);
+ grid-template-columns: repeat(3, auto);
/* --newtab-background-color-1 will be invisible, but it's necessary to
* keep the content from jumping around when it gets focus-within and
@@ -397,10 +397,6 @@ body {
&.automatic {
background-image: url('chrome://mozapps/content/extensions/default-theme.svg');
}
-
- &.alpenglow {
- background-image: url('chrome://mozapps/content/extensions/firefox-alpenglow.svg');
- }
}
.text {
diff --git a/browser/components/newtab/content-src/lib/aboutwelcome-utils.js b/browser/components/newtab/content-src/lib/aboutwelcome-utils.js
index ca50f4e44512..14b756328b02 100644
--- a/browser/components/newtab/content-src/lib/aboutwelcome-utils.js
+++ b/browser/components/newtab/content-src/lib/aboutwelcome-utils.js
@@ -159,15 +159,6 @@ export const DEFAULT_WELCOME_CONTENT = {
string_id: "onboarding-multistage-theme-tooltip-dark",
},
},
- {
- theme: "alpenglow",
- label: {
- string_id: "onboarding-multistage-theme-label-alpenglow",
- },
- tooltip: {
- string_id: "onboarding-multistage-theme-tooltip-alpenglow",
- },
- },
],
},
primary_button: {
diff --git a/browser/locales/en-US/chrome/browser/app-extension-fields.properties b/browser/locales/en-US/chrome/browser/app-extension-fields.properties
index e13a7d847b2d..779de2d3823d 100644
--- a/browser/locales/en-US/chrome/browser/app-extension-fields.properties
+++ b/browser/locales/en-US/chrome/browser/app-extension-fields.properties
@@ -10,6 +10,3 @@ extension.firefox-compact-light@mozilla.org.description=A theme with a light col
extension.firefox-compact-dark@mozilla.org.name=Dark
extension.firefox-compact-dark@mozilla.org.description=A theme with a dark color scheme.
-# LOCALIZATION NOTE (extension.firefox-alpenglow@mozilla.org.name): This is displayed in about:addons -> Appearance
-extension.firefox-alpenglow@mozilla.org.name=Firefox Alpenglow
-extension.firefox-alpenglow@mozilla.org.description=Use a colorful appearance for buttons, menus, and windows.
diff --git a/browser/themes/addons/alpenglow/background-gradient-dark.svg b/browser/themes/addons/alpenglow/background-gradient-dark.svg
deleted file mode 100644
index a5d0e49ea1c9..000000000000
--- a/browser/themes/addons/alpenglow/background-gradient-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/background-gradient.svg b/browser/themes/addons/alpenglow/background-gradient.svg
deleted file mode 100644
index eeaf9b942e72..000000000000
--- a/browser/themes/addons/alpenglow/background-gradient.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/background-noodles-left-dark.svg b/browser/themes/addons/alpenglow/background-noodles-left-dark.svg
deleted file mode 100644
index 6b477a44e19d..000000000000
--- a/browser/themes/addons/alpenglow/background-noodles-left-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/background-noodles-left.svg b/browser/themes/addons/alpenglow/background-noodles-left.svg
deleted file mode 100644
index 873d8331b30e..000000000000
--- a/browser/themes/addons/alpenglow/background-noodles-left.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/background-noodles-right-dark.svg b/browser/themes/addons/alpenglow/background-noodles-right-dark.svg
deleted file mode 100644
index 181c131ef1ff..000000000000
--- a/browser/themes/addons/alpenglow/background-noodles-right-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/background-noodles-right.svg b/browser/themes/addons/alpenglow/background-noodles-right.svg
deleted file mode 100644
index bf3066f34f66..000000000000
--- a/browser/themes/addons/alpenglow/background-noodles-right.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/icon.svg b/browser/themes/addons/alpenglow/icon.svg
deleted file mode 100644
index 2fb1e26d5de3..000000000000
--- a/browser/themes/addons/alpenglow/icon.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/manifest.json b/browser/themes/addons/alpenglow/manifest.json
deleted file mode 100644
index cb4afd17208a..000000000000
--- a/browser/themes/addons/alpenglow/manifest.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
- "manifest_version": 2,
-
- "applications": {
- "gecko": {
- "id": "firefox-alpenglow@mozilla.org"
- }
- },
-
- "name": "Firefox Alpenglow",
- "description": "Use a colorful appearance for buttons, menus, and windows.",
- "version": "1.0",
- "icons": { "32": "icon.svg" },
-
- "theme": {
- "images": {
- "additional_backgrounds": [
- "background-noodles-right.svg",
- "background-noodles-left.svg",
- "background-gradient.svg"
- ]
- },
-
- "properties": {
- "additional_backgrounds_alignment": [
- "right top",
- "left top",
- "right top"
- ],
- "additional_backgrounds_tiling": ["no-repeat", "no-repeat", "repeat-x"]
- },
- "colors": {
- "frame": "hsla(240, 20%, 98%, 1)",
- "toolbar": "hsla(0, 0%, 100%, .76)",
- "button_background_active": "hsla(240, 26%, 11%, .16)",
- "button_background_hover": "hsla(240, 26%, 11%, .08)",
- "icons": "hsla(258, 66%, 48%, 1)",
- "icons_attention": "hsla(180, 100%, 32%, 1)",
- "toolbar_text": "hsla(261, 53%, 15%, 1)",
- "toolbar_vertical_separator": "hsla(261, 53%, 15%, .08)",
- "toolbar_field": "hsla(0, 0%, 100%, .8)",
- "toolbar_field_focus": "hsla(261, 53%, 15%, .96)",
- "toolbar_field_text": "hsla(261, 53%, 15%, 1)",
- "toolbar_field_text_focus": "hsla(255, 100%, 94%, 1)",
- "toolbar_field_border": "hsla(261, 53%, 15%, .32)",
- "toolbar_field_border_focus": "hsla(265, 100%, 72%, 1)",
- "toolbar_field_highlight": "hsla(265, 100%, 72%, .32)",
- "toolbar_field_separator": "hsla(261, 53%, 15%, .32)",
- "toolbar_top_separator": "hsla(261, 53%, 15%, 1)",
- "toolbar_bottom_separator": "hsla(261, 53%, 15%, .32)",
- "bookmark_text": "hsla(261, 53%, 15%, 1)",
- "tab_text": "hsla(261, 53%, 15%, 1)",
- "tab_background_text": "hsla(261, 53%, 15%, 1)",
- "tab_background_separator": "hsla(261, 53%, 15%, 1)",
- "tab_line": "hsla(265, 100%, 72%, 1)",
- "tab_loading": "hsla(265, 100%, 72%, 1)",
- "ntp_background": "hsla(0, 0%, 100%, 1)",
- "ntp_text": "hsla(261, 53%, 15%, 1)",
- "popup": "hsla(254, 46%, 21%, 1)",
- "popup_text": "hsla(255, 100%, 94%, 1)",
- "popup_border": "hsla(255, 100%, 94%, .32)",
- "popup_highlight": "hsla(255, 100%, 94%, .12)",
- "sidebar": "hsla(240, 15%, 95%, 1)",
- "sidebar_text": "hsla(261, 53%, 15%, 1)",
- "sidebar_border": "hsla(261, 53%, 15%, .24)",
- "sidebar_highlight": "hsla(265, 100%, 72%, 1)",
- "sidebar_highlight_text": "hsla(0, 0%, 100%, 1)"
- }
- },
- "dark_theme": {
- "images": {
- "additional_backgrounds": [
- "background-noodles-right-dark.svg",
- "background-noodles-left-dark.svg",
- "background-gradient-dark.svg"
- ]
- },
-
- "properties": {
- "additional_backgrounds_alignment": [
- "right top",
- "left top",
- "right top"
- ],
- "additional_backgrounds_tiling": ["no-repeat", "no-repeat", "repeat-x"]
- },
- "colors": {
- "frame": "hsla(240, 20%, 98%, 1)",
- "toolbar": "hsla(254, 46%, 21%, .96)",
- "button_background_active": "hsla(255, 100%, 94%, .24)",
- "button_background_hover": "hsla(255, 100%, 94%, .12)",
- "icons": "hsla(271, 100%, 77%, 1)",
- "icons_attention": "hsla(157, 100%, 66%, 1)",
- "toolbar_text": "hsla(255, 100%, 94%, 1)",
- "toolbar_vertical_separator": "hsla(261, 53%, 15%, .08)",
- "toolbar_field": "hsla(250, 43%, 25%, 1)",
- "toolbar_field_focus": "hsla(250, 43%, 25%, .98)",
- "toolbar_field_text": "hsla(255, 100%, 94%, 1)",
- "toolbar_field_text_focus": "hsla(255, 100%, 94%, 1)",
- "toolbar_field_border": "hsla(255, 100%, 94%, .32)",
- "toolbar_field_border_focus": "hsla(265, 100%, 72%, 1)",
- "toolbar_field_highlight": "hsla(265, 100%, 72%, .32)",
- "toolbar_field_separator": "hsla(261, 53%, 15%, .32)",
- "toolbar_top_separator": "hsla(255, 100%, 94%, .32)",
- "toolbar_bottom_separator": "hsla(245, 38%, 33%, .96)",
- "bookmark_text": "hsla(255, 100%, 94%, 1)",
- "tab_text": "hsla(255, 100%, 94%, 1)",
- "tab_background_text": "hsla(255, 100%, 94%, 1)",
- "tab_background_separator": "hsla(255, 100%, 94%, 1)",
- "tab_line": "hsla(265, 100%, 72%, 1)",
- "tab_loading": "hsla(265, 100%, 72%, 1)",
- "ntp_background": "hsla(254, 46%, 21%, .96)",
- "ntp_text": "hsla(255, 100%, 94%, 1)",
- "popup": "hsla(250, 43%, 25%, 1)",
- "popup_text": "hsla(255, 100%, 94%, 1)",
- "popup_border": "hsla(255, 100%, 94%, .32)",
- "popup_highlight": "hsla(255, 100%, 94%, .12)",
- "sidebar": "hsla(250, 43%, 25%, 1)",
- "sidebar_text": "hsla(255, 100%, 94%, 1)",
- "sidebar_border": "hsla(255, 100%, 94%, .24)",
- "sidebar_highlight": "hsla(259, 76%, 58%, 1)",
- "sidebar_highlight_text": "hsla(0, 0%, 100%, 1)"
- }
- }
-}
diff --git a/browser/themes/addons/alpenglow/moz.build b/browser/themes/addons/alpenglow/moz.build
deleted file mode 100644
index f4a441f2100a..000000000000
--- a/browser/themes/addons/alpenglow/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-EXTRA_JS_MODULES.themes['alpenglow'] += [
- '*.svg',
- 'manifest.json',
-]
-
diff --git a/browser/themes/moz.build b/browser/themes/moz.build
index dd8a745796af..96f5fabe71f1 100644
--- a/browser/themes/moz.build
+++ b/browser/themes/moz.build
@@ -17,7 +17,6 @@ else:
DIRS += ['windows']
DIRS += [
- 'addons/alpenglow',
'addons/dark',
'addons/light',
]
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm
index bb01f0b44406..796da8b811dd 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm
@@ -43,15 +43,5 @@ var LightweightThemes = {
await addon.enable();
},
},
-
- alpenGlow: {
- selectors: [],
- async applyConfig() {
- let addon = await AddonManager.getAddonByID(
- "firefox-alpenglow@mozilla.org"
- );
- await addon.enable();
- },
- },
},
};
diff --git a/toolkit/components/extensions/test/browser/browser_ext_management_themes.js b/toolkit/components/extensions/test/browser/browser_ext_management_themes.js
index f74f418acebe..a7276fce4aed 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_management_themes.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_management_themes.js
@@ -57,8 +57,8 @@ add_task(async function test_management_themes() {
async function getAddon(type) {
let addons = await browser.management.getAll();
let themes = addons.filter(addon => addon.type === "theme");
- // We get the 4 built-in themes plus the lwt and our addon.
- browser.test.assertEq(5, themes.length, "got expected addons");
+ // We get the 3 built-in themes plus the lwt and our addon.
+ browser.test.assertEq(4, themes.length, "got expected addons");
// We should also get our test extension.
let testExtension = addons.find(addon => {
return addon.id === TEST_ID;
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.js b/toolkit/mozapps/extensions/content/aboutaddons.js
index 0bd952f084f9..168bb68dd0e0 100644
--- a/toolkit/mozapps/extensions/content/aboutaddons.js
+++ b/toolkit/mozapps/extensions/content/aboutaddons.js
@@ -97,10 +97,6 @@ const BUILTIN_THEME_PREVIEWS = new Map([
"firefox-compact-dark@mozilla.org",
"chrome://mozapps/content/extensions/firefox-compact-dark.svg",
],
- [
- "firefox-alpenglow@mozilla.org",
- "chrome://mozapps/content/extensions/firefox-alpenglow.svg",
- ],
]);
const PERMISSION_MASKS = {
diff --git a/toolkit/mozapps/extensions/content/firefox-alpenglow.svg b/toolkit/mozapps/extensions/content/firefox-alpenglow.svg
deleted file mode 100644
index 9293421e9497..000000000000
--- a/toolkit/mozapps/extensions/content/firefox-alpenglow.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toolkit/mozapps/extensions/jar.mn b/toolkit/mozapps/extensions/jar.mn
index 26e8bf76fd84..89702c5df8f7 100644
--- a/toolkit/mozapps/extensions/jar.mn
+++ b/toolkit/mozapps/extensions/jar.mn
@@ -24,7 +24,6 @@ toolkit.jar:
content/mozapps/extensions/drag-drop-addon-installer.js (content/drag-drop-addon-installer.js)
content/mozapps/extensions/firefox-compact-dark.svg (content/firefox-compact-dark.svg)
content/mozapps/extensions/firefox-compact-light.svg (content/firefox-compact-light.svg)
- content/mozapps/extensions/firefox-alpenglow.svg (content/firefox-alpenglow.svg)
content/mozapps/extensions/message-bar.css (content/message-bar.css)
content/mozapps/extensions/message-bar.js (content/message-bar.js)
content/mozapps/extensions/named-deck.js (content/named-deck.js)