Merge mozilla-central to mozilla-inbound
authorDorel Luca <dluca@mozilla.com>
Sun, 23 Sep 2018 00:48:05 +0300
changeset 493548 64e0354439554bd928cdd999823d5e3b6e911a3b
parent 493547 52ee9ddf50602cea9c21dd3855c376f62232a289 (current diff)
parent 493544 221c18ebe962f68358b4cba927df9099ea935b40 (diff)
child 493549 70160e10c6047e49c7d2cc0d7b11dfa531a0b8d3
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to mozilla-inbound
toolkit/themes/windows/global/icons/Question.png
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -76,28 +76,24 @@ window.dialog {
   height: 32px;
 }
 
 .error-icon {
   list-style-image: url("chrome://global/skin/icons/Error.png");
 }
 
 .question-icon {
-  list-style-image: url("chrome://global/skin/icons/Question.png");
+  list-style-image: url("chrome://global/skin/icons/help.svg");
 }
 
 @media (min-resolution: 1.1dppx) {
   .alert-dialog #info\.icon,
   .alert-icon {
     list-style-image: url("chrome://global/skin/icons/warning-64.png");
   }
-
-  .question-icon {
-    list-style-image: url("chrome://global/skin/icons/question-64.png");
-  }
 }
 
 /* ::::: iframe ::::: */
 
 iframe {
   border: none;
   width: 100px;
   height: 100px;
deleted file mode 100644
index fde01ad88136abb51eef21386216d2717a77e23d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -44,14 +44,13 @@ toolkit.jar:
   skin/classic/global/icons/blacklist_large.png            (icons/blacklist_large.png)
   skin/classic/global/icons/Error.png                      (icons/Error.png)
   skin/classic/global/icons/collapse.png                   (icons/collapse.png)
   skin/classic/global/icons/expand.png                     (icons/expand.png)
   skin/classic/global/icons/Landscape.png                  (icons/Landscape.png)
   skin/classic/global/icons/Portrait.png                   (icons/Portrait.png)
   skin/classic/global/icons/Print-preview.png              (icons/Print-preview.png)
   skin/classic/global/icons/Search-close.png               (icons/Search-close.png)
-  skin/classic/global/icons/Question.png                   (icons/Question.png)
   skin/classic/global/icons/sslWarning.png                 (icons/sslWarning.png)
   skin/classic/global/icons/warning-large.png              (icons/warning-large.png)
   skin/classic/global/icons/windowControls.png             (icons/windowControls.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)