diff --git a/addon-sdk/source/examples/ui-button-apis/lib/main.js b/addon-sdk/source/examples/ui-button-apis/lib/main.js index 7688a7445be..f0ae3dd6cfa 100644 --- a/addon-sdk/source/examples/ui-button-apis/lib/main.js +++ b/addon-sdk/source/examples/ui-button-apis/lib/main.js @@ -8,7 +8,7 @@ var tabs = require('sdk/tabs'); var { notify } = require('sdk/notifications'); var { ActionButton, ToggleButton } = require('sdk/ui'); -var icon = 'chrome://mozapps/skin/extensions/extensionGeneric.png'; +var icon = 'chrome://mozapps/skin/extensions/extensionGeneric.svg'; exports.icon = icon; // your basic action button diff --git a/browser/themes/linux/preferences/aboutPermissions.css b/browser/themes/linux/preferences/aboutPermissions.css index b308d915a02..16f333776a0 100644 --- a/browser/themes/linux/preferences/aboutPermissions.css +++ b/browser/themes/linux/preferences/aboutPermissions.css @@ -101,7 +101,7 @@ list-style-image: url(chrome://global/skin/icons/question-64.png); } .pref-icon[type="install"] { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png); + list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.svg); } .pref-icon[type="popup"] { list-style-image: url(chrome://global/skin/icons/question-64.png); diff --git a/browser/themes/osx/preferences/aboutPermissions.css b/browser/themes/osx/preferences/aboutPermissions.css index c07c88a2092..e8e380ef976 100644 --- a/browser/themes/osx/preferences/aboutPermissions.css +++ b/browser/themes/osx/preferences/aboutPermissions.css @@ -111,7 +111,7 @@ list-style-image: url(chrome://global/skin/icons/question-64.png); } .pref-icon[type="install"] { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png); + list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.svg); } .pref-icon[type="popup"] { list-style-image: url(chrome://global/skin/icons/question-64.png); diff --git a/browser/themes/windows/preferences/aboutPermissions.css b/browser/themes/windows/preferences/aboutPermissions.css index f5a276ea655..d6928b49033 100644 --- a/browser/themes/windows/preferences/aboutPermissions.css +++ b/browser/themes/windows/preferences/aboutPermissions.css @@ -105,7 +105,7 @@ list-style-image: url(chrome://global/skin/icons/question-64.png); } .pref-icon[type="install"] { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png); + list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.svg); } .pref-icon[type="popup"] { list-style-image: url(chrome://global/skin/icons/question-64.png); diff --git a/devtools/client/aboutdebugging/components/addons.js b/devtools/client/aboutdebugging/components/addons.js index 803a7848a8e..d807b318774 100644 --- a/devtools/client/aboutdebugging/components/addons.js +++ b/devtools/client/aboutdebugging/components/addons.js @@ -15,7 +15,7 @@ loader.lazyRequireGetter(this, "Services"); loader.lazyImporter(this, "AddonManager", "resource://gre/modules/AddonManager.jsm"); -const ExtensionIcon = "chrome://mozapps/skin/extensions/extensionGeneric.png"; +const ExtensionIcon = "chrome://mozapps/skin/extensions/extensionGeneric.svg"; const Strings = Services.strings.createBundle( "chrome://browser/locale/devtools/aboutdebugging.properties"); diff --git a/toolkit/themes/linux/mozapps/extensions/extensionGeneric.png b/toolkit/themes/linux/mozapps/extensions/extensionGeneric.png deleted file mode 100644 index 2ae95a5b287..00000000000 Binary files a/toolkit/themes/linux/mozapps/extensions/extensionGeneric.png and /dev/null differ diff --git a/toolkit/themes/linux/mozapps/extensions/extensions.css b/toolkit/themes/linux/mozapps/extensions/extensions.css index 33bbf754bb7..38f22d53c94 100644 --- a/toolkit/themes/linux/mozapps/extensions/extensions.css +++ b/toolkit/themes/linux/mozapps/extensions/extensions.css @@ -8,22 +8,6 @@ list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native"); } -.warning-icon { - list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=menu"); - height: 16px; -} - -.error-icon { - list-style-image: url("moz-icon://stock/gtk-dialog-error?size=menu"); - height: 16px; -} - -.pending-icon, -.info-icon { - list-style-image: url("moz-icon://stock/gtk-dialog-info?size=menu"); - height: 16px; -} - .sorter[checkState="1"] .button-icon { display: -moz-box; list-style-image: url("moz-icon://stock/gtk-sort-descending?size=16"); diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn index b74fc755d21..2faed580c91 100644 --- a/toolkit/themes/linux/mozapps/jar.mn +++ b/toolkit/themes/linux/mozapps/jar.mn @@ -13,7 +13,7 @@ toolkit.jar: + skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png) + skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) + skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) -+ skin/classic/mozapps/extensions/extensionGeneric.png (extensions/extensionGeneric.png) ++ skin/classic/mozapps/extensions/extensionGeneric.svg (../../shared/extensions/extensionGeneric.svg) + skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) + skin/classic/mozapps/extensions/dictionaryGeneric.png (extensions/dictionaryGeneric.png) + skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png) @@ -24,6 +24,10 @@ toolkit.jar: + skin/classic/mozapps/extensions/selectAddons.css (extensions/selectAddons.css) + skin/classic/mozapps/extensions/heart.png (extensions/heart.png) + skin/classic/mozapps/extensions/navigation.png (../../shared/extensions/navigation.png) ++ skin/classic/mozapps/extensions/alerticon-warning.svg (../../shared/extensions/alerticon-warning.svg) ++ skin/classic/mozapps/extensions/alerticon-error.svg (../../shared/extensions/alerticon-error.svg) ++ skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/extensions/alerticon-info-positive.svg) ++ skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/extensions/alerticon-info-negative.svg) + skin/classic/mozapps/extensions/utilities.svg (../../shared/extensions/utilities.svg) + skin/classic/mozapps/passwordmgr/key-16.png (passwordmgr/key-16.png) + skin/classic/mozapps/passwordmgr/key-64.png (passwordmgr/key-64.png) diff --git a/toolkit/themes/osx/mozapps/extensions/about.css b/toolkit/themes/osx/mozapps/extensions/about.css index cfabd47dba0..13a3040b2f3 100644 --- a/toolkit/themes/osx/mozapps/extensions/about.css +++ b/toolkit/themes/osx/mozapps/extensions/about.css @@ -19,7 +19,7 @@ } #extensionIcon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); max-width: 64px; max-height: 64px; -moz-margin-end: 6px; diff --git a/toolkit/themes/osx/mozapps/extensions/alerticon-error.png b/toolkit/themes/osx/mozapps/extensions/alerticon-error.png deleted file mode 100644 index 8740e4911a8..00000000000 Binary files a/toolkit/themes/osx/mozapps/extensions/alerticon-error.png and /dev/null differ diff --git a/toolkit/themes/osx/mozapps/extensions/alerticon-info-negative.png b/toolkit/themes/osx/mozapps/extensions/alerticon-info-negative.png deleted file mode 100644 index 2c5f628ab60..00000000000 Binary files a/toolkit/themes/osx/mozapps/extensions/alerticon-info-negative.png and /dev/null differ diff --git a/toolkit/themes/osx/mozapps/extensions/alerticon-info-positive.png b/toolkit/themes/osx/mozapps/extensions/alerticon-info-positive.png deleted file mode 100644 index a186c6b7ada..00000000000 Binary files a/toolkit/themes/osx/mozapps/extensions/alerticon-info-positive.png and /dev/null differ diff --git a/toolkit/themes/osx/mozapps/extensions/alerticon-warning.png b/toolkit/themes/osx/mozapps/extensions/alerticon-warning.png deleted file mode 100644 index 75ea826f914..00000000000 Binary files a/toolkit/themes/osx/mozapps/extensions/alerticon-warning.png and /dev/null differ diff --git a/toolkit/themes/osx/mozapps/extensions/eula.css b/toolkit/themes/osx/mozapps/extensions/eula.css index 5fb2c52df28..1011153c0a0 100644 --- a/toolkit/themes/osx/mozapps/extensions/eula.css +++ b/toolkit/themes/osx/mozapps/extensions/eula.css @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #icon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); max-width: 48px; max-height: 48px; -moz-margin-end: 6px; diff --git a/toolkit/themes/osx/mozapps/extensions/extensionGeneric.png b/toolkit/themes/osx/mozapps/extensions/extensionGeneric.png deleted file mode 100644 index 6a76774c7bf..00000000000 Binary files a/toolkit/themes/osx/mozapps/extensions/extensionGeneric.png and /dev/null differ diff --git a/toolkit/themes/osx/mozapps/extensions/extensions.css b/toolkit/themes/osx/mozapps/extensions/extensions.css index 5297c25f394..2e3b79bf690 100644 --- a/toolkit/themes/osx/mozapps/extensions/extensions.css +++ b/toolkit/themes/osx/mozapps/extensions/extensions.css @@ -19,27 +19,6 @@ -moz-margin-start: 2px; } -.warning-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png"); - height: 15px; -} - -.error-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png"); - height: 15px; -} - -.pending-icon, -.info-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png"); - height: 15px; -} - -.addon-view[pending="disable"] .pending-icon, -.addon-view[pending="uninstall"] .pending-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png"); -} - .sorter[checkState="1"] { list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); } diff --git a/toolkit/themes/osx/mozapps/extensions/navigation.png b/toolkit/themes/osx/mozapps/extensions/navigation.png deleted file mode 100644 index ffc40d7e56b..00000000000 Binary files a/toolkit/themes/osx/mozapps/extensions/navigation.png and /dev/null differ diff --git a/toolkit/themes/osx/mozapps/extensions/stripes-error.png b/toolkit/themes/osx/mozapps/extensions/stripes-error.png deleted file mode 100644 index 1dc2d8504cb..00000000000 Binary files a/toolkit/themes/osx/mozapps/extensions/stripes-error.png and /dev/null differ diff --git a/toolkit/themes/osx/mozapps/extensions/stripes-info-negative.png b/toolkit/themes/osx/mozapps/extensions/stripes-info-negative.png deleted file mode 100644 index 901ab1ec29f..00000000000 Binary files a/toolkit/themes/osx/mozapps/extensions/stripes-info-negative.png and /dev/null differ diff --git a/toolkit/themes/osx/mozapps/extensions/stripes-info-positive.png b/toolkit/themes/osx/mozapps/extensions/stripes-info-positive.png deleted file mode 100644 index 370ceec0f24..00000000000 Binary files a/toolkit/themes/osx/mozapps/extensions/stripes-info-positive.png and /dev/null differ diff --git a/toolkit/themes/osx/mozapps/extensions/stripes-warning.png b/toolkit/themes/osx/mozapps/extensions/stripes-warning.png deleted file mode 100644 index 69463fb1af3..00000000000 Binary files a/toolkit/themes/osx/mozapps/extensions/stripes-warning.png and /dev/null differ diff --git a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css b/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css index 0a1a84b2495..939a6bf8314 100644 --- a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css +++ b/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css @@ -70,7 +70,7 @@ installitem { .xpinstallItemIcon { max-width: 32px; max-height: 32px; - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); } installitem[type="theme"] .xpinstallItemIcon { diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn index 077d30b96b8..0c3ff98b27d 100644 --- a/toolkit/themes/osx/mozapps/jar.mn +++ b/toolkit/themes/osx/mozapps/jar.mn @@ -18,7 +18,7 @@ toolkit.jar: skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) skin/classic/mozapps/extensions/discover-logo.png (extensions/discover-logo.png) - skin/classic/mozapps/extensions/extensionGeneric.png (extensions/extensionGeneric.png) + skin/classic/mozapps/extensions/extensionGeneric.svg (../../shared/extensions/extensionGeneric.svg) skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) @@ -33,14 +33,10 @@ toolkit.jar: skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png (extensions/toolbarbutton-dropmarker.png) skin/classic/mozapps/extensions/heart.png (extensions/heart.png) skin/classic/mozapps/extensions/navigation.png (../../shared/extensions/navigation.png) - skin/classic/mozapps/extensions/stripes-warning.png (extensions/stripes-warning.png) - skin/classic/mozapps/extensions/stripes-error.png (extensions/stripes-error.png) - skin/classic/mozapps/extensions/stripes-info-positive.png (extensions/stripes-info-positive.png) - 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/alerticon-warning.svg (../../shared/extensions/alerticon-warning.svg) + skin/classic/mozapps/extensions/alerticon-error.svg (../../shared/extensions/alerticon-error.svg) + skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/extensions/alerticon-info-positive.svg) + skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/extensions/alerticon-info-negative.svg) 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) @@ -87,8 +83,7 @@ toolkit.jar: #if MOZ_BUILD_APP == browser [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #endif -% override chrome://mozapps/skin/extensions/category-extensions.png chrome://mozapps/skin/extensions/extensionGeneric.png +% override chrome://mozapps/skin/extensions/category-extensions.svg chrome://mozapps/skin/extensions/extensionGeneric.svg % override chrome://mozapps/skin/extensions/category-languages.png chrome://mozapps/skin/extensions/localeGeneric.png % override chrome://mozapps/skin/extensions/category-themes.png chrome://mozapps/skin/extensions/themeGeneric.png % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png chrome://mozapps/skin/plugins/notifyPluginGeneric.png -% override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png chrome://mozapps/skin/extensions/extensionGeneric.png diff --git a/toolkit/themes/shared/extensions/alerticon-error.svg b/toolkit/themes/shared/extensions/alerticon-error.svg new file mode 100644 index 00000000000..cb883e16e9b --- /dev/null +++ b/toolkit/themes/shared/extensions/alerticon-error.svg @@ -0,0 +1,6 @@ + + + + diff --git a/toolkit/themes/shared/extensions/alerticon-info-negative.svg b/toolkit/themes/shared/extensions/alerticon-info-negative.svg new file mode 100644 index 00000000000..733f8571aa9 --- /dev/null +++ b/toolkit/themes/shared/extensions/alerticon-info-negative.svg @@ -0,0 +1,6 @@ + + + + diff --git a/toolkit/themes/shared/extensions/alerticon-info-positive.svg b/toolkit/themes/shared/extensions/alerticon-info-positive.svg new file mode 100644 index 00000000000..031190bce8d --- /dev/null +++ b/toolkit/themes/shared/extensions/alerticon-info-positive.svg @@ -0,0 +1,6 @@ + + + + diff --git a/toolkit/themes/shared/extensions/alerticon-warning.svg b/toolkit/themes/shared/extensions/alerticon-warning.svg new file mode 100644 index 00000000000..2b403220ecd --- /dev/null +++ b/toolkit/themes/shared/extensions/alerticon-warning.svg @@ -0,0 +1,6 @@ + + + + diff --git a/toolkit/themes/shared/extensions/extensionGeneric.svg b/toolkit/themes/shared/extensions/extensionGeneric.svg new file mode 100644 index 00000000000..28c2f7ba387 --- /dev/null +++ b/toolkit/themes/shared/extensions/extensionGeneric.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/toolkit/themes/shared/extensions/extensions.inc.css b/toolkit/themes/shared/extensions/extensions.inc.css index 98c977e1582..1489fc91453 100644 --- a/toolkit/themes/shared/extensions/extensions.inc.css +++ b/toolkit/themes/shared/extensions/extensions.inc.css @@ -29,14 +29,12 @@ .global-warning { -moz-box-align: center; padding: 0 8px; - color: #916D15; + color: #c8a91e; font-weight: bold; } #addons-page[warning] .global-warning-container { - background-color: rgba(255, 255, 0, 0.1); - background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"); - background-repeat: repeat-x; + background-image: linear-gradient(transparent, rgba(255, 255, 0, 0.1)); } #detail-view .global-warning { @@ -74,9 +72,27 @@ .pending-icon, .info-icon { width: 16px; + height: 16px; margin: 3px 0; } +.warning-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg"); +} + +.error-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.svg"); +} + +.pending-icon, +.info-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.svg"); +} + +.addon-view[pending="disable"] .pending-icon, +.addon-view[pending="uninstall"] .pending-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.svg"); +} /*** view alert boxes ***/ @@ -179,7 +195,7 @@ list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png"); } #category-extension > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png"); + list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.svg"); } #category-service > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-service.png"); @@ -390,9 +406,9 @@ } .icon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); - max-width: 48px; - max-height: 48px; + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + max-width: 32px; + max-height: 32px; } .content-inner-container { @@ -488,20 +504,20 @@ } .addon-view .warning { - color: #916d15; + color: #d8b826; } .addon-view .error { - color: #d74345; + color: #e62117; } .addon-view .pending { - color: #1b7123; + color: #62c44e; } .addon-view[pending="disable"] .pending, .addon-view[pending="uninstall"] .pending { - color: #62666e; + color: #898989; } .addon .relnotes-container { @@ -537,35 +553,30 @@ -moz-padding-start: 4px; } +.addon-view[notification], +.addon-view[pending] { + --view-highlight-color: transparent; + background-image: radial-gradient(at 50% 0%, + var(--view-highlight-color) 0%, + transparent 75%); +} .addon-view[notification="warning"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"), - linear-gradient(rgba(255, 255, 0, 0.04), - rgba(255, 255, 0, 0)); - background-repeat: repeat-x; + --view-highlight-color: #F9F5E5; } .addon-view[notification="error"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"), - linear-gradient(rgba(255, 0, 0, 0.04), - rgba(255, 0, 0, 0)); - background-repeat: repeat-x; + --view-highlight-color: #FFE8E9; } .addon-view[pending="enable"], .addon-view[pending="upgrade"], .addon-view[pending="install"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"), - linear-gradient(rgba(0, 255, 0, 0.04), - rgba(0, 255, 0, 0)); - background-repeat: repeat-x; + --view-highlight-color: #EFFAF2; } .addon-view[pending="disable"], .addon-view[pending="uninstall"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"), - linear-gradient(rgba(128, 128, 128, 0.04), - rgba(128, 128, 128, 0)); - background-repeat: repeat-x; + --view-highlight-color: #F2F2F2; } .addon[selected] { diff --git a/toolkit/themes/shared/extensions/newaddon.inc.css b/toolkit/themes/shared/extensions/newaddon.inc.css index 202128d5bab..123a9781ad8 100644 --- a/toolkit/themes/shared/extensions/newaddon.inc.css +++ b/toolkit/themes/shared/extensions/newaddon.inc.css @@ -40,7 +40,7 @@ -moz-margin-end: 10px; max-width: 64px; max-height: 64px; - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); } .addon-info[type="theme"] #icon { @@ -77,9 +77,9 @@ } #warning-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png"); + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg"); width: 16px; - height: 15px; + height: 16px; margin-top: 5px; -moz-margin-end: 5px; } diff --git a/toolkit/themes/windows/mozapps/extensions/about.css b/toolkit/themes/windows/mozapps/extensions/about.css index 7188c11bf9c..97a65fc5f10 100644 --- a/toolkit/themes/windows/mozapps/extensions/about.css +++ b/toolkit/themes/windows/mozapps/extensions/about.css @@ -31,7 +31,7 @@ } #extensionIcon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); max-width: 64px; max-height: 64px; -moz-margin-end: 6px; diff --git a/toolkit/themes/windows/mozapps/extensions/alerticon-error.png b/toolkit/themes/windows/mozapps/extensions/alerticon-error.png deleted file mode 100644 index 8740e4911a8..00000000000 Binary files a/toolkit/themes/windows/mozapps/extensions/alerticon-error.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/extensions/alerticon-info-negative.png b/toolkit/themes/windows/mozapps/extensions/alerticon-info-negative.png deleted file mode 100644 index 2c5f628ab60..00000000000 Binary files a/toolkit/themes/windows/mozapps/extensions/alerticon-info-negative.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/extensions/alerticon-info-positive.png b/toolkit/themes/windows/mozapps/extensions/alerticon-info-positive.png deleted file mode 100644 index a186c6b7ada..00000000000 Binary files a/toolkit/themes/windows/mozapps/extensions/alerticon-info-positive.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/extensions/alerticon-warning.png b/toolkit/themes/windows/mozapps/extensions/alerticon-warning.png deleted file mode 100644 index 75ea826f914..00000000000 Binary files a/toolkit/themes/windows/mozapps/extensions/alerticon-warning.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/extensions/eula.css b/toolkit/themes/windows/mozapps/extensions/eula.css index 5fb2c52df28..1011153c0a0 100644 --- a/toolkit/themes/windows/mozapps/extensions/eula.css +++ b/toolkit/themes/windows/mozapps/extensions/eula.css @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #icon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); max-width: 48px; max-height: 48px; -moz-margin-end: 6px; diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-XP.png b/toolkit/themes/windows/mozapps/extensions/extensionGeneric-XP.png deleted file mode 100644 index 6a76774c7bf..00000000000 Binary files a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-XP.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric.png b/toolkit/themes/windows/mozapps/extensions/extensionGeneric.png deleted file mode 100644 index 7756f973b27..00000000000 Binary files a/toolkit/themes/windows/mozapps/extensions/extensionGeneric.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.css b/toolkit/themes/windows/mozapps/extensions/extensions.css index 04dd4a7d7f5..c28686fab72 100644 --- a/toolkit/themes/windows/mozapps/extensions/extensions.css +++ b/toolkit/themes/windows/mozapps/extensions/extensions.css @@ -15,27 +15,6 @@ } } -.warning-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png"); - height: 15px; -} - -.error-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png"); - height: 15px; -} - -.pending-icon, -.info-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png"); - height: 15px; -} - -.addon-view[pending="disable"] .pending-icon, -.addon-view[pending="uninstall"] .pending-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png"); -} - .sorter[checkState="1"] { list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); } diff --git a/toolkit/themes/windows/mozapps/extensions/stripes-error.png b/toolkit/themes/windows/mozapps/extensions/stripes-error.png deleted file mode 100644 index 1dc2d8504cb..00000000000 Binary files a/toolkit/themes/windows/mozapps/extensions/stripes-error.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/extensions/stripes-info-negative.png b/toolkit/themes/windows/mozapps/extensions/stripes-info-negative.png deleted file mode 100644 index 901ab1ec29f..00000000000 Binary files a/toolkit/themes/windows/mozapps/extensions/stripes-info-negative.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/extensions/stripes-info-positive.png b/toolkit/themes/windows/mozapps/extensions/stripes-info-positive.png deleted file mode 100644 index 370ceec0f24..00000000000 Binary files a/toolkit/themes/windows/mozapps/extensions/stripes-info-positive.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/extensions/stripes-warning.png b/toolkit/themes/windows/mozapps/extensions/stripes-warning.png deleted file mode 100644 index 69463fb1af3..00000000000 Binary files a/toolkit/themes/windows/mozapps/extensions/stripes-warning.png and /dev/null differ diff --git a/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css b/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css index d038e1abf3a..d5e87b28b61 100644 --- a/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css +++ b/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css @@ -81,7 +81,7 @@ installitem { .xpinstallItemIcon { max-width: 32px; max-height: 32px; - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); } installitem[type="theme"] .xpinstallItemIcon { diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn index 2c81c97fa73..d6322eec273 100644 --- a/toolkit/themes/windows/mozapps/jar.mn +++ b/toolkit/themes/windows/mozapps/jar.mn @@ -21,7 +21,7 @@ toolkit.jar: skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) skin/classic/mozapps/extensions/discover-logo.png (extensions/discover-logo.png) - skin/classic/mozapps/extensions/extensionGeneric.png (extensions/extensionGeneric.png) + skin/classic/mozapps/extensions/extensionGeneric.svg (../../shared/extensions/extensionGeneric.svg) skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) @@ -35,14 +35,10 @@ toolkit.jar: skin/classic/mozapps/extensions/utilities.svg (../../shared/extensions/utilities.svg) skin/classic/mozapps/extensions/heart.png (extensions/heart.png) skin/classic/mozapps/extensions/navigation.png (../../shared/extensions/navigation.png) - skin/classic/mozapps/extensions/stripes-warning.png (extensions/stripes-warning.png) - skin/classic/mozapps/extensions/stripes-error.png (extensions/stripes-error.png) - skin/classic/mozapps/extensions/stripes-info-positive.png (extensions/stripes-info-positive.png) - 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/alerticon-warning.svg (../../shared/extensions/alerticon-warning.svg) + skin/classic/mozapps/extensions/alerticon-error.svg (../../shared/extensions/alerticon-error.svg) + skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/extensions/alerticon-info-positive.svg) + skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/extensions/alerticon-info-negative.svg) skin/classic/mozapps/extensions/eula.css (extensions/eula.css) * skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) skin/classic/mozapps/handling/handling.css (handling/handling.css) @@ -83,7 +79,6 @@ toolkit.jar: skin/classic/mozapps/extensions/category-plugins-XP.png (extensions/category-plugins-XP.png) skin/classic/mozapps/extensions/category-recent-XP.png (extensions/category-recent-XP.png) skin/classic/mozapps/extensions/category-available-XP.png (extensions/category-available-XP.png) - skin/classic/mozapps/extensions/extensionGeneric-XP.png (extensions/extensionGeneric-XP.png) skin/classic/mozapps/extensions/extensionGeneric-16-XP.png (extensions/extensionGeneric-16-XP.png) skin/classic/mozapps/extensions/themeGeneric-XP.png (extensions/themeGeneric-XP.png) skin/classic/mozapps/extensions/themeGeneric-16-XP.png (extensions/themeGeneric-16-XP.png) @@ -103,7 +98,6 @@ toolkit.jar: % override chrome://mozapps/skin/extensions/category-plugins.png chrome://mozapps/skin/extensions/category-plugins-XP.png osversion<6 % override chrome://mozapps/skin/extensions/category-recent.png chrome://mozapps/skin/extensions/category-recent-XP.png osversion<6 % override chrome://mozapps/skin/extensions/category-available.png chrome://mozapps/skin/extensions/category-available-XP.png osversion<6 -% override chrome://mozapps/skin/extensions/extensionGeneric.png chrome://mozapps/skin/extensions/extensionGeneric-XP.png osversion<6 % override chrome://mozapps/skin/extensions/extensionGeneric-16.png chrome://mozapps/skin/extensions/extensionGeneric-16-XP.png osversion<6 % override chrome://mozapps/skin/extensions/themeGeneric.png chrome://mozapps/skin/extensions/themeGeneric-XP.png osversion<6 % override chrome://mozapps/skin/extensions/themeGeneric-16.png chrome://mozapps/skin/extensions/themeGeneric-16-XP.png osversion<6 @@ -120,9 +114,8 @@ toolkit.jar: #endif % override chrome://mozapps/skin/extensions/category-dictionaries.png chrome://mozapps/skin/extensions/dictionaryGeneric.png % override chrome://mozapps/skin/extensions/category-experiments.png chrome://mozapps/skin/extensions/experimentGeneric.png -% override chrome://mozapps/skin/extensions/category-extensions.png chrome://mozapps/skin/extensions/extensionGeneric.png +% override chrome://mozapps/skin/extensions/category-extensions.svg chrome://mozapps/skin/extensions/extensionGeneric.svg % override chrome://mozapps/skin/extensions/category-languages.png chrome://mozapps/skin/extensions/localeGeneric.png % override chrome://mozapps/skin/extensions/category-themes.png chrome://mozapps/skin/extensions/themeGeneric.png % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png chrome://mozapps/skin/plugins/pluginGeneric-16.png % override chrome://mozapps/skin/plugins/notifyPluginGeneric.png chrome://mozapps/skin/plugins/pluginGeneric-16.png -% override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png chrome://mozapps/skin/extensions/extensionGeneric.png