Bug 1232108 - Override toolkit's close.png to close.svg. r=aleth a=jorgk
authorRichard Marti <richard.marti@gmail.com>
Thu, 14 Jan 2016 20:11:33 +0100
changeset 26651 f302f6e8a0b2fd41e4a88e5d570ff17cdf5f9fca
parent 26650 e437939e81472f262fceb2e2e42c9c04c5846802
child 26652 364ce3053ab9f1ace8e2a09f484dbd1b92ca0e72
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleth, jorgk
bugs1232108
Bug 1232108 - Override toolkit's close.png to close.svg. r=aleth a=jorgk
im/themes/blist.css
im/themes/jar.mn
mail/components/im/themes/chat.css
mail/themes/linux/jar.mn
--- a/im/themes/blist.css
+++ b/im/themes/blist.css
@@ -177,41 +177,31 @@ contact[droptarget] > buddy[dummy] {
   margin: 0 3px;
   padding: 0;
   border: none;
   background: transparent;
   -moz-binding: url('chrome://global/content/bindings/button.xml#button-image');
   -moz-appearance: none;
 }
 
-%ifdef XP_UNIX
-%ifndef XP_MACOSX
-%define UNIX_BUT_NOT_MAC
-%endif
-%endif
-
 .hideGroupButton {
   -moz-margin-end: 0;
   -moz-stack-sizing: ignore;
-%ifdef UNIX_BUT_NOT_MAC
-  list-style-image: url("moz-icon://stock/gtk-close?size=menu");
-%else
 %ifdef XP_WIN
   list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
 %else
   list-style-image: url("chrome://global/skin/icons/close.png");
 %endif
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 .hideGroupButton:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 .hideGroupButton:hover:active {
   -moz-image-region: rect(0, 48px, 16px, 32px);
-%endif
 }
 
 .startChatBubble {
   list-style-image: url('chrome://chat/skin/prpl-generic/icon.png');
 }
 
 .expander-up {
   list-style-image: url("chrome://instantbird/skin/collapse.png");
@@ -493,28 +483,28 @@ group[closed] .twisty {
 %ifdef XP_WIN
   list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
 %else
   list-style-image: url("chrome://global/skin/icons/close.png");
 %endif
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-#userIconPanelImageRemove > .toolbarbutton-icon {
-  max-width: 16px;
-}
-
 #userIconPanelImageRemove:hover:not([disabled="true"]) {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 #userIconPanelImageRemove:active:not([disabled="true"]) {
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
+#userIconPanelImageRemove > .toolbarbutton-icon {
+  max-width: 16px;
+}
+
 .userIconPanelButton {
   -moz-appearance: none;
   -moz-user-focus: normal;
   border: none;
   font-size: 14px;
   border-top: 1px solid hsla(210, 4%, 10%, 0.14);
   background-color: hsla(210, 4%, 10%, 0.07);
   padding: 4px;
--- a/im/themes/jar.mn
+++ b/im/themes/jar.mn
@@ -338,11 +338,15 @@ instantbird.jar:
 	skin/classic/instantbird/messages/simple/Incoming/Context.html (messages/simple/Incoming/Context.html)
 	skin/classic/instantbird/messages/simple/Incoming/NextContext.html (messages/simple/Incoming/NextContext.html)
 	skin/classic/instantbird/messages/simple/Info.plist            (messages/simple/Info.plist)
 	skin/classic/instantbird/messages/simple/main.css              (messages/simple/main.css)
 	skin/classic/instantbird/messages/simple/Status.html           (messages/simple/Status.html)
 	skin/classic/instantbird/messages/simple/Variants/Normal.css   (messages/simple/Variants/Normal.css)
 	skin/classic/instantbird/messages/simple/Variants/Dark.css     (messages/simple/Variants/Dark.css)
 
+#ifdef XP_UNIX
 #ifdef XP_MACOSX
 % override chrome://instantbird/skin/tabbrowser/alltabs-box-bkgnd-icon.png     chrome://instantbird/skin/lion/tabbrowser/alltabs-box-bkgnd-icon.png        os=Darwin osversion>=10.7
+#else
+% override chrome://global/skin/icons/close.png  chrome://global/skin/icons/close.svg
 #endif
+#endif
--- a/mail/components/im/themes/chat.css
+++ b/mail/components/im/themes/chat.css
@@ -104,32 +104,28 @@ imcontact[aliasing] .contactDisplayName 
 
 .startChatBubble {
   list-style-image: url('chrome://chat/skin/prpl-generic/icon.png');
 }
 
 .closeConversationButton {
   -moz-margin-end: 0;
   -moz-stack-sizing: ignore;
-%ifdef UNIX_BUT_NOT_MAC
-  list-style-image: url("moz-icon://stock/gtk-close?size=menu");
-%else
 %ifdef XP_WIN
   list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
 %else
   list-style-image: url("chrome://global/skin/icons/close.png");
 %endif
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 .closeConversationButton:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 .closeConversationButton:hover:active {
   -moz-image-region: rect(0, 48px, 16px, 32px);
-%endif
 }
 
 
 /* From im/themes/conversation.css */
 .browser {
   margin: 0 0;
 }
 
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -260,8 +260,9 @@ classic.jar:
   skin/classic/messenger/icons/box-logo.png                   (mail/icons/box-logo.png)
   skin/classic/messenger/sharedPlatform.css                   (mail/linuxShared.css)
   skin/classic/messenger/shared/mailWindow1.css               (../shared/mail/mailWindow1.css)
   skin/classic/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
   skin/classic/messenger/shared/accountProvisioner.css         (../shared/mail/accountProvisioner.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
+% override chrome://global/skin/icons/close.png               chrome://global/skin/icons/close.svg