Bug 1079719 - Replace "greyscale" SVG filter with filter: grayscale(1). r=dao
--- a/toolkit/themes/linux/mozapps/extensions/extensions.css
+++ b/toolkit/themes/linux/mozapps/extensions/extensions.css
@@ -396,17 +396,17 @@
.icon {
list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
max-width: 48px;
max-height: 48px;
}
.addon[active="false"] .icon {
- filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+ filter: grayscale(1);
}
.addon-view[type="theme"] .icon {
list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
}
.addon-view[type="locale"] .icon {
list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
--- a/toolkit/themes/linux/mozapps/extensions/selectAddons.css
+++ b/toolkit/themes/linux/mozapps/extensions/selectAddons.css
@@ -141,17 +141,17 @@
#confirm .addon {
-moz-margin-start: 3em;
-moz-box-align: center;
}
.addon:not([active]) .addon-icon,
#disable-list .addon-icon,
#incompatible-list .addon-icon {
- filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+ filter: grayscale(1);
}
#footer {
padding: 15px 12px;
border-top: 2px solid;
-moz-border-top-colors: ThreeDHighlight ThreeDLightShadow;
}
--- a/toolkit/themes/osx/mozapps/extensions/extensions.css
+++ b/toolkit/themes/osx/mozapps/extensions/extensions.css
@@ -461,17 +461,17 @@
.icon {
list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
max-width: 48px;
max-height: 48px;
}
.addon[active="false"] .icon {
- filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+ filter: grayscale(1);
}
.addon-view[type="theme"] .icon {
list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
}
.addon-view[type="locale"] .icon {
list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
deleted file mode 100644
--- a/toolkit/themes/osx/mozapps/extensions/extensions.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.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 xmlns="http://www.w3.org/2000/svg">
- <filter id="greyscale">
- <feColorMatrix type="saturate" values="0"/>
- </filter>
-</svg>
--- a/toolkit/themes/osx/mozapps/extensions/selectAddons.css
+++ b/toolkit/themes/osx/mozapps/extensions/selectAddons.css
@@ -140,17 +140,17 @@
#confirm .addon {
-moz-margin-start: 3em;
-moz-box-align: center;
}
.addon:not([active]) .addon-icon,
#disable-list .addon-icon,
#incompatible-list .addon-icon {
- filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+ filter: grayscale(1);
}
#footer {
padding: 15px 12px;
-moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
-moz-appearance: statusbar;
}
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -42,17 +42,16 @@ toolkit.jar:
skin/classic/mozapps/extensions/stripes-info-negative.png (extensions/stripes-info-negative.png)
skin/classic/mozapps/extensions/alerticon-warning.png (extensions/alerticon-warning.png)
skin/classic/mozapps/extensions/alerticon-error.png (extensions/alerticon-error.png)
skin/classic/mozapps/extensions/alerticon-info-positive.png (extensions/alerticon-info-positive.png)
skin/classic/mozapps/extensions/alerticon-info-negative.png (extensions/alerticon-info-negative.png)
skin/classic/mozapps/extensions/search.png (extensions/search.png)
skin/classic/mozapps/extensions/about.css (extensions/about.css)
* skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css)
- skin/classic/mozapps/extensions/extensions.svg (extensions/extensions.svg)
* skin/classic/mozapps/extensions/selectAddons.css (extensions/selectAddons.css)
skin/classic/mozapps/extensions/update.css (extensions/update.css)
skin/classic/mozapps/extensions/eula.css (extensions/eula.css)
skin/classic/mozapps/extensions/blocklist.css (extensions/blocklist.css)
* skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css)
skin/classic/mozapps/passwordmgr/key.png (passwordmgr/key.png)
skin/classic/mozapps/passwordmgr/key-16.png (passwordmgr/key-16.png)
skin/classic/mozapps/passwordmgr/key-16@2x.png (passwordmgr/key-16@2x.png)
--- a/toolkit/themes/windows/mozapps/extensions/extensions.css
+++ b/toolkit/themes/windows/mozapps/extensions/extensions.css
@@ -468,17 +468,17 @@
.icon {
list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
max-width: 48px;
max-height: 48px;
}
.addon[active="false"] .icon {
- filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+ filter: grayscale(1);
}
.addon-view[type="theme"] .icon {
list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
}
.addon-view[type="locale"] .icon {
deleted file mode 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensions.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.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 xmlns="http://www.w3.org/2000/svg">
- <filter id="greyscale">
- <feColorMatrix type="saturate" values="0"/>
- </filter>
-</svg>
--- a/toolkit/themes/windows/mozapps/extensions/selectAddons.css
+++ b/toolkit/themes/windows/mozapps/extensions/selectAddons.css
@@ -153,17 +153,17 @@
#confirm .addon {
-moz-margin-start: 3em;
-moz-box-align: center;
}
.addon:not([active]) .addon-icon,
#disable-list .addon-icon,
#incompatible-list .addon-icon {
- filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+ filter: grayscale(1);
}
#footer {
padding: 15px 12px;
}
.progress-label,
#footer-label {
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -11,17 +11,16 @@ toolkit.jar:
skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png)
skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css)
skin/classic/mozapps/downloads/unknownContentType.css (downloads/unknownContentType.css)
skin/classic/mozapps/extensions/about.css (extensions/about.css)
skin/classic/mozapps/extensions/blocklist.css (extensions/blocklist.css)
* skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css)
* skin/classic/mozapps/extensions/selectAddons.css (extensions/selectAddons.css)
skin/classic/mozapps/extensions/update.css (extensions/update.css)
- skin/classic/mozapps/extensions/extensions.svg (extensions/extensions.svg)
skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png)
skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png)
skin/classic/mozapps/extensions/category-languages.png (extensions/localeGeneric.png)
skin/classic/mozapps/extensions/category-searchengines.png (extensions/category-searchengines.png)
skin/classic/mozapps/extensions/category-extensions.png (extensions/extensionGeneric.png)
skin/classic/mozapps/extensions/category-themes.png (extensions/themeGeneric.png)
skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png)
skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png)
@@ -94,17 +93,16 @@ toolkit.jar:
skin/classic/aero/mozapps/downloads/downloadIcon.png (downloads/downloadIcon-aero.png)
* skin/classic/aero/mozapps/downloads/downloads.css (downloads/downloads-aero.css)
skin/classic/aero/mozapps/downloads/unknownContentType.css (downloads/unknownContentType.css)
skin/classic/aero/mozapps/extensions/about.css (extensions/about.css)
skin/classic/aero/mozapps/extensions/blocklist.css (extensions/blocklist.css)
* skin/classic/aero/mozapps/extensions/extensions.css (extensions/extensions-aero.css)
* skin/classic/aero/mozapps/extensions/selectAddons.css (extensions/selectAddons-aero.css)
skin/classic/aero/mozapps/extensions/update.css (extensions/update.css)
- skin/classic/aero/mozapps/extensions/extensions.svg (extensions/extensions.svg)
skin/classic/aero/mozapps/extensions/category-search.png (extensions/category-search.png)
skin/classic/aero/mozapps/extensions/category-discover.png (extensions/category-discover-aero.png)
skin/classic/aero/mozapps/extensions/category-languages.png (extensions/localeGeneric-aero.png)
skin/classic/aero/mozapps/extensions/category-searchengines.png (extensions/category-searchengines.png)
skin/classic/aero/mozapps/extensions/category-extensions.png (extensions/extensionGeneric-aero.png)
skin/classic/aero/mozapps/extensions/category-themes.png (extensions/themeGeneric-aero.png)
skin/classic/aero/mozapps/extensions/category-plugins.png (extensions/category-plugins-aero.png)
skin/classic/aero/mozapps/extensions/category-service.png (extensions/category-service.png)