Bug 940844 - Update Sync Progress Icon, r=jaws

browser/themes/linux/jar.mn

@@ -292,6 +292,7 @@ browser.jar:
   skin/classic/browser/sync-notification-24.png
   skin/classic/browser/syncProgress-menuPanel.png
   skin/classic/browser/syncProgress-toolbar.png
+  skin/classic/browser/syncProgress-toolbar-inverted.png
   skin/classic/browser/syncSetup.css
   skin/classic/browser/syncCommon.css
   skin/classic/browser/syncQuota.css

browser/themes/osx/browser.css

@@ -841,6 +841,17 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-ic
     -moz-image-region: rect(36px, 540px, 72px, 504px);
   }
 
+  #sync-button[cui-areatype="toolbar"][status="active"],
+  #sync-button[cui-areatype="toolbar"][status="active"]:hover:active:not([disabled="true"]) {
+    list-style-image: url("chrome://browser/skin/syncProgress-toolbar@2x.png");
+    -moz-image-region: rect(0, 36px, 36px, 0px);
+  }
+
+  #sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext,
+  #sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext:hover:active:not([disabled="true"]) {
+    list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted@2x.png");
+  }
+
   #feed-button[cui-areatype="toolbar"] {
     -moz-image-region: rect(0, 576px, 36px, 540px);
   }
@@ -1092,6 +1103,11 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-ic
     -moz-image-region: rect(0px, 768px, 64px, 704px);
   }
 
+  #sync-button[cui-areatype="menu-panel"][status="active"] {
+    list-style-image: url(chrome://browser/skin/syncProgress-menuPanel@2x.png);
+    -moz-image-region: rect(0px, 64px, 64px, 0px);
+  }
+
   #feed-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #feed-button {
     -moz-image-region: rect(0px, 832px, 64px, 768px);
@@ -1593,13 +1609,6 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   margin: 2px;
 }
 
-/* sync button */
-
-#sync-button[status="active"] {
-  list-style-image: url("chrome://browser/skin/sync-throbber.png");
-  -moz-image-region: rect(0, 20px, 20px, 0px);
-}
-
 /* ----- FULLSCREEN WINDOW CONTROLS ----- */
 
 #minimize-button,

browser/themes/osx/jar.mn

@@ -401,7 +401,6 @@ browser.jar:
   skin/classic/browser/devtools/app-manager/noise.png                 (../shared/devtools/app-manager/images/noise.png)
   skin/classic/browser/devtools/app-manager/default-app-icon.png      (../shared/devtools/app-manager/images/default-app-icon.png)
 #ifdef MOZ_SERVICES_SYNC
-  skin/classic/browser/sync-throbber.png
   skin/classic/browser/sync-16.png
   skin/classic/browser/sync-32.png
   skin/classic/browser/sync-bg.png
@@ -417,6 +416,12 @@ browser.jar:
   skin/classic/browser/syncProgress.css
   skin/classic/browser/syncProgress-horizontalbar.png
   skin/classic/browser/syncProgress-horizontalbar@2x.png
+  skin/classic/browser/syncProgress-menuPanel.png
+  skin/classic/browser/syncProgress-menuPanel@2x.png
+  skin/classic/browser/syncProgress-toolbar.png
+  skin/classic/browser/syncProgress-toolbar@2x.png
+  skin/classic/browser/syncProgress-toolbar-inverted.png
+  skin/classic/browser/syncProgress-toolbar-inverted@2x.png
 #endif
   skin/classic/browser/Toolbar-background-noise.png         (Toolbar-background-noise.png)
   skin/classic/browser/lion/toolbarbutton-dropmarker.png    (toolbarbutton-dropmarker-lion.png)

browser/themes/shared/menupanel.inc.css

@@ -54,6 +54,11 @@ toolbarpaletteitem[place="palette"] > #sync-button {
   -moz-image-region: rect(0px, 384px, 32px, 352px);
 }
 
+#sync-button[cui-areatype="menu-panel"][status="active"] {
+  list-style-image: url(chrome://browser/skin/syncProgress-menuPanel.png);
+  -moz-image-region: rect(0px, 32px, 32px, 0px);
+}
+
 #feed-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #feed-button {
   -moz-image-region: rect(0px, 416px, 32px, 384px);

browser/themes/shared/toolbarbuttons.inc.css

@@ -56,6 +56,17 @@
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
 
