Bug 1037341 - Update pin and block with new icons [r=adw]

Use svg version of new icons and slice image rectangles of the appropriate section.

--HG--
extra : rebase_source : 928b0ce35205066df8c30b1f521f8e7d91b31deb

browser/themes/linux/jar.mn

@@ -118,6 +118,7 @@ browser.jar:
 * skin/classic/browser/newtab/newTab.css              (newtab/newTab.css)
   skin/classic/browser/newtab/controls.png            (../shared/newtab/controls.png)
   skin/classic/browser/newtab/controls@2x.png         (../shared/newtab/controls@2x.png)
+  skin/classic/browser/newtab/controls.svg            (../shared/newtab/controls.svg)
   skin/classic/browser/newtab/texture.png             (../shared/newtab/texture.png)
   skin/classic/browser/places/bookmarksMenu.png       (places/bookmarksMenu.png)
   skin/classic/browser/places/bookmarksToolbar.png    (places/bookmarksToolbar.png)

browser/themes/osx/jar.mn

@@ -185,6 +185,7 @@ browser.jar:
 * skin/classic/browser/newtab/newTab.css                    (newtab/newTab.css)
   skin/classic/browser/newtab/controls.png                  (../shared/newtab/controls.png)
   skin/classic/browser/newtab/controls@2x.png               (../shared/newtab/controls@2x.png)
+  skin/classic/browser/newtab/controls.svg                  (../shared/newtab/controls.svg)
   skin/classic/browser/newtab/texture.png                   (../shared/newtab/texture.png)
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/monitor.png

browser/themes/shared/newtab/controls.svg

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<svg version="1.1"
+     id="icons-enhanced-tiles"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     x="0"
+     y="0"
+     width="256"
+     height="32"
+     viewBox="0 0 256 32">
+
+  <defs>
+    <style type="text/css"><![CDATA[
+      /* Glyph Styles */
+
+      .glyphShape-style {
+        fill: #7a7a7a;
+      }
+
+      .glyphShape-style-hover-gear {
+        fill: url(#gradient-linear-hover-gear);
+      }
+      .glyphShape-style-hover-gear-dropshadow {
+        fill: #000;
+        fill-opacity: .5;
+        filter: url(#filter-shadow-drop);
+      }
+
+      .glyphShape-style-hover-pin {
+        fill: #0092e5;
+      }
+
+      .glyphShape-style-hover-delete {
+        fill: #ea0000;
+      }
+
+      .glyphShape-style-hover-active {
+        fill: #231f20;
+      }
+
+      /* Circle Background Styles */
+
+      .glyphShape-style-circle {
+        fill: #fff;
+      }
+
+      .glyphShape-style-circle-dropshadow {
+        fill: #000;
+        fill-opacity: .5;
+        filter: url(#filter-shadow-drop);
+      }
+      ]]></style>
+
+    <filter id="filter-shadow-drop" x="-10%" y="-10%" width="120%" height="120%">
+      <feOffset in="SourceAlpha" dx="0" dy=".75" result="filter-shadow-drop-offset" />
+      <feGaussianBlur in="filter-shadow-drop-offset" stdDeviation="1" result="filter-shadow-drop-blur"/>
+    </filter>
+
+    <linearGradient id="gradient-linear-hover-gear"
+                    x1="0%" y1="0%"
+                    x2="0%" y2="100%"
+                    spreadMethod="pad">
+      <stop offset="0%"   stop-color="#a1a0a0" stop-opacity="1"/>
+      <stop offset="100%" stop-color="#676767" stop-opacity="1"/>
+    </linearGradient>
+
+    <path    id="glyphShape-gear" d="M28,16c0-1.7,0.9-3.1,2-3.3c-0.4-1.5-0.9-2.9-1.7-4.2c-0.9,0.7-2.6,0.3-3.8-0.9c-1.2-1.2-1.6-2.8-0.9-3.8 c-1.3-0.8-2.7-1.4-4.2-1.7c-0.2,1.1-1.6,2-3.3,2S13,3.1,12.8,2c-1.5,0.4-2.9,0.9-4.2,1.7c0.7,0.9,0.3,2.6-0.9,3.8 c-1.4,1.1-3,1.5-4,0.9C2.9,9.7,2.4,11.2,2,12.7c1.1,0.2,2,1.6,2,3.3s-0.9,3.1-2,3.3c0.4,1.5,0.9,2.9,1.7,4.2 c0.9-0.7,2.6-0.3,3.8,0.9c1.2,1.2,1.6,2.8,0.9,3.8c1.3,0.8,2.7,1.4,4.2,1.7c0.2-1.1,1.6-2,3.3-2s3.1,0.9,3.3,2 c1.5-0.4,2.9-0.9,4.2-1.7c-0.7-0.9-0.3-2.6,0.9-3.8c1.3-1.2,2.8-1.6,3.8-0.9c0.8-1.3,1.4-2.7,1.7-4.2C28.9,19.1,28,17.7,28,16z M16,24c-4.4,0-8-3.6-8-8s3.6-8,8-8s8,3.6,8,8S20.4,24,16,24z" />
+
+    <circle  id="glyphShape-circle" cx="16" cy="16" r="14" />
+
+    <path    id="glyphShape-pin" d="M19,15v-5h2V7H11v3h2v5l-3,2v2h5c0,4.5,0.4,8,1,8s1-3.5,1-8h5v-2L19,15z" />
+    <polygon id="glyphShape-delete" points="23,11 21,9 16,14 11,9 9,11 14,16 9,21 11,23 16,18 21,23 23,21 18,16" />
+
+  </defs>
+
+  <g id="icon-gear-default">
+    <use xlink:href="#glyphShape-gear"   class="glyphShape-style" />
+  </g>
+
+  <g id="icon-gear-default" transform="translate(32)">
+    <use xlink:href="#glyphShape-gear"   class="glyphShape-style-hover-gear-dropshadow" />
+    <use xlink:href="#glyphShape-gear"   class="glyphShape-style-hover-gear" />
+  </g>
+
+  <g id="icon-pin-default" transform="translate(64)">
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
+    <use xlink:href="#glyphShape-pin"    class="glyphShape-style" />
+  </g>
+
+  <g id="icon-pin-hover" transform="translate(96)">
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
+    <use xlink:href="#glyphShape-pin"    class="glyphShape-style-hover-pin" />
+  </g>
+
+  <g id="icon-pin-hover-active" transform="translate(128)">
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
+    <use xlink:href="#glyphShape-pin"    class="glyphShape-style-hover-active" />
+  </g>
+
+  <g id="icon-delete-default" transform="translate(160)">
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
+    <use xlink:href="#glyphShape-delete" class="glyphShape-style" />
+  </g>
+
+  <g id="icon-delete-hover" transform="translate(192)">
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
+    <use xlink:href="#glyphShape-delete" class="glyphShape-style-hover-delete" />
+  </g>
+
+  <g id="icon-delete-hover-active" transform="translate(224)">
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle-dropshadow" />
+    <use xlink:href="#glyphShape-circle" class="glyphShape-style-circle" />
+    <use xlink:href="#glyphShape-delete" class="glyphShape-style-hover-active" />
+  </g>
+
+</svg>

browser/themes/shared/newtab/newTab.inc.css

@@ -169,56 +169,53 @@
 
 /* CONTROLS */
 .newtab-control {
-  width: 24px;
+  background-color: transparent;
-  height: 24px;
-  padding: 1px 2px 3px;
   border: none;
-  background: transparent url(chrome://browser/skin/newtab/controls.png);
+  height: 32px;
+  width: 32px;
 }
 
-@media (min-resolution: 2dppx) {
+.newtab-control-pin,
-  .newtab-control {
+.newtab-site[pinned] .newtab-control-pin:hover:active {
-    background-image: url(chrome://browser/skin/newtab/controls@2x.png);
+  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/controls.svg), 0, 96, 32, 64);
-    background-size: 296px;
-  }
-}
-
-.newtab-control-pin:hover {
-  background-position: -24px 0;
-}
-
-.newtab-control-pin:active {
-  background-position: -48px 0;
-}
-
-.newtab-site[pinned] .newtab-control-pin {
-  background-position: -72px 0;
 }
 
+.newtab-control-pin:hover,
 .newtab-site[pinned] .newtab-control-pin:hover {
-  background-position: -96px 0;
+  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/controls.svg), 0, 128, 32, 96);
 }
 
-.newtab-site[pinned] .newtab-control-pin:active {
+.newtab-control-pin:hover:active,
-  background-position: -120px 0;
+.newtab-site[pinned] .newtab-control-pin {
+  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/controls.svg), 0, 160, 32, 128);
 }
 
 .newtab-control-block {
-  background-position: -144px 0;
+  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/controls.svg), 0, 192, 32, 160);
 }
 
 .newtab-control-block:hover {
-  background-position: -168px 0;
+  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/controls.svg), 0, 224, 32, 192);
 }
 
