Bug 1409148 - Drop the old contentPluginClose.png icon and replace it with the modern svg version. r=johannh
authorFelipe Gomes <felipc@gmail.com>
Fri, 10 Nov 2017 14:05:00 -0200
changeset 444560 b2be5cae24f422d84fa552943db4a048b2a1a3dc
parent 444559 28d0928fdfa54ec9734b9bcf72ea1911bde295c2
child 444561 c21d184abbb02e743ad0a9fb7ef117779d0e7a52
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjohannh
bugs1409148
milestone58.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
Bug 1409148 - Drop the old contentPluginClose.png icon and replace it with the modern svg version. r=johannh This also updates its :hover and :active visuals to match the tab bar MozReview-Commit-ID: 98LiqClr3SG
caps/tests/mochitest/test_bug292789.html
toolkit/themes/shared/mozapps.inc.mn
toolkit/themes/shared/plugins/contentPluginClose.png
toolkit/themes/shared/plugins/pluginProblem.css
--- a/caps/tests/mochitest/test_bug292789.html
+++ b/caps/tests/mochitest/test_bug292789.html
@@ -51,18 +51,18 @@ function testScriptSrc(aCallback) {
       // trigger the callback
       if (aCallback)
         aCallback();
     }
 }
 
 /** <img src=""> tests **/
 var img_global = "chrome://global/skin/media/error.png";
-var img_mozapps = "chrome://mozapps/skin/plugins/contentPluginClose.png";
-var res_mozapps = "resource://gre/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginClose.png";
+var img_mozapps = "chrome://mozapps/skin/plugins/contentPluginCrashed.png";
+var res_mozapps = "resource://gre/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png";
 
 var imgTests = [[img_global, "success"],
                 [img_mozapps, "fail"],
                 [res_mozapps, "success"]];
 
 var curImgTest = 0;
 
 function runImgTest() {
--- a/toolkit/themes/shared/mozapps.inc.mn
+++ b/toolkit/themes/shared/mozapps.inc.mn
@@ -29,17 +29,16 @@
   skin/classic/mozapps/plugins/pluginProblem.css             (../../shared/plugins/pluginProblem.css)
   skin/classic/mozapps/aboutNetworking.css                   (../../shared/aboutNetworking.css)
 #ifndef ANDROID
   skin/classic/mozapps/aboutProfiles.css                     (../../shared/aboutProfiles.css)
 #endif
   skin/classic/mozapps/aboutServiceWorkers.css               (../../shared/aboutServiceWorkers.css)
   skin/classic/mozapps/plugins/contentPluginActivate.png     (../../shared/plugins/contentPluginActivate.png)
   skin/classic/mozapps/plugins/contentPluginBlocked.png      (../../shared/plugins/contentPluginBlocked.png)
-  skin/classic/mozapps/plugins/contentPluginClose.png        (../../shared/plugins/contentPluginClose.png)
   skin/classic/mozapps/plugins/contentPluginCrashed.png      (../../shared/plugins/contentPluginCrashed.png)
   skin/classic/mozapps/plugins/contentPluginStripe.png       (../../shared/plugins/contentPluginStripe.png)
 
 % override chrome://mozapps/skin/extensions/category-plugins.svg          chrome://mozapps/skin/plugins/pluginGeneric.svg
 % override chrome://mozapps/skin/extensions/category-extensions.svg       chrome://mozapps/skin/extensions/extensionGeneric.svg
 % override chrome://mozapps/skin/extensions/category-languages.svg        chrome://mozapps/skin/extensions/localeGeneric.svg
 % override chrome://mozapps/skin/extensions/category-themes.svg           chrome://mozapps/skin/extensions/themeGeneric.svg
 % override chrome://mozapps/skin/extensions/category-dictionaries.svg chrome://mozapps/skin/extensions/dictionaryGeneric.svg
deleted file mode 100644
index 61eb5582881dc34346107611c7921be6fcfe899a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/shared/plugins/pluginProblem.css
+++ b/toolkit/themes/shared/plugins/pluginProblem.css
@@ -2,16 +2,20 @@
  * 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/. */
 
 @namespace html url(http://www.w3.org/1999/xhtml);
 
 /* These styles affect only the bound element, not other page content. */
 /* Keep any changes to these styles in sync with plugin-doorhanger.inc.css */
 .mainBox {
+ --grey-10: #f9f9fa;
+}
+
+.mainBox {
   font: message-box;
   font-size: 12px;
   text-align: center;
   display: table;
   width: 100%;
   height: 100%;
   background-color: rgb(72,72,72);
   color: white;
@@ -150,33 +154,37 @@ a .msgTapToPlay  {
 }
 
 .mainBox[chromedir="rtl"] .helpIcon {
   float: right;
 }
 
 .closeIcon {
   display: block;
-  width: 16px;
-  height: 16px;
+  width: 20px;
+  height: 20px;
   margin-top: 4px;
-  margin-inline-start: -20px;
+  margin-inline-start: -24px;
   margin-inline-end: 4px;
   border: none;
+  border-radius: 2px;
   background-color: transparent;
-  background-image: url("chrome://mozapps/skin/plugins/contentPluginClose.png");
+  background-image: url(chrome://global/skin/icons/close.svg);
   background-repeat: no-repeat;
+  -moz-context-properties: fill, fill-opacity;
+  fill-opacity: 0;
+  fill: var(--grey-10);
 }
 
 .closeIcon:hover {
-  background-position: -16px 0;
+  fill-opacity: .1;
 }
 
 .closeIcon:hover:active {
-  background-position: -32px 0;
+  fill-opacity: .2;
 }
 
 .action-link {
   display: inline-block;
   border-radius: 10px;
   background-color: rgb(35, 35, 35);
   padding: 2px 8px;
   margin-top: 7px;