Bug 898837 - fix share button css, r=gijs

browser/themes/osx/browser.css

@@ -471,7 +471,7 @@ toolbarbutton.bookmark-item > menupopup {
     -moz-image-region: rect(18px, 288px, 36px, 270px);
   }
 
-  #share-button@toolbarButtonPressed@ {
+  #social-share-button@toolbarButtonPressed@ {
     -moz-image-region: rect(18px, 306px, 36px, 288px);
   }
 
@@ -700,6 +700,14 @@ toolbarbutton.bookmark-item > menupopup {
     -moz-image-region: rect(36px, 576px, 72px, 540px);
   }
 
+  #social-share-button[customizableui-areatype="toolbar"] {
+    -moz-image-region: rect(0, 612px, 36px, 576px);
+  }
+
+  #social-share-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 612px, 72px, 576px);
+  }
+
   #characterencoding-button[customizableui-areatype="toolbar"] {
     -moz-image-region: rect(0, 648px, 36px, 612px);
   }
@@ -1941,31 +1949,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   transition: height 100ms ease-out, width 100ms ease-out;
 }
 
-#social-share-button {
-  list-style-image: url("chrome://browser/skin/social/share-button.png");
-}
-
-#social-share-button[open],
-#social-share-button:hover:active {
-  list-style-image: url("chrome://browser/skin/social/share-button-active.png");
-}
-
-#social-share-button > .toolbarbutton-icon {
-  width: 13px;
-  height: 14px;
-}
-
-@media (min-resolution: 2dppx) {
-  #social-share-button {
-    list-style-image: url("chrome://browser/skin/social/share-button@2x.png");
-  }
-
-  #social-share-button[open],
-  #social-share-button:hover:active {
-    list-style-image: url("chrome://browser/skin/social/share-button-active@2x.png");
-  }
-}
-
 .social-share-toolbar {
   border-right: 1px solid #dedede;
   background: linear-gradient(to bottom, rgba(247,247,247,.99), rgba(247,247,247,.95));

browser/themes/osx/jar.mn

@@ -189,10 +189,6 @@ browser.jar:
   skin/classic/browser/social/services-16@2x.png            (social/services-16@2x.png)
   skin/classic/browser/social/services-64.png               (social/services-64.png)
   skin/classic/browser/social/services-64@2x.png            (social/services-64@2x.png)
-  skin/classic/browser/social/share-button.png              (social/share-button.png)
-  skin/classic/browser/social/share-button@2x.png           (social/share-button@2x.png)
-  skin/classic/browser/social/share-button-active.png       (social/share-button-active.png)
-  skin/classic/browser/social/share-button-active@2x.png    (social/share-button-active@2x.png)
   skin/classic/browser/social/chat-icons.png                             (social/chat-icons.png)
   skin/classic/browser/social/chat-icons@2x.png                          (social/chat-icons@2x.png)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon.png             (tabbrowser/alltabs-box-bkgnd-icon.png)

browser/themes/shared/toolbarbuttons.inc.css

@@ -65,6 +65,10 @@
   -moz-image-region: rect(0, 288px, 18px, 270px);
 }
 
+#social-share-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0px, 306px, 18px, 288px);
+}
+
 #characterencoding-button[customizableui-areatype="toolbar"]{
   -moz-image-region: rect(0, 324px, 18px, 306px);
 }

browser/themes/windows/browser.css

@@ -1181,11 +1181,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   height: 150px;
 }
 
-#social-share-button {
-  list-style-image: url(chrome://browser/skin/social/share-button.png);
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
 .social-share-toolbar {
   border-right: 1px solid #e2e5e8;
   background: linear-gradient(to bottom, #ffffff, #f5f7fa);

browser/themes/windows/jar.mn

@@ -137,8 +137,6 @@ browser.jar:
         skin/classic/browser/preferences/aboutPermissions.css        (preferences/aboutPermissions.css)
         skin/classic/browser/social/services-16.png                  (social/services-16.png)
         skin/classic/browser/social/services-64.png                  (social/services-64.png)
-        skin/classic/browser/social/share-button.png                 (social/share-button.png)
-        skin/classic/browser/social/share-button-active.png          (social/share-button-active.png)
         skin/classic/browser/social/chat-icons.png                   (social/chat-icons.png)
         skin/classic/browser/tabbrowser/newtab.png                   (tabbrowser/newtab.png)
         skin/classic/browser/tabbrowser/newtab-inverted.png          (tabbrowser/newtab-inverted.png)
@@ -409,8 +407,6 @@ browser.jar:
         skin/classic/aero/browser/preferences/aboutPermissions.css   (preferences/aboutPermissions.css)
         skin/classic/aero/browser/social/services-16.png             (social/services-16.png)
         skin/classic/aero/browser/social/services-64.png             (social/services-64.png)
-        skin/classic/aero/browser/social/share-button.png            (social/share-button.png)
-        skin/classic/aero/browser/social/share-button-active.png     (social/share-button-active.png)
         skin/classic/aero/browser/social/chat-icons.png              (social/chat-icons.png)
         skin/classic/aero/browser/tabbrowser/newtab.png              (tabbrowser/newtab.png)
         skin/classic/aero/browser/tabbrowser/newtab-inverted.png     (tabbrowser/newtab-inverted.png)