Bug 1347928 - Remove legacy information-*.png icons. r?jaws
MozReview-Commit-ID: 47FAxEjg4KG
--- a/browser/components/migration/content/aboutWelcomeBack.xhtml
+++ b/browser/components/migration/content/aboutWelcomeBack.xhtml
@@ -15,17 +15,17 @@
%restorepageDTD;
]>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<head>
<title>&welcomeback2.tabtitle;</title>
<link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css" media="all"/>
<link rel="stylesheet" href="chrome://browser/skin/aboutWelcomeBack.css" type="text/css" media="all"/>
- <link rel="icon" type="image/png" href="chrome://global/skin/icons/information-16.png"/>
+ <link rel="icon" type="image/png" href="chrome://browser/skin/info.svg"/>
<script type="application/javascript" src="chrome://browser/content/aboutSessionRestore.js"/>
</head>
<body dir="&locale.dir;">
<div class="container">
--- a/browser/themes/shared/aboutProviderDirectory.css
+++ b/browser/themes/shared/aboutProviderDirectory.css
@@ -2,17 +2,17 @@
body {
width: 310px;
margin: 1em auto;
}
#message-box {
margin-top: 2em;
- background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px;
+ background: url(chrome://browser/skin/info.svg) no-repeat left 8px;
padding-inline-start: 30px;
}
#activation-frame {
border: none;
margin: 0;
width: 310px;
height: 200px;
--- a/devtools/client/shared/components/notification-box.css
+++ b/devtools/client/shared/components/notification-box.css
@@ -46,25 +46,26 @@
.notificationbox .notification[data-type="critical"] {
color: white;
background-image: linear-gradient(rgb(212,0,0), rgb(152,0,0));
}
.notificationbox .messageImage {
display: inline-block;
+ background-size: 16px;
width: 16px;
height: 16px;
margin: 6px;
}
/* Default icons for notifications */
.notificationbox .messageImage[data-type="info"] {
- background-image: url("chrome://global/skin/icons/information-16.png");
+ background-image: url("chrome://global/skin/icons/info.svg");
}
.notificationbox .messageImage[data-type="warning"] {
background-image: url("chrome://global/skin/icons/warning-16.png");
}
.notificationbox .messageImage[data-type="critical"] {
background-image: url("chrome://global/skin/icons/error-16.png");
--- a/toolkit/components/places/tests/unifiedcomplete/test_autofill_default_behavior.js
+++ b/toolkit/components/places/tests/unifiedcomplete/test_autofill_default_behavior.js
@@ -19,17 +19,17 @@ add_task(function* test_default_behavior
{ uri: uri2, title: "visited" },
{ uri: uri4, title: "tpbk", transition: TRANSITION_TYPED },
{ uri: uri6, title: "secure", transition: TRANSITION_TYPED },
]);
yield addBookmark( { uri: uri3, title: "bookmarked" } );
yield addBookmark( { uri: uri4, title: "tpbk" } );
yield addBookmark( { uri: uri5, title: "title", tags: ["foo"] } );
- yield setFaviconForHref(uri1.spec, "chrome://global/skin/icons/information-16.png");
+ yield setFaviconForHref(uri1.spec, "chrome://global/skin/icons/info.svg");
yield setFaviconForHref(uri3.spec, "chrome://global/skin/icons/error-16.png");
yield setFaviconForHref(uri6.spec, "chrome://global/skin/icons/question-16.png");
// RESTRICT TO HISTORY.
Services.prefs.setBoolPref("browser.urlbar.suggest.history", true);
Services.prefs.setBoolPref("browser.urlbar.suggest.history.onlyTyped", false);
Services.prefs.setBoolPref("browser.urlbar.suggest.bookmark", false);
@@ -40,17 +40,17 @@ add_task(function* test_default_behavior
autofilled: "vi",
completed: "vi"
});
do_print("Restrict history, typed visit, should autoFill");
yield check_autocomplete({
search: "ty",
matches: [ { uri: uri1, title: "typed", style: [ "autofill", "heuristic" ],
- icon: "chrome://global/skin/icons/information-16.png" } ],
+ icon: "chrome://global/skin/icons/info.svg" } ],
autofilled: "typed/",
completed: "typed/"
});
do_print("Restrict history, secure typed visit, should autoFill with https");
yield check_autocomplete({
search: "secure",
matches: [ { uri: uri6, title: "https://secure", style: [ "autofill", "heuristic" ],
@@ -111,17 +111,17 @@ add_task(function* test_default_behavior
autofilled: "vi",
completed: "vi"
});
do_print("Restrict typed, typed visit, autofill.typed = false, should autoFill");
yield check_autocomplete({
search: "ty",
matches: [ { uri: uri1, title: "typed", style: [ "autofill", "heuristic" ],
- icon: "chrome://global/skin/icons/information-16.png"} ],
+ icon: "chrome://global/skin/icons/info.svg"} ],
autofilled: "typed/",
completed: "typed/"
});
do_print("Restrict typed, bookmark, autofill.typed = false, should not autoFill");
yield check_autocomplete({
search: "bo",
matches: [ ],
@@ -218,17 +218,17 @@ add_task(function* test_default_behavior
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "typed", transition: TRANSITION_TYPED },
{ uri: uri2, title: "visited" },
{ uri: uri4, title: "tpbk", transition: TRANSITION_TYPED },
]);
yield addBookmark( { uri: uri3, title: "bookmarked" } );
yield addBookmark( { uri: uri4, title: "tpbk" } );
- yield setFaviconForHref(uri1.spec, "chrome://global/skin/icons/information-16.png");
+ yield setFaviconForHref(uri1.spec, "chrome://global/skin/icons/info.svg");
yield setFaviconForHref(uri3.spec, "chrome://global/skin/icons/error-16.png");
// RESTRICT TO HISTORY.
Services.prefs.setBoolPref("browser.urlbar.suggest.history", true);
Services.prefs.setBoolPref("browser.urlbar.suggest.history.onlyTyped", false);
Services.prefs.setBoolPref("browser.urlbar.suggest.bookmark", false);
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
Services.prefs.setBoolPref("browser.urlbar.autoFill.searchEngines", false);
@@ -240,17 +240,17 @@ add_task(function* test_default_behavior
autofilled: "visited/v",
completed: "visited/v"
});
do_print("URL: Restrict history, typed visit, should autoFill");
yield check_autocomplete({
search: "typed/t",
matches: [ { uri: uri1, title: "typed/ty/", style: [ "autofill", "heuristic" ],
- icon: "chrome://global/skin/icons/information-16.png"} ],
+ icon: "chrome://global/skin/icons/info.svg"} ],
autofilled: "typed/ty/",
completed: "http://typed/ty/"
});
// Don't autoFill this one cause it's not typed.
do_print("URL: Restrict history, bookmark, should not autoFill");
yield check_autocomplete({
search: "bookmarked/b",
--- a/toolkit/components/places/tests/unit/test_bookmarks_html.js
+++ b/toolkit/components/places/tests/unit/test_bookmarks_html.js
@@ -171,17 +171,17 @@ add_task(function* test_import_chromefav
// 4. empty bookmarks db
// 5. import bookmarks.exported.html
// 6. run the test-suite
// 7. remove the bookmark pointing to a chrome favicon.
// 8. export to bookmarks.exported.html
// 9. empty bookmarks db and continue
const PAGE_URI = NetUtil.newURI("http://example.com/chromefavicon_page");
- const CHROME_FAVICON_URI = NetUtil.newURI("chrome://global/skin/icons/information-16.png");
+ const CHROME_FAVICON_URI = NetUtil.newURI("chrome://global/skin/icons/info.svg");
const CHROME_FAVICON_URI_2 = NetUtil.newURI("chrome://global/skin/icons/error-16.png");
do_print("Importing from html");
yield BookmarkHTMLUtils.importFromFile(gBookmarksFileNew, true);
yield PlacesTestUtils.promiseAsyncUpdates();
do_print("Insert bookmark");
yield PlacesUtils.bookmarks.insert({
--- a/toolkit/themes/osx/global/global.css
+++ b/toolkit/themes/osx/global/global.css
@@ -66,17 +66,17 @@ window.dialog {
.question-icon {
width: 64px;
height: 64px;
margin: 6px;
margin-inline-end: 20px;
}
.message-icon {
- list-style-image: url("chrome://global/skin/icons/information-64.png");
+ list-style-image: url("chrome://global/skin/icons/info.svg");
}
.alert-dialog #info\.icon,
.alert-icon {
list-style-image: url("chrome://global/skin/icons/warning-64.png");
}
.error-icon {
deleted file mode 100644
index 6fb2e3a80421bb3e150f4b33aac7860c1f8282b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6907d02e5f80f56e927461e4e5186a2e30bae5ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4501bc813a0ee502fdea711dfb2f4a37cac8abfe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8d9b72498ed340f8c52dd8b2c0677e51fc9e3aac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3912f1c79aba05b623e2efa110bc33af2241e36c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -86,21 +86,16 @@ toolkit.jar:
skin/classic/global/icons/chevron@2x.png (icons/chevron@2x.png)
skin/classic/global/icons/chevron-inverted@2x.png (icons/chevron-inverted@2x.png)
skin/classic/global/icons/checkbox.png (icons/checkbox.png)
skin/classic/global/icons/checkbox@2x.png (icons/checkbox@2x.png)
skin/classic/global/icons/close.png (icons/close.png)
skin/classic/global/icons/close@2x.png (icons/close@2x.png)
skin/classic/global/icons/glyph-dropdown.png (icons/glyph-dropdown.png)
skin/classic/global/icons/glyph-dropdown@2x.png (icons/glyph-dropdown@2x.png)
- skin/classic/global/icons/information-16.png (icons/information-16.png)
- skin/classic/global/icons/information-24.png (icons/information-24.png)
- skin/classic/global/icons/information-32.png (icons/information-32.png)
- skin/classic/global/icons/information-64.png (icons/information-64.png)
- skin/classic/global/icons/information-large.png (icons/information-large.png)
skin/classic/global/icons/menulist-dropmarker.png (icons/menulist-dropmarker.png)
skin/classic/global/icons/notfound.png (icons/notfound.png)
skin/classic/global/icons/panebutton-active.png (icons/panebutton-active.png)
skin/classic/global/icons/panebutton-inactive.png (icons/panebutton-inactive.png)
skin/classic/global/icons/panel-dropmarker.png (icons/panel-dropmarker.png)
skin/classic/global/icons/resizer.png (icons/resizer.png)
skin/classic/global/icons/resizer@2x.png (icons/resizer@2x.png)
skin/classic/global/icons/resizer-rtl.png (icons/resizer-rtl.png)
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -63,19 +63,16 @@
skin/classic/global/icons/close-inverted.png (../../windows/global/icons/close-inverted.png)
skin/classic/global/icons/close-inverted@2x.png (../../windows/global/icons/close-inverted@2x.png)
skin/classic/global/icons/collapse.png (../../windows/global/icons/collapse.png)
skin/classic/global/icons/Error.png (../../windows/global/icons/Error.png)
skin/classic/global/icons/error-16.png (../../windows/global/icons/error-16.png)
skin/classic/global/icons/error-64.png (../../windows/global/icons/error-64.png)
skin/classic/global/icons/expand.png (../../windows/global/icons/expand.png)
skin/classic/global/icons/folder-item.png (../../windows/global/icons/folder-item.png)
- skin/classic/global/icons/information-16.png (../../windows/global/icons/information-16.png)
- skin/classic/global/icons/information-24.png (../../windows/global/icons/information-24.png)
- skin/classic/global/icons/information-32.png (../../windows/global/icons/information-32.png)
skin/classic/global/icons/Minimize.gif (../../windows/global/icons/Minimize.gif)
skin/classic/global/icons/Print-preview.png (../../windows/global/icons/Print-preview.png)
skin/classic/global/icons/Portrait.png (../../windows/global/icons/Portrait.png)
skin/classic/global/icons/Landscape.png (../../windows/global/icons/Landscape.png)
skin/classic/global/icons/Question.png (../../windows/global/icons/Question.png)
skin/classic/global/icons/question-16.png (../../windows/global/icons/question-16.png)
skin/classic/global/icons/question-64.png (../../windows/global/icons/question-64.png)
skin/classic/global/icons/resizer-rtl.png (../../windows/global/icons/resizer-rtl.png)
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -56,17 +56,17 @@ window.dialog {
.alert-icon,
.error-icon,
.question-icon {
width: 32px;
height: 32px;
}
.message-icon {
- list-style-image: url("chrome://global/skin/icons/information-32.png");
+ list-style-image: url("chrome://global/skin/icons/info.svg");
}
.alert-dialog #info\.icon,
.alert-icon {
list-style-image: url("chrome://global/skin/icons/Warning.png");
}
.error-icon {
deleted file mode 100644
index e23f9c3fed37bee0787ae3b2c2c97042cba18fe4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a2a64a4fc198aa09a732fa0ecd2eeeff1d4ac1a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -38,16 +38,17 @@ toolkit.jar:
skin/classic/global/dirListing/remote.png (dirListing/remote.png)
skin/classic/global/icons/autocomplete-search.svg (icons/autocomplete-search.svg)
skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png)
skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png)
skin/classic/global/icons/close-win7.png (icons/close-win7.png)
skin/classic/global/icons/close-win7@2x.png (icons/close-win7@2x.png)
skin/classic/global/icons/close-inverted-win7.png (icons/close-inverted-win7.png)
skin/classic/global/icons/close-inverted-win7@2x.png (icons/close-inverted-win7@2x.png)
+ skin/classic/global/icons/information-16.png (icons/information-16.png)
skin/classic/global/icons/resizer.png (icons/resizer.png)
skin/classic/global/icons/sslWarning.png (icons/sslWarning.png)
* skin/classic/global/in-content/common.css (in-content/common.css)
* skin/classic/global/in-content/info-pages.css (in-content/info-pages.css)
skin/classic/global/toolbar/spring.png (toolbar/spring.png)
skin/classic/global/icons/autoscroll.png (icons/autoscroll.png)
skin/classic/global/tree/twisty.svg (tree/twisty.svg)
