Bug 1230638 move pocket toolbar/menu icons into addon, r=Gijs

browser/extensions/pocket/jar.mn

@@ -10,3 +10,23 @@
 % skin pocket-shared classic/1.0 %skin/shared/
   content/  (content/*)
   skin/  (skin/*)
+# windows overrides
+% override chrome://pocket/skin/menuPanel.png             chrome://pocket/skin/menuPanel-aero.png            os=WINNT osversion=6
+% override chrome://pocket/skin/menuPanel.png             chrome://pocket/skin/menuPanel-aero.png            os=WINNT osversion=6.1
+% override chrome://pocket/skin/menuPanel@2x.png          chrome://pocket/skin/menuPanel-aero@2x.png         os=WINNT osversion=6
+% override chrome://pocket/skin/menuPanel@2x.png          chrome://pocket/skin/menuPanel-aero@2x.png         os=WINNT osversion=6.1
+% override chrome://pocket/skin/Toolbar@2x.png            chrome://pocket/skin/Toolbar-aero@2x.png           os=WINNT osversion=6
+% override chrome://pocket/skin/Toolbar@2x.png            chrome://pocket/skin/Toolbar-aero@2x.png           os=WINNT osversion=6.1
+% override chrome://pocket/skin/Toolbar@2x.png            chrome://pocket/skin/Toolbar-win8@2x.png           os=WINNT osversion=6.2
+% override chrome://pocket/skin/Toolbar@2x.png            chrome://pocket/skin/Toolbar-win8@2x.png           os=WINNT osversion=6.3
+% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-XP.png                os=WINNT osversion<6
+% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-aero.png              os=WINNT osversion=6
+% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-aero.png              os=WINNT osversion=6.1
+% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-win8.png              os=WINNT osversion=6.2
+% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-win8.png              os=WINNT osversion=6.3
+# osx overrides
+% override chrome://pocket/skin/Toolbar.png               chrome://pocket/skin/Toolbar-yosemite.png          os=Darwin osversion>=10.10
+% override chrome://pocket/skin/Toolbar@2x.png            chrome://pocket/skin/Toolbar-yosemite@2x.png       os=Darwin osversion>=10.10
+% override chrome://pocket/skin/menuPanel.png             chrome://pocket/skin/menuPanel-yosemite.png        os=Darwin osversion>=10.10
+% override chrome://pocket/skin/menuPanel@2x.png          chrome://pocket/skin/menuPanel-yosemite@2x.png     os=Darwin osversion>=10.10
+

browser/extensions/pocket/skin/linux/pocket.css

@@ -1 +1,10 @@
 @import url("chrome://pocket-shared/skin/pocket.css");
+
+#nav-bar #pocket-button > .toolbarbutton-icon {
+  padding: 2px 6px;
+}
+
+:-moz-any(#TabsToolbar, .widget-overflow-list) #pocket-button > .toolbarbutton-icon {
+    max-width: 18px;
+    padding: 0;
+}

browser/extensions/pocket/skin/osx/pocket.css

@@ -1,17 +1,22 @@
 @import url("chrome://pocket-shared/skin/pocket.css");
 
+#pocket-button[cui-areatype="toolbar"] > .toolbarbutton-icon {
+  max-width: 18px;
+  margin: 0;
+}
+
 #pocket-button[cui-areatype="toolbar"][open] {
-  -moz-image-region: rect(36px, 774px, 54px, 756px);
+  -moz-image-region: rect(36px, 18px, 54px, 0);
 }
 
 @media (min-resolution: 1.1dppx) {
 
   #pocket-button[cui-areatype="toolbar"] {
-    -moz-image-region: rect(0, 1548px, 36px, 1512px);
+    -moz-image-region: rect(0, 36px, 36px, 0);
   }
 
   #pocket-button[cui-areatype="toolbar"][open] {
-    -moz-image-region: rect(72px, 1548px, 108px, 1512px);
+    -moz-image-region: rect(72px, 36px, 108px, 0);
   }
 }
 
@@ -29,12 +34,12 @@
 
 @media not all and (min-resolution: 1.1dppx) {
   #pocket-button:hover:active:not([disabled="true"]):not([cui-areatype="menu-panel"]) {
-    -moz-image-region: rect(18px, 774px, 36px, 756px);
+    -moz-image-region: rect(18px, 18px, 36px, 0);
   }
 }
 
 @media (min-resolution: 1.1dppx) {
   #pocket-button:hover:active:not([disabled="true"]):not([cui-areatype="menu-panel"]) {
-    -moz-image-region: rect(36px, 1548px, 72px, 1512px);
+    -moz-image-region: rect(36px, 36px, 72px, 0);
   }
 }

browser/extensions/pocket/skin/shared/pocket.css

@@ -14,51 +14,52 @@ panelmultiview[mainViewId=PanelUI-pocketView] > .panel-viewcontainer > .panel-vi
 }
 
 #pocket-button {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  list-style-image: url("chrome://pocket/skin/Toolbar.png");
+  -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
 toolbar[brighttext] #pocket-button {
-  list-style-image: url(chrome://browser/skin/Toolbar-inverted.png);
+  list-style-image: url(chrome://pocket/skin/Toolbar-inverted.png);
 }
 
 @media not all and (min-resolution: 1.1dppx) {
   #pocket-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #pocket-button {
-    list-style-image: var(--menupanel-list-style-image);
-    -moz-image-region: rect(0px, 992px, 32px, 960px);
+    list-style-image: url(chrome://pocket/skin/menuPanel.png);
+    -moz-image-region: rect(0, 32px, 32px, 0);
   }
 
   #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-    -moz-image-region: rect(32px, 992px, 64px, 960px);
+    -moz-image-region: rect(32px, 32px, 64px, 0);
   }
 }
 
 @media (min-resolution: 1.1dppx) {
   #pocket-button {
-    list-style-image: url("chrome://browser/skin/Toolbar@2x.png");
+    list-style-image: url("chrome://pocket/skin/Toolbar@2x.png");
   }
 
   toolbar[brighttext] #pocket-button {
-    list-style-image: url("chrome://browser/skin/Toolbar-inverted@2x.png");
+    list-style-image: url("chrome://pocket/skin/Toolbar-inverted@2x.png");
   }
 
   #pocket-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #pocket-button {
-    list-style-image: var(--menupanel-list-style-image-2x);
-    -moz-image-region: rect(0px, 1984px, 64px, 1920px);
+    list-style-image: url(chrome://pocket/skin/menuPanel@2x.png);
+    -moz-image-region: rect(0px, 64px, 64px, 0);
   }
 
   #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-    -moz-image-region: rect(64px, 1984px, 128px, 1920px);
+    -moz-image-region: rect(64px, 64px, 128px, 0);
   }
 }
 
 #pocket-button[cui-areatype="toolbar"] {
-  -moz-image-region: rect(0, 774px, 18px, 756px);
+  -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
 #pocket-button[cui-areatype="toolbar"][open] {
-  -moz-image-region: rect(18px, 774px, 36px, 756px);
+  -moz-image-region: rect(18px, 18px, 36px, 0);
 }
 
 #panelMenu_pocket,

browser/extensions/pocket/skin/windows/pocket.css

@@ -1,11 +1,26 @@
 @import url("chrome://pocket-shared/skin/pocket.css");
 
+#nav-bar #pocket-button > .toolbarbutton-icon {
+  padding: 2px 6px;
+}
+
+:-moz-any(#TabsToolbar, .widget-overflow-list) #pocket-button > .toolbarbutton-icon {
+    max-width: 18px;
+    padding: 0;
+}
+
+@media (-moz-windows-theme: luna-silver) and (max-resolution: 1dppx) {
+  #pocket-button {
+    list-style-image: url(chrome://pocket/skin/toolbar-lunaSilver.png)
+  }
+}
+
 @media (min-resolution: 1.1dppx) {
   #pocket-button[cui-areatype="toolbar"] {
-    -moz-image-region: rect(0, 1548px, 36px, 1512px);
+    -moz-image-region: rect(0, 36px, 36px, 0px);
   }
 
   #pocket-button[cui-areatype="toolbar"][open] {
-    -moz-image-region: rect(36px, 1548px, 72px, 1512px);
+    -moz-image-region: rect(36px, 36px, 72px, 0px);
   }
 }