diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml index 804d23c9cef..566de05dbe1 100644 --- a/toolkit/mozapps/extensions/content/extensions.xml +++ b/toolkit/mozapps/extensions/content/extensions.xml @@ -363,7 +363,7 @@ - + diff --git a/toolkit/mozapps/xpinstall/content/xpinstallConfirm.js b/toolkit/mozapps/xpinstall/content/xpinstallConfirm.js index 60ddd25f532..1666925b5a6 100644 --- a/toolkit/mozapps/xpinstall/content/xpinstallConfirm.js +++ b/toolkit/mozapps/xpinstall/content/xpinstallConfirm.js @@ -68,8 +68,11 @@ XPInstallConfirm.init = function () installItem.name = args.installs[i].addon.name; installItem.url = args.installs[i].sourceURL; var icon = args.installs[i].iconURL; - if (icon != null) + if (icon) installItem.icon = icon; + var type = args.installs[i].type; + if (type) + installItem.type = type; if (args.installs[i].certName) { installItem.cert = bundle.getFormattedString("signed", [args.installs[i].certName]); } diff --git a/toolkit/mozapps/xpinstall/content/xpinstallItem.xml b/toolkit/mozapps/xpinstall/content/xpinstallItem.xml index eb54274787c..c0b25b5d710 100644 --- a/toolkit/mozapps/xpinstall/content/xpinstallItem.xml +++ b/toolkit/mozapps/xpinstall/content/xpinstallItem.xml @@ -38,6 +38,8 @@ onget="return this.getAttribute('url');"/> + diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/cancel.png b/toolkit/themes/gnomestripe/mozapps/extensions/cancel.png index 70607cce981..0d98ab23593 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/cancel.png and b/toolkit/themes/gnomestripe/mozapps/extensions/cancel.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/category-available.png b/toolkit/themes/gnomestripe/mozapps/extensions/category-available.png new file mode 100644 index 00000000000..689d526c9d6 Binary files /dev/null and b/toolkit/themes/gnomestripe/mozapps/extensions/category-available.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/category-discover.png b/toolkit/themes/gnomestripe/mozapps/extensions/category-discover.png index 622f4b67fa4..ccea27524f3 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/category-discover.png and b/toolkit/themes/gnomestripe/mozapps/extensions/category-discover.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/category-extensions.png b/toolkit/themes/gnomestripe/mozapps/extensions/category-extensions.png index 059ece73ed3..2ae95a5b287 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/category-extensions.png and b/toolkit/themes/gnomestripe/mozapps/extensions/category-extensions.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/category-languages.png b/toolkit/themes/gnomestripe/mozapps/extensions/category-languages.png index b9d3a9d997d..c7211590663 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/category-languages.png and b/toolkit/themes/gnomestripe/mozapps/extensions/category-languages.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/category-plugins.png b/toolkit/themes/gnomestripe/mozapps/extensions/category-plugins.png index be67023c047..b253dd08f9c 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/category-plugins.png and b/toolkit/themes/gnomestripe/mozapps/extensions/category-plugins.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/category-recent.png b/toolkit/themes/gnomestripe/mozapps/extensions/category-recent.png new file mode 100644 index 00000000000..9039b27aac6 Binary files /dev/null and b/toolkit/themes/gnomestripe/mozapps/extensions/category-recent.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/category-search.png b/toolkit/themes/gnomestripe/mozapps/extensions/category-search.png index 38d6c70ba04..52e91a7cead 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/category-search.png and b/toolkit/themes/gnomestripe/mozapps/extensions/category-search.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/category-searchengines.png b/toolkit/themes/gnomestripe/mozapps/extensions/category-searchengines.png index fab3701095a..b893cb48a20 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/category-searchengines.png and b/toolkit/themes/gnomestripe/mozapps/extensions/category-searchengines.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/category-themes.png b/toolkit/themes/gnomestripe/mozapps/extensions/category-themes.png index 8d33cad55a3..cde1c7834bb 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/category-themes.png and b/toolkit/themes/gnomestripe/mozapps/extensions/category-themes.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/gnomestripe/mozapps/extensions/extensionGeneric-16.png new file mode 100644 index 00000000000..b1a2f365212 Binary files /dev/null and b/toolkit/themes/gnomestripe/mozapps/extensions/extensionGeneric-16.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/xpinstall/xpinstallItemGeneric.png b/toolkit/themes/gnomestripe/mozapps/extensions/extensionGeneric.png similarity index 94% rename from toolkit/themes/gnomestripe/mozapps/xpinstall/xpinstallItemGeneric.png rename to toolkit/themes/gnomestripe/mozapps/extensions/extensionGeneric.png index 124abf1d003..2ae95a5b287 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/xpinstall/xpinstallItemGeneric.png and b/toolkit/themes/gnomestripe/mozapps/extensions/extensionGeneric.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css b/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css index 1ddcd729ad5..2b4605d29a1 100644 --- a/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css +++ b/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css @@ -313,13 +313,17 @@ margin: 7px 5px; width: 32px; height: 32px; - list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); } .addon[type="theme"] .icon { list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); } +.addon[type="locale"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + .addon[type="plugin"] .icon { list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } @@ -451,13 +455,17 @@ width: 32px; height: 32px; -moz-margin-end: 10px; - list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); } #detail-view[type="theme"] #detail-icon { list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); } +#detail-view[type="locale"] #detail-icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + #detail-view[type="plugin"] #detail-icon { list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/go-back.png b/toolkit/themes/gnomestripe/mozapps/extensions/go-back.png index 1a5492955cb..abc82881138 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/go-back.png and b/toolkit/themes/gnomestripe/mozapps/extensions/go-back.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/localeGeneric.png b/toolkit/themes/gnomestripe/mozapps/extensions/localeGeneric.png new file mode 100644 index 00000000000..c7211590663 Binary files /dev/null and b/toolkit/themes/gnomestripe/mozapps/extensions/localeGeneric.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/pause.png b/toolkit/themes/gnomestripe/mozapps/extensions/pause.png index 1a3f3ccdc3f..e98a58b9313 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/pause.png and b/toolkit/themes/gnomestripe/mozapps/extensions/pause.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/rating-not-won.png b/toolkit/themes/gnomestripe/mozapps/extensions/rating-not-won.png index b485790142e..13471ee0e40 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/rating-not-won.png and b/toolkit/themes/gnomestripe/mozapps/extensions/rating-not-won.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/rating-unrated.png b/toolkit/themes/gnomestripe/mozapps/extensions/rating-unrated.png index 1a2d8f3adc0..c6f59558a3e 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/rating-unrated.png and b/toolkit/themes/gnomestripe/mozapps/extensions/rating-unrated.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/rating-won.png b/toolkit/themes/gnomestripe/mozapps/extensions/rating-won.png index b4269924a95..c26d2dc2a0c 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/rating-won.png and b/toolkit/themes/gnomestripe/mozapps/extensions/rating-won.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/gnomestripe/mozapps/extensions/themeGeneric-16.png new file mode 100644 index 00000000000..019886fea5c Binary files /dev/null and b/toolkit/themes/gnomestripe/mozapps/extensions/themeGeneric-16.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/themeGeneric.png b/toolkit/themes/gnomestripe/mozapps/extensions/themeGeneric.png index dd70ee1b8e3..cde1c7834bb 100644 Binary files a/toolkit/themes/gnomestripe/mozapps/extensions/themeGeneric.png and b/toolkit/themes/gnomestripe/mozapps/extensions/themeGeneric.png differ diff --git a/toolkit/themes/gnomestripe/mozapps/jar.mn b/toolkit/themes/gnomestripe/mozapps/jar.mn index d9fcfabd996..073703f5be3 100644 --- a/toolkit/themes/gnomestripe/mozapps/jar.mn +++ b/toolkit/themes/gnomestripe/mozapps/jar.mn @@ -3,7 +3,6 @@ toolkit.jar: + skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) + skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) + skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) -+ skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) + 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/category-languages.png) @@ -11,6 +10,13 @@ toolkit.jar: + skin/classic/mozapps/extensions/category-extensions.png (extensions/category-extensions.png) + skin/classic/mozapps/extensions/category-themes.png (extensions/category-themes.png) + skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.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-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) ++ skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) + skin/classic/mozapps/extensions/go-back.png (extensions/go-back.png) + skin/classic/mozapps/extensions/rating-won.png (extensions/rating-won.png) + skin/classic/mozapps/extensions/rating-not-won.png (extensions/rating-not-won.png) @@ -28,7 +34,7 @@ toolkit.jar: + skin/classic/mozapps/plugins/pluginGeneric-16.png (plugins/pluginGeneric-16.png) + skin/classic/mozapps/profile/profileicon.png (profile/profileicon.png) + skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) -+ skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png (xpinstall/xpinstallItemGeneric.png) ++ skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png (extensions/extensionGeneric.png) #ifdef MOZ_PLACES + skin/classic/mozapps/places/defaultFavicon.png (places/defaultFavicon.png) + skin/classic/mozapps/places/tagContainerIcon.png (places/tagContainerIcon.png) diff --git a/toolkit/themes/pinstripe/mozapps/extensions/cancel.png b/toolkit/themes/pinstripe/mozapps/extensions/cancel.png index 70607cce981..0d98ab23593 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/cancel.png and b/toolkit/themes/pinstripe/mozapps/extensions/cancel.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/category-available.png b/toolkit/themes/pinstripe/mozapps/extensions/category-available.png new file mode 100644 index 00000000000..d1b737ab053 Binary files /dev/null and b/toolkit/themes/pinstripe/mozapps/extensions/category-available.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/category-discover.png b/toolkit/themes/pinstripe/mozapps/extensions/category-discover.png index 622f4b67fa4..a6f5b49b37f 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/category-discover.png and b/toolkit/themes/pinstripe/mozapps/extensions/category-discover.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/category-extensions.png b/toolkit/themes/pinstripe/mozapps/extensions/category-extensions.png index 059ece73ed3..6a76774c7bf 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/category-extensions.png and b/toolkit/themes/pinstripe/mozapps/extensions/category-extensions.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/category-languages.png b/toolkit/themes/pinstripe/mozapps/extensions/category-languages.png index b9d3a9d997d..4d9ac5ad895 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/category-languages.png and b/toolkit/themes/pinstripe/mozapps/extensions/category-languages.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/category-plugins.png b/toolkit/themes/pinstripe/mozapps/extensions/category-plugins.png index be67023c047..5c4d8bf4718 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/category-plugins.png and b/toolkit/themes/pinstripe/mozapps/extensions/category-plugins.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/category-recent.png b/toolkit/themes/pinstripe/mozapps/extensions/category-recent.png new file mode 100644 index 00000000000..7ecfc7d4c86 Binary files /dev/null and b/toolkit/themes/pinstripe/mozapps/extensions/category-recent.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/category-search.png b/toolkit/themes/pinstripe/mozapps/extensions/category-search.png index 38d6c70ba04..52e91a7cead 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/category-search.png and b/toolkit/themes/pinstripe/mozapps/extensions/category-search.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/category-searchengines.png b/toolkit/themes/pinstripe/mozapps/extensions/category-searchengines.png index fab3701095a..b893cb48a20 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/category-searchengines.png and b/toolkit/themes/pinstripe/mozapps/extensions/category-searchengines.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/category-themes.png b/toolkit/themes/pinstripe/mozapps/extensions/category-themes.png index 8d33cad55a3..be645f76df9 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/category-themes.png and b/toolkit/themes/pinstripe/mozapps/extensions/category-themes.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/pinstripe/mozapps/extensions/extensionGeneric-16.png new file mode 100644 index 00000000000..fc6c8a25835 Binary files /dev/null and b/toolkit/themes/pinstripe/mozapps/extensions/extensionGeneric-16.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/extensionGeneric.png b/toolkit/themes/pinstripe/mozapps/extensions/extensionGeneric.png new file mode 100644 index 00000000000..6a76774c7bf Binary files /dev/null and b/toolkit/themes/pinstripe/mozapps/extensions/extensionGeneric.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/extensions.css b/toolkit/themes/pinstripe/mozapps/extensions/extensions.css index 1ddcd729ad5..2b4605d29a1 100644 --- a/toolkit/themes/pinstripe/mozapps/extensions/extensions.css +++ b/toolkit/themes/pinstripe/mozapps/extensions/extensions.css @@ -313,13 +313,17 @@ margin: 7px 5px; width: 32px; height: 32px; - list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); } .addon[type="theme"] .icon { list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); } +.addon[type="locale"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + .addon[type="plugin"] .icon { list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } @@ -451,13 +455,17 @@ width: 32px; height: 32px; -moz-margin-end: 10px; - list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); } #detail-view[type="theme"] #detail-icon { list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); } +#detail-view[type="locale"] #detail-icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + #detail-view[type="plugin"] #detail-icon { list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } diff --git a/toolkit/themes/pinstripe/mozapps/extensions/go-back.png b/toolkit/themes/pinstripe/mozapps/extensions/go-back.png index 1a5492955cb..abc82881138 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/go-back.png and b/toolkit/themes/pinstripe/mozapps/extensions/go-back.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/localeGeneric.png b/toolkit/themes/pinstripe/mozapps/extensions/localeGeneric.png new file mode 100644 index 00000000000..4d9ac5ad895 Binary files /dev/null and b/toolkit/themes/pinstripe/mozapps/extensions/localeGeneric.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/pause.png b/toolkit/themes/pinstripe/mozapps/extensions/pause.png index 1a3f3ccdc3f..e98a58b9313 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/pause.png and b/toolkit/themes/pinstripe/mozapps/extensions/pause.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/rating-not-won.png b/toolkit/themes/pinstripe/mozapps/extensions/rating-not-won.png index b485790142e..13471ee0e40 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/rating-not-won.png and b/toolkit/themes/pinstripe/mozapps/extensions/rating-not-won.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/rating-unrated.png b/toolkit/themes/pinstripe/mozapps/extensions/rating-unrated.png index 1a2d8f3adc0..c6f59558a3e 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/rating-unrated.png and b/toolkit/themes/pinstripe/mozapps/extensions/rating-unrated.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/rating-won.png b/toolkit/themes/pinstripe/mozapps/extensions/rating-won.png index b4269924a95..c26d2dc2a0c 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/rating-won.png and b/toolkit/themes/pinstripe/mozapps/extensions/rating-won.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/pinstripe/mozapps/extensions/themeGeneric-16.png new file mode 100644 index 00000000000..190bb30d717 Binary files /dev/null and b/toolkit/themes/pinstripe/mozapps/extensions/themeGeneric-16.png differ diff --git a/toolkit/themes/pinstripe/mozapps/extensions/themeGeneric.png b/toolkit/themes/pinstripe/mozapps/extensions/themeGeneric.png index f7bd89481a1..be645f76df9 100644 Binary files a/toolkit/themes/pinstripe/mozapps/extensions/themeGeneric.png and b/toolkit/themes/pinstripe/mozapps/extensions/themeGeneric.png differ diff --git a/toolkit/themes/pinstripe/mozapps/jar.mn b/toolkit/themes/pinstripe/mozapps/jar.mn index 283d55daed5..6c2f0952335 100644 --- a/toolkit/themes/pinstripe/mozapps/jar.mn +++ b/toolkit/themes/pinstripe/mozapps/jar.mn @@ -5,7 +5,6 @@ toolkit.jar: skin/classic/mozapps/downloads/downloadStatusIcon.png (downloads/downloadStatusIcon.png) * skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) skin/classic/mozapps/downloads/unknownContentType.css (downloads/unknownContentType.css) - skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) 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/category-languages.png) @@ -13,6 +12,13 @@ toolkit.jar: skin/classic/mozapps/extensions/category-extensions.png (extensions/category-extensions.png) skin/classic/mozapps/extensions/category-themes.png (extensions/category-themes.png) skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.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-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) + skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) skin/classic/mozapps/extensions/go-back.png (extensions/go-back.png) skin/classic/mozapps/extensions/rating-won.png (extensions/rating-won.png) skin/classic/mozapps/extensions/rating-not-won.png (extensions/rating-not-won.png) @@ -45,7 +51,7 @@ toolkit.jar: skin/classic/mozapps/update/buttons.png (update/buttons.png) * skin/classic/mozapps/update/updates.css (update/updates.css) skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) - skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png (xpinstall/xpinstallItemGeneric.png) + skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png (extensions/extensionGeneric.png) skin/classic/mozapps/xpinstall/xpinstallConfirm.css (xpinstall/xpinstallConfirm.css) #ifdef MOZ_PLACES skin/classic/mozapps/places/defaultFavicon.png (places/defaultFavicon.png) diff --git a/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallConfirm.css b/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallConfirm.css index e149e82ce15..6ed04be6e0b 100644 --- a/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallConfirm.css +++ b/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallConfirm.css @@ -66,6 +66,17 @@ installitem { .xpinstallItemIcon { max-width: 32px; max-height: 32px; - list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); } +installitem[type="theme"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +installitem[type="locale"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +installitem[type="plugin"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} diff --git a/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallItemGeneric.png b/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallItemGeneric.png deleted file mode 100644 index a86d0070049..00000000000 Binary files a/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallItemGeneric.png and /dev/null differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/cancel.png b/toolkit/themes/winstripe/mozapps/extensions/cancel.png index 70607cce981..0d98ab23593 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/cancel.png and b/toolkit/themes/winstripe/mozapps/extensions/cancel.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-available-aero.png b/toolkit/themes/winstripe/mozapps/extensions/category-available-aero.png new file mode 100644 index 00000000000..9341f2aa7b2 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/category-available-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-available.png b/toolkit/themes/winstripe/mozapps/extensions/category-available.png new file mode 100644 index 00000000000..d1b737ab053 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/category-available.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-discover-aero.png b/toolkit/themes/winstripe/mozapps/extensions/category-discover-aero.png new file mode 100644 index 00000000000..af954a61354 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/category-discover-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-discover.png b/toolkit/themes/winstripe/mozapps/extensions/category-discover.png index 622f4b67fa4..a6f5b49b37f 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/category-discover.png and b/toolkit/themes/winstripe/mozapps/extensions/category-discover.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-extensions-aero.png b/toolkit/themes/winstripe/mozapps/extensions/category-extensions-aero.png new file mode 100644 index 00000000000..7756f973b27 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/category-extensions-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-extensions.png b/toolkit/themes/winstripe/mozapps/extensions/category-extensions.png index 059ece73ed3..6a76774c7bf 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/category-extensions.png and b/toolkit/themes/winstripe/mozapps/extensions/category-extensions.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-languages-aero.png b/toolkit/themes/winstripe/mozapps/extensions/category-languages-aero.png new file mode 100644 index 00000000000..623ba3a6a2d Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/category-languages-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-languages.png b/toolkit/themes/winstripe/mozapps/extensions/category-languages.png index b9d3a9d997d..4d9ac5ad895 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/category-languages.png and b/toolkit/themes/winstripe/mozapps/extensions/category-languages.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-plugins-aero.png b/toolkit/themes/winstripe/mozapps/extensions/category-plugins-aero.png new file mode 100644 index 00000000000..100a90307b9 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/category-plugins-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-plugins.png b/toolkit/themes/winstripe/mozapps/extensions/category-plugins.png index be67023c047..5c4d8bf4718 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/category-plugins.png and b/toolkit/themes/winstripe/mozapps/extensions/category-plugins.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-recent-aero.png b/toolkit/themes/winstripe/mozapps/extensions/category-recent-aero.png new file mode 100644 index 00000000000..d6515864655 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/category-recent-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-recent.png b/toolkit/themes/winstripe/mozapps/extensions/category-recent.png new file mode 100644 index 00000000000..7ecfc7d4c86 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/category-recent.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-search.png b/toolkit/themes/winstripe/mozapps/extensions/category-search.png index 38d6c70ba04..52e91a7cead 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/category-search.png and b/toolkit/themes/winstripe/mozapps/extensions/category-search.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-searchengines.png b/toolkit/themes/winstripe/mozapps/extensions/category-searchengines.png index fab3701095a..b893cb48a20 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/category-searchengines.png and b/toolkit/themes/winstripe/mozapps/extensions/category-searchengines.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-themes-aero.png b/toolkit/themes/winstripe/mozapps/extensions/category-themes-aero.png new file mode 100644 index 00000000000..9cea549dd82 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/category-themes-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/category-themes.png b/toolkit/themes/winstripe/mozapps/extensions/category-themes.png index 8d33cad55a3..be645f76df9 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/category-themes.png and b/toolkit/themes/winstripe/mozapps/extensions/category-themes.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric-16-aero.png b/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric-16-aero.png new file mode 100644 index 00000000000..2724b9e7c68 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric-16-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric-16.png new file mode 100644 index 00000000000..36e7689a308 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric-16.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric-aero.png b/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric-aero.png new file mode 100644 index 00000000000..7756f973b27 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric.png b/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric.png new file mode 100644 index 00000000000..6a76774c7bf Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/extensionGeneric.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/extensions.css b/toolkit/themes/winstripe/mozapps/extensions/extensions.css index 1ddcd729ad5..2b4605d29a1 100644 --- a/toolkit/themes/winstripe/mozapps/extensions/extensions.css +++ b/toolkit/themes/winstripe/mozapps/extensions/extensions.css @@ -313,13 +313,17 @@ margin: 7px 5px; width: 32px; height: 32px; - list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); } .addon[type="theme"] .icon { list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); } +.addon[type="locale"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + .addon[type="plugin"] .icon { list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } @@ -451,13 +455,17 @@ width: 32px; height: 32px; -moz-margin-end: 10px; - list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); } #detail-view[type="theme"] #detail-icon { list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); } +#detail-view[type="locale"] #detail-icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + #detail-view[type="plugin"] #detail-icon { list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } diff --git a/toolkit/themes/winstripe/mozapps/extensions/go-back.png b/toolkit/themes/winstripe/mozapps/extensions/go-back.png index 1a5492955cb..abc82881138 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/go-back.png and b/toolkit/themes/winstripe/mozapps/extensions/go-back.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/localeGeneric-aero.png b/toolkit/themes/winstripe/mozapps/extensions/localeGeneric-aero.png new file mode 100644 index 00000000000..623ba3a6a2d Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/localeGeneric-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/localeGeneric.png b/toolkit/themes/winstripe/mozapps/extensions/localeGeneric.png new file mode 100644 index 00000000000..4d9ac5ad895 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/localeGeneric.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/pause.png b/toolkit/themes/winstripe/mozapps/extensions/pause.png index 1a3f3ccdc3f..e98a58b9313 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/pause.png and b/toolkit/themes/winstripe/mozapps/extensions/pause.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/rating-not-won.png b/toolkit/themes/winstripe/mozapps/extensions/rating-not-won.png index b485790142e..13471ee0e40 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/rating-not-won.png and b/toolkit/themes/winstripe/mozapps/extensions/rating-not-won.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/rating-unrated.png b/toolkit/themes/winstripe/mozapps/extensions/rating-unrated.png index 1a2d8f3adc0..c6f59558a3e 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/rating-unrated.png and b/toolkit/themes/winstripe/mozapps/extensions/rating-unrated.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/rating-won.png b/toolkit/themes/winstripe/mozapps/extensions/rating-won.png index b4269924a95..c26d2dc2a0c 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/rating-won.png and b/toolkit/themes/winstripe/mozapps/extensions/rating-won.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/themeGeneric-16-aero.png b/toolkit/themes/winstripe/mozapps/extensions/themeGeneric-16-aero.png new file mode 100644 index 00000000000..ff13ce37f78 Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/themeGeneric-16-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/winstripe/mozapps/extensions/themeGeneric-16.png new file mode 100644 index 00000000000..16d77a4a25a Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/extensions/themeGeneric-16.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/themeGeneric-aero.png b/toolkit/themes/winstripe/mozapps/extensions/themeGeneric-aero.png index a7121c55134..9cea549dd82 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/themeGeneric-aero.png and b/toolkit/themes/winstripe/mozapps/extensions/themeGeneric-aero.png differ diff --git a/toolkit/themes/winstripe/mozapps/extensions/themeGeneric.png b/toolkit/themes/winstripe/mozapps/extensions/themeGeneric.png index ff4f21f9a61..be645f76df9 100644 Binary files a/toolkit/themes/winstripe/mozapps/extensions/themeGeneric.png and b/toolkit/themes/winstripe/mozapps/extensions/themeGeneric.png differ diff --git a/toolkit/themes/winstripe/mozapps/jar.mn b/toolkit/themes/winstripe/mozapps/jar.mn index b124aeb5b74..c623c56439c 100644 --- a/toolkit/themes/winstripe/mozapps/jar.mn +++ b/toolkit/themes/winstripe/mozapps/jar.mn @@ -11,7 +11,6 @@ toolkit.jar: skin/classic/mozapps/extensions/blocklist.css (extensions/blocklist.css) skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) skin/classic/mozapps/extensions/update.css (extensions/update.css) - skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) 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/category-languages.png) @@ -19,6 +18,13 @@ toolkit.jar: skin/classic/mozapps/extensions/category-extensions.png (extensions/category-extensions.png) skin/classic/mozapps/extensions/category-themes.png (extensions/category-themes.png) skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.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-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) + skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) skin/classic/mozapps/extensions/go-back.png (extensions/go-back.png) skin/classic/mozapps/extensions/rating-won.png (extensions/rating-won.png) skin/classic/mozapps/extensions/rating-not-won.png (extensions/rating-not-won.png) @@ -53,7 +59,7 @@ toolkit.jar: skin/classic/mozapps/update/updates.css (update/updates.css) skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) * skin/classic/mozapps/xpinstall/xpinstallConfirm.css (xpinstall/xpinstallConfirm.css) - skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png (xpinstall/xpinstallItemGeneric.png) + skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png (extensions/extensionGeneric-aero.png) #ifdef XP_WIN toolkit.jar: @@ -68,12 +74,19 @@ toolkit.jar: skin/classic/aero/mozapps/extensions/update.css (extensions/update.css) skin/classic/aero/mozapps/extensions/themeGeneric.png (extensions/themeGeneric-aero.png) skin/classic/aero/mozapps/extensions/category-search.png (extensions/category-search.png) - skin/classic/aero/mozapps/extensions/category-discover.png (extensions/category-discover.png) - skin/classic/aero/mozapps/extensions/category-languages.png (extensions/category-languages.png) + skin/classic/aero/mozapps/extensions/category-discover.png (extensions/category-discover-aero.png) + skin/classic/aero/mozapps/extensions/category-languages.png (extensions/category-languages-aero.png) skin/classic/aero/mozapps/extensions/category-searchengines.png (extensions/category-searchengines.png) - skin/classic/aero/mozapps/extensions/category-extensions.png (extensions/category-extensions.png) - skin/classic/aero/mozapps/extensions/category-themes.png (extensions/category-themes.png) - skin/classic/aero/mozapps/extensions/category-plugins.png (extensions/category-plugins.png) + skin/classic/aero/mozapps/extensions/category-extensions.png (extensions/category-extensions-aero.png) + skin/classic/aero/mozapps/extensions/category-themes.png (extensions/category-themes-aero.png) + skin/classic/aero/mozapps/extensions/category-plugins.png (extensions/category-plugins-aero.png) + skin/classic/aero/mozapps/extensions/category-recent.png (extensions/category-recent-aero.png) + skin/classic/aero/mozapps/extensions/category-available.png (extensions/category-available-aero.png) + skin/classic/aero/mozapps/extensions/extensionGeneric.png (extensions/extensionGeneric-aero.png) + skin/classic/aero/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16-aero.png) + skin/classic/aero/mozapps/extensions/themeGeneric.png (extensions/themeGeneric-aero.png) + skin/classic/aero/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16-aero.png) + skin/classic/aero/mozapps/extensions/localeGeneric.png (extensions/localeGeneric-aero.png) skin/classic/aero/mozapps/extensions/go-back.png (extensions/go-back.png) skin/classic/aero/mozapps/extensions/rating-won.png (extensions/rating-won.png) skin/classic/aero/mozapps/extensions/rating-not-won.png (extensions/rating-not-won.png) @@ -108,5 +121,5 @@ toolkit.jar: skin/classic/aero/mozapps/update/updates.css (update/updates.css) skin/classic/aero/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) * skin/classic/aero/mozapps/xpinstall/xpinstallConfirm.css (xpinstall/xpinstallConfirm.css) - skin/classic/aero/mozapps/xpinstall/xpinstallItemGeneric.png (xpinstall/xpinstallItemGeneric-aero.png) + skin/classic/aero/mozapps/xpinstall/xpinstallItemGeneric.png (extensions/extensionGeneric-aero.png) #endif diff --git a/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallConfirm.css b/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallConfirm.css index 111d3b5c695..c75e94b1b4f 100644 --- a/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallConfirm.css +++ b/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallConfirm.css @@ -77,5 +77,17 @@ installitem { .xpinstallItemIcon { max-width: 32px; max-height: 32px; - list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); +} + +installitem[type="theme"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +installitem[type="locale"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +installitem[type="plugin"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } diff --git a/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallItemGeneric-aero.png b/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallItemGeneric-aero.png deleted file mode 100644 index 4b8ad68821c..00000000000 Binary files a/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallItemGeneric-aero.png and /dev/null differ diff --git a/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallItemGeneric.png b/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallItemGeneric.png deleted file mode 100644 index 2718f7f41cc..00000000000 Binary files a/toolkit/themes/winstripe/mozapps/xpinstall/xpinstallItemGeneric.png and /dev/null differ