+#sync-button[cui-areatype="toolbar"][status="active"],
+#sync-button[cui-areatype="toolbar"][status="active"]:hover:active:not([disabled="true"]) {
+  list-style-image: url("chrome://browser/skin/syncProgress-toolbar.png");
+  -moz-image-region: rect(0, 18px, 18px, 0px);
+}
+
+#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext,
+#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext:hover:active:not([disabled="true"]) {
+  list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png");
+}
+
 #feed-button[cui-areatype="toolbar"] {
   -moz-image-region: rect(0, 288px, 18px, 270px);
 }

browser/themes/windows/browser-aero.css

@@ -242,6 +242,11 @@
     list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
   }
 
+  #toolbar-menubar > #sync-button[status="active"]:not(:-moz-lwtheme),
+  #toolbar-menubar > toolbarpaletteitem > #sync-button[status="active"]:not(:-moz-lwtheme) {
+    list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png");
+  }
+
   /* Glass Fog */
 
   #TabsToolbar:not(:-moz-lwtheme) {

browser/themes/windows/browser.css

@@ -969,12 +969,9 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
 }
 
-#sync-button[cui-areatype="toolbar"][status="active"] {
-  /* !important because we need to override the glass selectors that trigger
-   * use of the Toolbar-inverted image. Those use a list of all primary toolbar
-   * buttons, so we can't easily fix those selectors. */
-  list-style-image: url("chrome://browser/skin/sync-throbber.png") !important;
-  -moz-image-region: rect(0, 18px, 18px, 0);
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > #sync-button[status="active"]:-moz-system-metric(windows-classic):not(:-moz-lwtheme),
+#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > #sync-button[status="active"]:-moz-system-metric(windows-classic):not(:-moz-lwtheme) {
+  list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png");
 }
 
 /* tabview button & menu item */

browser/themes/windows/jar.mn

@@ -312,7 +312,6 @@ browser.jar:
         skin/classic/browser/devtools/app-manager/noise.png                 (../shared/devtools/app-manager/images/noise.png)
         skin/classic/browser/devtools/app-manager/default-app-icon.png      (../shared/devtools/app-manager/images/default-app-icon.png)
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/browser/sync-throbber.png
         skin/classic/browser/sync-16.png
         skin/classic/browser/sync-32.png
         skin/classic/browser/sync-128.png
@@ -328,6 +327,10 @@ browser.jar:
         skin/classic/browser/syncProgress.css
         skin/classic/browser/syncProgress-horizontalbar.png
         skin/classic/browser/syncProgress-horizontalbar-XPVista7.png
+        skin/classic/browser/syncProgress-menuPanel.png
+        skin/classic/browser/syncProgress-toolbar.png
+        skin/classic/browser/syncProgress-toolbar-inverted.png
+        skin/classic/browser/syncProgress-toolbar-XPVista7.png
 #endif
         skin/classic/browser/devtools/tooltip/arrow-horizontal-dark.png   (../shared/devtools/tooltip/arrow-horizontal-dark.png)
         skin/classic/browser/devtools/tooltip/arrow-horizontal-dark@2x.png   (../shared/devtools/tooltip/arrow-horizontal-dark@2x.png)
@@ -648,7 +651,6 @@ browser.jar:
         skin/classic/aero/browser/devtools/app-manager/default-app-icon.png      (../shared/devtools/app-manager/images/default-app-icon.png)
 
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/aero/browser/sync-throbber.png
         skin/classic/aero/browser/sync-16.png
         skin/classic/aero/browser/sync-32.png
         skin/classic/aero/browser/sync-128.png
@@ -664,6 +666,10 @@ browser.jar:
         skin/classic/aero/browser/syncProgress.css
         skin/classic/aero/browser/syncProgress-horizontalbar.png
         skin/classic/aero/browser/syncProgress-horizontalbar-XPVista7.png
+        skin/classic/aero/browser/syncProgress-menuPanel.png
+        skin/classic/aero/browser/syncProgress-toolbar.png
+        skin/classic/aero/browser/syncProgress-toolbar-inverted.png
+        skin/classic/aero/browser/syncProgress-toolbar-XPVista7.png
 #endif
 #endif
         skin/classic/aero/browser/devtools/tooltip/arrow-horizontal-dark.png   (../shared/devtools/tooltip/arrow-horizontal-dark.png)