Backed out changeset 2f4bf8bab6cf (bug 1643776) for causing bug 1660323. CLOSED TREE

2020-08-21 04:34:24 +03:00 · 2020-08-21 04:34:24 +03:00 · 15cd0824da
--- 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/",
--- 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();
--- 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);
--- 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,
--- 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() {
--- 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: {
--- 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;
--- 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 {
--- 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: {
--- 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.
--- a/browser/themes/addons/alpenglow/background-gradient-dark.svg
+++ b/browser/themes/addons/alpenglow/background-gradient-dark.svg
@ -1,4 +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/. -->
-<svg width="72" height="128" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="50%" y1="0%" x2="50%" y2="50%" id="a"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#291D4F" offset="100%"/></linearGradient></defs><path fill="url(#a)" d="M0 0h72v128H0z" fill-rule="evenodd"/></svg>
--- a/browser/themes/addons/alpenglow/background-gradient.svg
+++ b/browser/themes/addons/alpenglow/background-gradient.svg
@ -1,4 +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/. -->
-<svg width="72" height="128" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="50%" y1="-18.096%" x2="50%" y2="50%" id="a"><stop stop-color="#FF6BBA" offset="0%"/><stop stop-color="#FFC999" offset="100%"/></linearGradient></defs><path fill="url(#a)" d="M0 0h72v128H0z" fill-rule="evenodd"/></svg>
--- a/browser/themes/addons/alpenglow/background-noodles-left-dark.svg
+++ b/browser/themes/addons/alpenglow/background-noodles-left-dark.svg
@ -1,4 +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/. -->
-<svg width="160" height="128" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="50%" y1="18%" x2="79.211%" y2="27.519%" id="c"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#20123A" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="50%" y1="0%" x2="64.766%" y2="75.109%" id="d"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#321C64" offset="100%"/></linearGradient><linearGradient x1="40.353%" y1="-6.305%" x2="125.167%" y2="120.857%" id="e"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#5F2ECA" offset="64.418%"/><stop stop-color="#7542E5" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="32.861%" y1="-6.728%" x2="79.91%" y2="128.478%" id="f"><stop stop-color="#2B1753" offset="0%"/><stop stop-color="#7033CA" offset="35.304%"/><stop stop-color="#FF4AD9" offset="73.362%"/><stop stop-color="#FF778E" offset="100%"/><stop stop-color="#FF778E" offset="100%"/></linearGradient><linearGradient x1="51.349%" y1="102.377%" x2="35.979%" y2="-21.792%" id="g"><stop stop-color="#FC4CA0" offset="0%"/><stop stop-color="#FFA769" offset="100%"/></linearGradient><linearGradient x1="0%" y1="0%" x2="0%" y2="100%" id="a"><stop stop-color="#fff" offset="60%"/><stop stop-color="#fff" stop-opacity="0" offset="100%"/></linearGradient><mask id="b" x="0" y="0" width="100%" height="100%"><rect width="100%" height="100%" fill="url(#a)"/></mask></defs><g mask="url(#b)"><path fill="url(#c)" d="M0 0h160v128H0z"/><path d="M72.032 0C104.133 9.442 128 44.983 128 87.385c0 14.616-2.836 28.417-7.867 40.615H.002L0 28.31C9.805 14.494 22.991 4.406 37.97 0h34.062z" fill="url(#d)"/><path d="M70.898 0C92.498 15.603 107 44.486 107 77.538c0 18.707-4.645 36.078-12.594 50.462L0 127.998V.003L70.898 0z" fill="url(#e)"/><path d="M42.2 0l47.062 66.707C101.74 84.395 102.074 109.96 91.14 128H27.324L0 89.27V0h42.2z" fill="url(#f)"/><path d="M24.863 64.883l2.182 2.963C40.32 85.206 48.63 106.15 52 128H0V0c2.255 23.505 10.625 46.336 24.863 64.883z" fill="url(#g)"/></g></svg>
--- a/browser/themes/addons/alpenglow/background-noodles-left.svg
+++ b/browser/themes/addons/alpenglow/background-noodles-left.svg
@ -1,4 +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/. -->
-<svg width="160" height="128" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="50%" y1="18%" x2="79.211%" y2="27.519%" id="c"><stop stop-color="#FC56A1" offset="0%"/><stop stop-color="#FC56A1" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="57.599%" y1="0%" x2="104.73%" y2="26.341%" id="d"><stop stop-color="#FC4CA0" offset="0%"/><stop stop-color="#FFA769" offset="100%"/></linearGradient><linearGradient x1="35.352%" y1="-6.259%" x2="83.594%" y2="30.934%" id="e"><stop stop-color="#4E27A4" offset="0%"/><stop stop-color="#8B4EE5" offset="33.739%"/><stop stop-color="#FF4AD9" offset="73.362%"/><stop stop-color="#FF778E" offset="100%"/><stop stop-color="#FF778E" offset="100%"/></linearGradient><linearGradient x1="4.648%" y1="-11.301%" x2="96.913%" y2="88.852%" id="f"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#5F2ECA" offset="51.449%"/><stop stop-color="#7542E5" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="0%" y1="0%" x2="0%" y2="100%" id="a"><stop stop-color="#fff" offset="60%"/><stop stop-color="#fff" stop-opacity="0" offset="100%"/></linearGradient><mask id="b" x="0" y="0" width="100%" height="100%"><rect width="100%" height="100%" fill="url(#a)"/></mask></defs><g mask="url(#b)"><path fill="url(#c)" d="M0 0h160v128H0z"/><path d="M72.032 0C104.133 9.442 128 44.983 128 87.385c0 14.616-2.836 28.417-7.867 40.615H.002L0 28.31C9.805 14.494 22.991 4.406 37.97 0h34.062z" fill="url(#d)"/><path d="M70.898 0C92.498 15.603 107 44.486 107 77.538c0 18.707-4.645 36.078-12.594 50.462L0 127.998V.003L70.898 0z" fill="url(#e)"/><path d="M42.2 0l47.062 66.707C101.74 84.395 102.074 109.96 91.14 128H27.324L0 89.27V0h42.2z" fill="url(#f)"/><path d="M30.863 64.883l2.182 2.963C46.32 85.206 54.63 106.15 58 128H0V0h6.164c2.255 23.505 10.461 46.336 24.699 64.883z" fill="#20123A"/></g></svg>
--- a/browser/themes/addons/alpenglow/background-noodles-right-dark.svg
+++ b/browser/themes/addons/alpenglow/background-noodles-right-dark.svg
@ -1,4 +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/. -->
-<svg width="160" height="128" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="40.05%" y1="62.116%" x2="89.619%" y2="54.654%" id="a"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#20123A" stop-opacity="0" offset="100%"/><stop stop-color="#20123A" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="56.717%" y1="13.312%" x2="61.313%" y2="106.223%" id="c"><stop stop-color="#321C64" offset="0%"/><stop stop-color="#20123A" offset="100%"/></linearGradient><linearGradient x1="54.131%" y1="103.324%" x2="89.536%" y2="-63.876%" id="d"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#5F2ECA" offset="64.418%"/><stop stop-color="#7542E5" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="52.541%" y1="106.999%" x2="57.74%" y2="-26.862%" id="e"><stop stop-color="#2B1753" offset="0%"/><stop stop-color="#7033CA" offset="36.937%"/><stop stop-color="#FF4AD9" offset="73.362%"/><stop stop-color="#FF778E" offset="100%"/><stop stop-color="#FF778E" offset="100%"/></linearGradient><linearGradient x1="58.794%" y1="0%" x2="-74.439%" y2="-16.628%" id="f"><stop stop-color="#FC4CA0" offset="0%"/><stop stop-color="#FFA769" offset="100%"/></linearGradient><filter x="0%" y="0%" width="100%" height="100%" filterUnits="objectBoundingBox" id="b"><feGaussianBlur in="SourceGraphic"/></filter></defs><g fill="none" fill-rule="evenodd"><path fill="url(#a)" filter="url(#b)" transform="rotate(180 80 64)" d="M0 0h160v128H0z"/><path d="M58.473 0C110.866 11.618 151.937 63.151 160 128H32V.002L58.473 0z" fill="url(#c)" transform="rotate(180 96 64)"/><path d="M80.504 0c44.34 18.223 76.82 68.234 79.496 127.998L77 128V.003L80.504 0z" fill="url(#d)" transform="rotate(180 118.5 64)"/><path d="M116.57 8.47l.346.861 40.43 103.36A51.41 51.41 0 0 1 160 122h-48V0c1.75 2.54 3.29 5.37 4.57 8.47z" fill="url(#e)" transform="rotate(180 136 61)"/><path d="M160 28h-14.998L145 0c3.895 9.971 8.903 19.403 15 28z" fill="url(#f)" transform="rotate(180 152.5 14)"/></g></svg>
--- a/browser/themes/addons/alpenglow/background-noodles-right.svg
+++ b/browser/themes/addons/alpenglow/background-noodles-right.svg
@ -1,4 +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/. -->
-<svg width="160" height="128" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient x1="72.679%" y1="74.956%" x2="92.668%" y2="65.875%" id="a"><stop stop-color="#FE82A4" offset="0%"/><stop stop-color="#FE7FA3" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="33.047%" y1="50%" x2="78.982%" y2="8.847%" id="b"><stop stop-color="#FC4CA0" offset="0%"/><stop stop-color="#FFA769" offset="100%"/></linearGradient><linearGradient x1="52.637%" y1="100%" x2="70.098%" y2="10.831%" id="c"><stop stop-color="#7542E5" offset="0%"/><stop stop-color="#8B4EE5" offset="15.134%"/><stop stop-color="#FF4AA2" offset="62.209%"/><stop stop-color="#FF778E" offset="100%"/><stop stop-color="#FF778E" offset="100%"/></linearGradient><linearGradient x1="42.26%" y1="100%" x2="53.452%" y2="68.585%" id="e"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#20123A" stop-opacity="0" offset="100%"/><stop stop-color="#20123A" stop-opacity="0" offset="100%"/><stop stop-color="#20123A" stop-opacity="0" offset="100%"/></linearGradient><path d="M116.57 8.47l.346.861 40.43 103.36A51.41 51.41 0 0 1 160 122h-48V0c1.75 2.54 3.29 5.37 4.57 8.47z" id="d"/></defs><g fill="none" fill-rule="evenodd"><path fill="url(#a)" transform="rotate(180 80 64)" d="M0 0h160v128H0z"/><path d="M58.473 0C110.866 11.618 151.937 63.151 160 128H32V.002L58.473 0z" fill="url(#b)" transform="rotate(180 96 64)"/><path d="M80.504 0c44.34 18.223 76.82 68.234 79.496 127.998L77 128V.003L80.504 0z" fill="url(#c)" transform="rotate(180 118.5 64)"/><g transform="rotate(180 136 61)"><use fill="#7542E5" xlink:href="#d"/><use fill="url(#e)" xlink:href="#d"/></g><path d="M145 0h14.998L160 28c-3.895-9.971-8.903-19.403-15-28z" fill="#20123A"/></g></svg>
--- a/browser/themes/addons/alpenglow/icon.svg
+++ b/browser/themes/addons/alpenglow/icon.svg
@ -1,4 +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/. -->
-<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32"><defs><linearGradient id="a" x1="-102.26" y1="165.14" x2="-102.26" y2="164.98" gradientTransform="matrix(160 0 0 -128 16377 21140)" gradientUnits="userSpaceOnUse"><stop offset=".6" stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="b" x1="-101.35" y1="165.18" x2="-101.35" y2="165.03" gradientTransform="matrix(72 0 0 -128 7313 21140)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff6bba"/><stop offset="1" stop-color="#ffc999"/></linearGradient><linearGradient id="d" x1="-102.28" y1="165.06" x2="-102.23" y2="165.05" gradientTransform="matrix(160 0 0 -128 16377 21140)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fc56a1"/><stop offset="1" stop-color="#fc56a1" stop-opacity="0"/></linearGradient><linearGradient id="e" x1="-102.13" y1="165.06" x2="-102.05" y2="165.01" gradientTransform="matrix(128 0 0 -128 13081 21140)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fc4ca0"/><stop offset="1" stop-color="#ffa769"/></linearGradient><linearGradient id="f" x1="-102.01" y1="165.09" x2="-101.93" y2="165.03" gradientTransform="matrix(107 0 0 -128 10918 21140)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4e27a4"/><stop offset=".34" stop-color="#8b4ee5"/><stop offset=".73" stop-color="#ff4ad9"/><stop offset="1" stop-color="#ff778e"/></linearGradient><linearGradient id="g" x1="-101.95" y1="165.14" x2="-101.8" y2="164.97" gradientTransform="matrix(99 0 0 -128 10094.01 21140)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#20123a"/><stop offset=".51" stop-color="#5f2eca"/><stop offset="1" stop-color="#7542e5" stop-opacity="0"/></linearGradient><mask id="c" x="2" y="2" width="26.73" height="21" maskUnits="userSpaceOnUse"><path fill="url(#a)" d="M2 2h26.73v21H2z"/></mask></defs><path d="M2 2h28v28H2z" fill-rule="evenodd" fill="url(#b)"/><g mask="url(#c)"><path d="M2 2h26.73v21H2z" fill="url(#d)"/><path d="M14 2c5.36 1.55 9.35 7.38 9.35 14.34A17.23 17.23 0 0 1 22.07 23H2V6.64A12.08 12.08 0 0 1 8.34 2z" fill="url(#e)"/><path d="M13.84 2c3.61 2.56 6 7.3 6 12.72A16.88 16.88 0 0 1 17.77 23H2V2z" fill="url(#f)"/><path d="M9.05 2l7.86 10.94A9.35 9.35 0 0 1 17.22 23H6.56L2 16.65V2z" fill="url(#g)"/><path d="M7.16 12.64l.36.49A21.45 21.45 0 0 1 11.69 23H2V2h1a20.5 20.5 0 0 0 4.16 10.64z" fill="#20123a"/></g><path fill="#fff" fill-opacity=".76" d="M16 2v13H2v15h28V2H16z"/><rect x="1" y="1" width="30" height="30" rx="2" fill="none" stroke="#08091a" stroke-opacity=".35" stroke-width="2"/><circle cx="9.5" cy="22.5" r="6" fill="#fff" fill-opacity=".8" stroke="#b7a1aa"/><path d="M12.5 22H7.71l2.14-2.15a.49.49 0 0 0-.7-.7l-3 3a.36.36 0 0 0-.11.16.5.5 0 0 0 0 .38.36.36 0 0 0 .11.16l3 3a.48.48 0 0 0 .7 0 .48.48 0 0 0 0-.7L7.71 23h4.79a.5.5 0 0 0 0-1zm8-2h4a.5.5 0 0 0 0-1h-4a.5.5 0 0 0 0 1zm4 2h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1zm0 3h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1z" fill="#5a2acb"/><path fill="#ac70ff" d="M16 2h14v1H16z"/><path d="M26.35 8.65l-3.5-3.5a.48.48 0 0 0-.7 0l-3.5 3.5a.49.49 0 0 0 .7.7l.65-.64v2.79a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5V8.71l.65.64a.48.48 0 0 0 .7 0 .48.48 0 0 0 0-.7zM24 11h-1V9h-1v2h-1V7.71l1.5-1.5 1.5 1.5z" fill="#5a2acb"/><path fill="#20123b" d="M15 2v12H2v1h14V2h-1z"/></svg>
--- a/browser/themes/addons/alpenglow/manifest.json
+++ b/browser/themes/addons/alpenglow/manifest.json
@ -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)"
-    }
-  }
-}
--- a/browser/themes/addons/alpenglow/moz.build
+++ b/browser/themes/addons/alpenglow/moz.build
@ -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',
-]
-
--- a/browser/themes/moz.build
+++ b/browser/themes/moz.build
@ -17,7 +17,6 @@ else:
    DIRS += ['windows']

 DIRS += [
-    'addons/alpenglow',
    'addons/dark',
    'addons/light',
 ]
