Tango: touch up dialog-fill-and-stroke to align on grid

(bzr r7855)

3 files changed, 158 insertions, 95 deletions

diff --git a/share/icons/tango/16x16/places/dialog-fill-and-stroke.png b/share/icons/tango/16x16/places/dialog-fill-and-stroke.png
index ce87f256e..e22c58fca 100644
--- a/share/icons/tango/16x16/places/dialog-fill-and-stroke.png
+++ b/share/icons/tango/16x16/places/dialog-fill-and-stroke.png
diff --git a/share/icons/tango/24x24/places/dialog-fill-and-stroke.png b/share/icons/tango/24x24/places/dialog-fill-and-stroke.png
index d2392c2e2..f32834959 100644
--- a/share/icons/tango/24x24/places/dialog-fill-and-stroke.png
+++ b/share/icons/tango/24x24/places/dialog-fill-and-stroke.png
diff --git a/share/icons/tango/scalable/places/dialog-fill-and-stroke.svg b/share/icons/tango/scalable/places/dialog-fill-and-stroke.svg
index bfd1aca2c..c7bb5f91a 100644
--- a/share/icons/tango/scalable/places/dialog-fill-and-stroke.svg
+++ b/share/icons/tango/scalable/places/dialog-fill-and-stroke.svg
@@ -14,12 +14,60 @@
    height="48"
    id="svg6944"
    sodipodi:version="0.32"
-   inkscape:version="0.46+devel r21210 custom"
+   inkscape:version="0.46+devel r21315"
    version="1.0"
    sodipodi:docname="dialog-fill-and-stroke.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs6946">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient869">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop871" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop873" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient857">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="0"
+         id="stop859" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:0;"
+         offset="1"
+         id="stop861" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient849">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop851" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop853" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient841">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop843" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:0;"
+         offset="1"
+         id="stop845" />
+    </linearGradient>
     <mask
        maskUnits="userSpaceOnUse"
        id="mask10969">
@@ -61,28 +109,6 @@
          offset="1.0000000"
          id="stop10853" />
     </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask10963">
-      <rect
-         style="fill:url(#linearGradient10967);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect10965"
-         width="16"
-         height="16"
-         x="-526"
-         y="-144"
-         transform="scale(-1,-1)" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10843"
-       id="linearGradient10967"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1036,-272)"
-       x1="510"
-       y1="136"
-       x2="526"
-       y2="136" />
     <filter
        inkscape:collect="always"
        id="filter10925"
@@ -116,6 +142,44 @@
          offset="1.0000000"
          id="stop3470" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient841"
+       id="linearGradient847"
+       x1="8.5218494"
+       y1="26.985762"
+       x2="45.449699"
+       y2="26.985762"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95997193,0,0,0.95997162,1.8192638,1.8192776)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient849"
+       id="linearGradient855"
+       x1="5.6812456"
+       y1="25.56546"
+       x2="45.449699"
+       y2="25.56546"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient857"
+       id="linearGradient863"
+       x1="3.797157e-05"
+       y1="22.724885"
+       x2="45.449699"
+       y2="22.724885"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99599285,0,0,0.99599327,0.17074108,0.17072315)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient869"
+       id="linearGradient875"
+       x1="6"
+       y1="6"
+       x2="33"
+       y2="22"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -124,16 +188,20 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="36.218716"
-     inkscape:cy="-94.497487"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="21.184332"
+     inkscape:cy="22.79401"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      inkscape:window-width="1024"
      inkscape:window-height="737"
      inkscape:window-x="0"
-     inkscape:window-y="1" />
+     inkscape:window-y="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid865" />
+  </sodipodi:namedview>
   <metadata
      id="metadata6949">
     <rdf:RDF>
