Bug 594657 - New Glyphs for Sync Toolbar Button, r=mconnor

browser/themes/gnomestripe/browser/browser.css

@@ -682,24 +682,19 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 #zoom-out-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar");
-
+}
 #zoom-in-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-in?size=toolbar");
 }
 
 /* sync button */
-#sync-button {
-  list-style-image: url("chrome://browser/skin/sync-16.png");
+ #sync-button {
+  -moz-image-region: rect(0px 144px 24px 120px);
 }
 
 #sync-button[status="active"] {
-  list-style-image: url("chrome://browser/skin/sync-16-throbber.png");
-}
-
-toolbar:not([iconsize="small"]) #sync-button > .toolbarbutton-icon {
-  margin: 1px;
-  width: 16px;
-  height: 16px;
+  list-style-image: url("chrome://browser/skin/sync-24-throbber.png");
+  -moz-image-region: rect(0px 24px 24px 0px);
 }
 
 /* 16px primary toolbar buttons */
@@ -838,6 +833,14 @@ toolbar[iconsize="small"] #zoom-in-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-in?size=menu");
 }
 
+toolbar[iconsize="small"] #sync-button {
+  -moz-image-region: rect(0px 96px 16px 80px);
+}
+toolbar[iconsize="small"] #sync-button[status="active"] {
+  list-style-image: url("chrome://browser/skin/sync-16-throbber.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
 /* Fullscreen window controls */
 #window-controls {
   -moz-box-align: start;

browser/themes/gnomestripe/browser/jar.mn

@@ -87,6 +87,7 @@ browser.jar:
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-16-throbber.png
   skin/classic/browser/sync-16.png
+  skin/classic/browser/sync-24-throbber.png
   skin/classic/browser/sync-32.png
   skin/classic/browser/sync-bg.png
   skin/classic/browser/sync-desktopIcon.png

browser/themes/pinstripe/browser/browser.css

@@ -700,21 +700,16 @@ toolbar[mode="icons"] #zoom-in-button {
 }
 
 /* sync button */
-
+ 
 #sync-button {
-  list-style-image: url("chrome://browser/skin/sync-16.png");
+  -moz-image-region: rect(0, 440px, 20px, 420px);
 }
 
 #sync-button[status="active"] {
-  list-style-image: url("chrome://browser/skin/sync-16-throbber.png");
+  list-style-image: url("chrome://browser/skin/sync-throbber.png");
+  -moz-image-region: rect(0, 20px, 20px, 0px);
 }
-
-toolbar:not([iconsize="small"]) #sync-button > .toolbarbutton-icon {
-  margin: 1px;
-  width: 16px;
-  height: 16px;
-}
-
+ 
 /* ----- FULLSCREEN WINDOW CONTROLS ----- */
 
 #minimize-button,

browser/themes/pinstripe/browser/jar.mn

@@ -125,7 +125,7 @@ browser.jar:
   skin/classic/browser/tabview/tabview.png                  (tabview/tabview.png)
   skin/classic/browser/tabview/tabview.css                  (tabview/tabview.css)
 #ifdef MOZ_SERVICES_SYNC
-  skin/classic/browser/sync-16-throbber.png
+  skin/classic/browser/sync-throbber.png
   skin/classic/browser/sync-16.png
   skin/classic/browser/sync-32.png
   skin/classic/browser/sync-bg.png

browser/themes/winstripe/browser/browser.css

@@ -912,22 +912,17 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
   border-bottom-left-radius: 0;
 }
 
-/* sync button */
-
+ /* sync button */
+ 
 #sync-button {
-  list-style-image: url("chrome://browser/skin/sync-16.png");
+  -moz-image-region: rect(0, 324px, 18px, 306px);
 }
 
 #sync-button[status="active"] {
-  list-style-image: url("chrome://browser/skin/sync-16-throbber.png");
+  list-style-image: url("chrome://browser/skin/sync-throbber.png");
+  -moz-image-region: rect(0, 18px, 18px, 0);
 }
-
-toolbar:not([iconsize="small"]) #sync-button > .toolbarbutton-icon {
-  margin: 1px;
-  width: 16px;
-  height: 16px;
-}
-
+ 
 /* ::::: fullscreen window controls ::::: */
 
 #minimize-button,

browser/themes/winstripe/browser/jar.mn

@@ -104,7 +104,7 @@ browser.jar:
         skin/classic/browser/tabview/tabview.png                    (tabview/tabview.png)
         skin/classic/browser/tabview/tabview.css                    (tabview/tabview.css)
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/browser/sync-16-throbber.png
+        skin/classic/browser/sync-throbber.png
         skin/classic/browser/sync-16.png
         skin/classic/browser/sync-32.png
         skin/classic/browser/sync-bg.png
@@ -220,7 +220,7 @@ browser.jar:
         skin/classic/aero/browser/tabview/tabview.png                (tabview/tabview.png)
         skin/classic/aero/browser/tabview/tabview.css                (tabview/tabview.css)
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/aero/browser/sync-16-throbber.png
+        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-bg.png