-.newtab-control-block:active {
+.newtab-control-block:hover:active {
-  background-position: -192px 0;
+  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/controls.svg), 0, 256, 32, 224);
 }
 
 .newtab-control-sponsored {
+  width: 24px;
+  height: 24px;
+  background-image: url(chrome://browser/skin/newtab/controls.png);
   background-position: -249px -1px;
 }
 
+@media (min-resolution: 2dppx) {
+  .newtab-control-sponsored {
+    background-image: url(chrome://browser/skin/newtab/controls@2x.png);
+    background-size: 296px;
+  }
+}
+
 .newtab-control-sponsored:hover {
   background-position: -265px -1px;
 }

browser/themes/windows/jar.mn

@@ -140,6 +140,7 @@ browser.jar:
 *       skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
         skin/classic/browser/newtab/controls.png                     (../shared/newtab/controls.png)
         skin/classic/browser/newtab/controls@2x.png                  (../shared/newtab/controls@2x.png)
+        skin/classic/browser/newtab/controls.svg                     (../shared/newtab/controls.svg)
         skin/classic/browser/newtab/texture.png                      (../shared/newtab/texture.png)
         skin/classic/browser/places/places.css                       (places/places.css)
 *       skin/classic/browser/places/organizer.css                    (places/organizer.css)
@@ -557,6 +558,7 @@ browser.jar:
 *       skin/classic/aero/browser/newtab/newTab.css                  (newtab/newTab.css)
         skin/classic/aero/browser/newtab/controls.png                (../shared/newtab/controls.png)
         skin/classic/aero/browser/newtab/controls@2x.png             (../shared/newtab/controls@2x.png)
+        skin/classic/aero/browser/newtab/controls.svg                (../shared/newtab/controls.svg)
         skin/classic/aero/browser/newtab/texture.png                 (../shared/newtab/texture.png)
 *       skin/classic/aero/browser/places/places.css                  (places/places-aero.css)
 *       skin/classic/aero/browser/places/organizer.css               (places/organizer-aero.css)