@@ -150,74 +218,69 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">
+    <rect
+       style="color:#000000;fill:url(#linearGradient875);stroke-width:6;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:1"
+       id="rect867"
+       width="39"
+       height="37"
+       x="6"
+       y="6" />
+    <rect
+       y="128"
+       x="510"
+       height="16"
+       width="16"
+       id="rect9392"
+       style="fill:none;stroke:none;stroke-width:1;marker:none;display:inline"
+       mask="url(#mask10969)"
+       transform="matrix(2.8406038,0,0,2.8406038,-1448.7079,-363.59726)" />
+    <path
+       style="fill:none;stroke:url(#linearGradient863);stroke-width:6;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 3,42.609112 3,3 42.609095,3"
+       id="path9388"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:url(#linearGradient847);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994;marker:none;display:inline"
+       d="M 10,10 45.449699,10 10,45.449687 10,10 z"
+       id="path9390"
+       sodipodi:nodetypes="cccc" />
     <g
-       transform="matrix(2.8406038,0,0,2.8406038,-1448.7079,-363.59726)"
-       style="display:inline"
-       id="fill_and_stroke">
-      <rect
-         mask="url(#mask10969)"
-         style="fill:none;stroke:none;stroke-width:1;marker:none;display:inline"
-         id="rect9392"
-         width="16"
-         height="16"
-         x="510"
-         y="128" />
-      <g
-         mask="url(#mask10963)"
-         id="g10931">
-        <path
-           style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 511,143.00001 0,-14 14,0"
-           id="path9388"
-           sodipodi:nodetypes="ccc" />
-        <path
-           style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994;marker:none;display:inline"
-           d="m 513,131 13,0 -13,13 0,-13 z"
-           id="path9390"
-           sodipodi:nodetypes="cccc" />
-        <path
-           sodipodi:nodetypes="ccc"
-           id="path10929"
-           d="m 512.5,143.5 0,-13 13,0"
-           style="fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50196078;stroke-dasharray:none" />
-      </g>
-      <g
-         id="g10952">
-        <path
-           style="opacity:0.3;fill:none;stroke:#646464;stroke-width:0.99999994px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter10925)"
-           d="m 511.5,143.49999 c 5.5,0 8.5,-0.4958 9,-3.4706 l 5,-2.9748"
-           id="path9396"
-           sodipodi:nodetypes="ccc" />
-        <path
-           style="fill:#e9b96e;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           d="m 521.63088,133.45504 2.97861,3 1.39051,-0.40049 0,-7"
-           id="path9398"
-           sodipodi:nodetypes="cccc" />
-        <path
-           style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:#846c00;stroke-width:0.99999994px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-           d="m 510.53137,143.49612 c 3.46126,-2.08701 3.46863,-5.5018 7.23385,-6.09596 0.5,0.49525 1.65556,1.81483 2.25704,2.03413 -0.22141,2.7522 -4.02226,4.14955 -9.49089,4.06183 z"
-           id="path9400"
-           sodipodi:nodetypes="cccc" />
-        <path
-           style="fill:url(#linearGradient10961);fill-opacity:1;fill-rule:evenodd;stroke:#3d3d3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
-           d="m 517.9849,137.41145 3.36865,-3.49984 c 1.06654,0.66731 1.93542,1.73386 2.46967,3 l -4.05972,2.58839 -1.7786,-2.08855 z"
-           id="path9402"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:none;stroke:#8f5902;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-           d="m 525.34134,129.27595 c -1.39145,1.23793 -2.56289,2.65436 -3.64461,4.11323 1.4214,0.86693 2.1109,2 2.73386,3.26615 0.76999,-0.28905 0.56511,-0.17888 1.06941,-0.46794"
-           id="path9404"
-           sodipodi:nodetypes="cccc" />
-        <path
-           style="fill:#cda74a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 518.61863,138.89495 c -0.57452,1.14905 -2.12132,3.22617 -6.40815,4.06586 2.87983,0.0101 5.98754,-0.26578 7.29203,-3.0052 l -0.88388,-1.06066 z"
-           id="path10948"
-           sodipodi:nodetypes="cccc" />
-        <path
-           style="fill:#cb8331;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 525.91067,132.26582 -2.34229,2.03293 1.10485,1.72358 1.28163,-0.53033 -0.0442,-3.22618 z"
-           id="path10950" />
-      </g>
+       id="g10952"
+       transform="matrix(2.8406038,0,0,2.8406038,-1448.7079,-363.59726)">
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path9396"
+         d="m 511.5,143.49999 c 5.5,0 8.5,-0.4958 9,-3.4706 l 5,-2.9748"
+         style="opacity:0.3;fill:none;stroke:#646464;stroke-width:0.99999994px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter10925)" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path9398"
+         d="m 521.63088,133.45504 2.97861,3 1.39051,-0.40049 0,-7"
+         style="fill:#e9b96e;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path9400"
+         d="m 510.53137,143.49612 c 3.46126,-2.08701 3.46863,-5.5018 7.23385,-6.09596 0.5,0.49525 1.65556,1.81483 2.25704,2.03413 -0.22141,2.7522 -4.02226,4.14955 -9.49089,4.06183 z"
+         style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:#846c00;stroke-width:0.99999994px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path9402"
+         d="m 517.9849,137.41145 3.36865,-3.49984 c 1.06654,0.66731 1.93542,1.73386 2.46967,3 l -4.05972,2.58839 -1.7786,-2.08855 z"
+         style="fill:url(#linearGradient10961);fill-opacity:1;fill-rule:evenodd;stroke:#3d3d3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path9404"
+         d="m 525.34134,129.27595 c -1.39145,1.23793 -2.56289,2.65436 -3.64461,4.11323 1.4214,0.86693 2.1109,2 2.73386,3.26615 0.76999,-0.28905 0.56511,-0.17888 1.06941,-0.46794"
+         style="fill:none;stroke:#8f5902;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path10948"
+         d="m 518.61863,138.89495 c -0.57452,1.14905 -2.12132,3.22617 -6.40815,4.06586 2.87983,0.0101 5.98754,-0.26578 7.29203,-3.0052 l -0.88388,-1.06066 z"
+         style="fill:#cda74a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         id="path10950"
+         d="m 525.91067,132.26582 -2.34229,2.03293 1.10485,1.72358 1.28163,-0.53033 -0.0442,-3.22618 z"
+         style="fill:#cb8331;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     </g>
   </g>
 </svg>