--- 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();
-      },
-    },
  },
 };
--- 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;
--- 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 = {
--- a/toolkit/mozapps/extensions/content/firefox-alpenglow.svg
+++ b/toolkit/mozapps/extensions/content/firefox-alpenglow.svg
@ -1,4 +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/. -->
-<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="664" height="90"><defs><linearGradient id="b" x1="324.11" y1="53.56" x2="324.11" y2="52.83" gradientTransform="matrix(72 0 0 -128 -23004 6821)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff6bba"/><stop offset="1" stop-color="#ffc999"/></linearGradient><linearGradient id="c" x1="579.97" y1="46.46" x2="524.59" y2="66.59" gradientUnits="userSpaceOnUse"><stop offset=".27" stop-color="#fe82a4"/><stop offset="1" stop-color="#fe7fa3" stop-opacity="0"/></linearGradient><linearGradient id="a" x1="602.6" y1="42.67" x2="543.8" y2="95.35" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fc4ca0"/><stop offset="1" stop-color="#ffa769"/></linearGradient><linearGradient id="d" x1="627.55" y1="5.24" x2="616.47" y2="92.5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7542e5"/><stop offset=".15" stop-color="#8b4ee5"/><stop offset=".62" stop-color="#ff4aa2"/><stop offset="1" stop-color="#ff778e"/></linearGradient><linearGradient id="e" x1="644.75" y1="11.14" x2="640.27" y2="43.06" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#20123a"/><stop offset="1" stop-color="#20123a" stop-opacity="0"/></linearGradient><linearGradient id="f" x1="322.39" y1="52.97" x2="322.66" y2="52.88" gradientTransform="matrix(160 0 0 -128 -51516 6821)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fc56a1"/><stop offset="1" stop-color="#fc56a1" stop-opacity="0"/></linearGradient><linearGradient id="g" x1="42.61" y1="47.79" x2="98.34" y2="78.93" xlink:href="#a"/><linearGradient id="h" x1="12.93" y1="23.88" x2="60.52" y2="67.77" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4e27a4"/><stop offset=".34" stop-color="#8b4ee5"/><stop offset=".73" stop-color="#ff4ad9"/><stop offset="1" stop-color="#ff778e"/></linearGradient><linearGradient id="i" x1="-9.97" y1="1.03" x2="65.82" y2="107.4" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#20123a"/><stop offset=".51" stop-color="#5f2eca"/><stop offset="1" stop-color="#7542e5" stop-opacity="0"/></linearGradient></defs><path d="M0 0h664v90H0z" fill-rule="evenodd" fill="url(#b)"/><path fill="url(#c)" d="M504 0h160v90H504z"/><path d="M664 90V0H536c4.4 35.42 18.65 66.86 39.21 90z" fill-rule="evenodd" fill="url(#a)"/><path d="M664 90V0h-83c1.56 34.75 13.2 66.18 31.37 90z" fill-rule="evenodd" fill="url(#d)"/><path d="M650.22 90H664V0h-48a51.79 51.79 0 0 0 2.65 9.31z" fill="#7542e5" fill-rule="evenodd"/><path d="M649 0h15v28a130.53 130.53 0 0 0-15-28z" fill="#20123a" fill-rule="evenodd"/><path d="M650.22 90H664V0h-48a51.79 51.79 0 0 0 2.65 9.31z" fill-rule="evenodd" fill="url(#e)"/><path d="M0 0h160v90H0z" fill="url(#f)"/><path d="M128 90v-2.61C128 45 104.13 9.44 72 0H38C23 4.41 9.8 14.49 0 28.31V90z" fill="url(#g)"/><path d="M106.29 90a110.93 110.93 0 0 0 .71-12.46C107 44.49 92.5 15.6 70.9 0H0v90z" fill="url(#h)"/><path d="M98.35 90a54 54 0 0 0-9.09-23.29L42.2 0H0v89.27l.52.73z" fill="url(#i)"/><path d="M46.47 90A122.45 122.45 0 0 0 33 67.85l-2.18-3C16.62 46.34 8.42 23.51 6.16 0H0v90z" fill="#20123a"/><path d="M28 35.72V.5L156 0v35.22h508V90H0V35.22z" fill="#fff" fill-opacity=".8"/><path d="M28 0h128v5H28z" fill="#bb8bff"/><path d="M56.5 18h71a2.5 2.5 0 0 1 2.5 2.5 2.5 2.5 0 0 1-2.5 2.5h-71a2.5 2.5 0 0 1-2.5-2.5 2.5 2.5 0 0 1 2.5-2.5zm128 0h71a2.5 2.5 0 0 1 2.5 2.5 2.5 2.5 0 0 1-2.5 2.5h-71a2.5 2.5 0 0 1-2.5-2.5 2.5 2.5 0 0 1 2.5-2.5z" fill="#2b1b4c"/><rect x="82.5" y="48.5" width="533" height="29" rx="4" fill="#fff"/><path d="M98.5 61h425a2.5 2.5 0 0 1 2.5 2.5 2.5 2.5 0 0 1-2.5 2.5h-425a2.5 2.5 0 0 1-2.5-2.5 2.5 2.5 0 0 1 2.5-2.5z" fill="#2b1b4c"/><circle cx="27" cy="63" r="7" fill="#6e46d5"/><circle cx="55" cy="63" r="7" fill="#6e46d5"/><rect x="630" y="54" width="18" height="2.67" rx="1.33" fill="#6e46d5"/><rect x="630" y="60.67" width="18" height="2.67" rx="1.33" fill="#6e46d5"/><rect x="630" y="67" width="18" height="2.67" rx="1.33" fill="#6e46d5"/></svg>
--- 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)