Bug 1192999 - Use close-XPVista7.png on Windows. r=clokep a=clokep
authorRichard Marti <richard.marti@gmail.com>
Tue, 11 Aug 2015 12:53:31 +0200
changeset 23080 2679472bfea57fc86b881570b345bf6cacdb2c19
parent 23079 c48610831fdfa3decd6f976cd4386b819a8a88ac
child 23081 46921622f2f17e923d4a378000f9e4713b7fa3ae
push id1474
push usermbanner@mozilla.com
push dateMon, 21 Sep 2015 17:20:48 +0000
treeherdercomm-beta@3094bab4c31f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersclokep, clokep
bugs1192999
Bug 1192999 - Use close-XPVista7.png on Windows. r=clokep a=clokep
im/themes/blist.css
im/themes/tabbrowser-winstripe/tabbrowser.css
mail/components/im/themes/chat.css
mail/themes/windows/mail/chat.css
--- a/im/themes/blist.css
+++ b/im/themes/blist.css
@@ -189,17 +189,21 @@ contact[droptarget] > buddy[dummy] {
 %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
@@ -481,17 +485,21 @@ group[closed] .twisty {
 }
 
 #userIconPanelImageRemove {
   -moz-appearance: none;
   margin: 9px 9px 135px 135px;
   padding: 0;
   background: radial-gradient(circle, rgba(255, 255, 255, 0.25) 25%, transparent 100%);
   border: none;
+%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"]) {
--- a/im/themes/tabbrowser-winstripe/tabbrowser.css
+++ b/im/themes/tabbrowser-winstripe/tabbrowser.css
@@ -177,17 +177,17 @@ toolbarbutton > .toolbarbutton-icon {
 }
 
 /* Tab close button */
 .tab-close-button {
   -moz-appearance: none;
   -moz-image-region: rect(0, 64px, 16px, 48px);
   border: none;
   padding: 0px;
-  list-style-image: url("chrome://global/skin/icons/close.png");
+  list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
 }
 
 .tab-close-button:-moz-system-metric(touch-enabled) {
   -moz-transform: scale(1.2);
 }
 
 .tab-close-button:hover,
 .tab-close-button:hover[selected="true"] {
@@ -311,17 +311,17 @@ toolbarbutton > .toolbarbutton-icon {
 .alltabs-item[tabIsVisible] {
   /* box-shadow instead of background-color to work around native styling */
   box-shadow: inset -5px 0 ThreeDShadow;
 }
 
 /* Tabstrip close button */
 .tabs-closebutton {
   -moz-appearance: none;
-  list-style-image: url("chrome://global/skin/icons/close.png");
+  list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
   padding: 4px 2px;
   margin: 0px;
   border: none;
 }
 
 .tabs-closebutton > .toolbarbutton-icon {
   -moz-margin-end: 0px !important;
--- a/mail/components/im/themes/chat.css
+++ b/mail/components/im/themes/chat.css
@@ -107,17 +107,21 @@ imcontact[aliasing] .contactDisplayName 
 }
 
 .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
--- a/mail/themes/windows/mail/chat.css
+++ b/mail/themes/windows/mail/chat.css
@@ -480,23 +480,16 @@ richlistitem[state="disconnected"] .acco
   }
 
   #contactlistbox:focus > :-moz-any(imconv, imcontact, imgroup)[selected] {
     background-image: linear-gradient(rgba(131, 183, 249, .16),
                                       rgba(131, 183, 249, .375));
   }
 }
 
-@media (-moz-os-version: windows-win8),
-       (-moz-os-version: windows-win10) {
-  .closeConversationButton {
-    list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
-  }
-}
-
 @media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
        (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
   .statusMessageToolbarItem {
     border-radius: 0;
   }
 
   #listPaneBox {
     background-color: -moz-Dialog;