Merge lp:~sladen/unity-asset-pool/unity-asset-pool-lp761421-lp760656 into lp:unity-asset-pool

[Paul Sladen]

Remove 'trash*png' to allow colourful Humanity icons to shine through (LP: #761421)

[lp:~sladen/unity-asset-pool/unity-asset-pool-lp761421-lp760656]

54. By Paul Sladen on 2011-04-15

Replace 'workspace-switcher.png' to remove square edges owing to errornous background layer inclusion
Note that this does not remove the sheen overlay, border, or coloured lighting, which needs to be disabled in code

=== modified file 'unity-icon-theme/apps/48/workspace-switcher.png'
Binary files unity-icon-theme/apps/48/workspace-switcher.png	2011-04-11 21:51:50 +0000 and unity-icon-theme/apps/48/workspace-switcher.png	2011-04-15 06:52:30 +0000 differ
=== removed file 'unity-icon-theme/places/48/user-trash-full.png'
Binary files unity-icon-theme/places/48/user-trash-full.png	2011-04-11 21:51:50 +0000 and unity-icon-theme/places/48/user-trash-full.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'unity-icon-theme/places/48/user-trash.png'
Binary files unity-icon-theme/places/48/user-trash.png	2011-04-11 21:51:50 +0000 and unity-icon-theme/places/48/user-trash.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'unity-icon-theme/places/svg/trash.svg'
--- unity-icon-theme/places/svg/trash.svg	2010-08-31 13:32:29 +0000
+++ unity-icon-theme/places/svg/trash.svg	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="48"
-   height="48"
-   id="svg5200">
-  <defs
-     id="defs5202">
-    <linearGradient
-       x1="90.443031"
-       y1="16.39608"
-       x2="90.764702"
-       y2="60.39608"
-       id="linearGradient4731"
-       xlink:href="#linearGradient4168-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.77272727,0,0,0.82352947,-49.712153,-6.5027094)" />
-    <linearGradient
-       id="linearGradient4168-2">
-      <stop
-         id="stop4170-5"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4172-4"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="41.745152"
-       y1="19.39608"
-       x2="41.745152"
-       y2="59.39608"
-       id="linearGradient4868"
-       xlink:href="#linearGradient4168-2-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000015,0,0,0.75000052,-6.996123,-4.2971292)" />
-    <linearGradient
-       id="linearGradient4168-2-4">
-      <stop
-         id="stop4170-5-9"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4172-4-0"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4491-1">
-      <stop
-         id="stop4493-9"
-         style="stop-color:#959591;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4501-2"
-         style="stop-color:#797875;stop-opacity:1"
-         offset="0.25" />
-      <stop
-         id="stop4499-6"
-         style="stop-color:#4e4d4b;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop4503-6"
-         style="stop-color:#3c3b37;stop-opacity:1"
-         offset="0.75" />
-      <stop
-         id="stop4495-7"
-         style="stop-color:#343330;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="29.157831"
-       y1="423.28589"
-       x2="29.157831"
-       y2="460.98489"
-       id="linearGradient6014"
-       xlink:href="#linearGradient4491-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5.000013,-417.28912)" />
-  </defs>
-  <g
-     id="layer1">
-    <rect
-       width="46"
-       height="46"
-       rx="2.7487497"
-       ry="2.1453514"
-       x="1"
-       y="1"
-       id="rect5168"
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m -769,961.5625 c -1.44212,0 -2.6875,1.136 -2.6875,2.59375 l 0,0.40625 -4.5625,0 c -1.44212,0 -2.6875,1.136 -2.6875,2.59375 l 0,1.5 a 1.1045737,1.1045737 0 0 0 1,1.09375 l 0,1.5 0,14.40625 0,6.40625 c 0,1.46115 1.18739,2.6875 2.65625,2.6875 l 18.875,0 c 1.46886,0 2.65625,-1.22635 2.65625,-2.6875 l 0,-6.40625 0,-14.40625 0,-1.5 a 1.1045737,1.1045737 0 0 0 1,-1.09375 l 0,-1.5 c 0,-1.45775 -1.24538,-2.59375 -2.6875,-2.59375 l -4.46875,0 0,-0.40625 c 0,-1.45775 -1.24538,-2.59375 -2.6875,-2.59375 l -6.40625,0 z"
-       transform="translate(789.85712,-951.64795)"
-       id="path4909"
-       style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m -769,960.6875 c -1.72111,0 -3.21542,1.28731 -3.46875,3 l -3.78125,0 c -1.88131,0 -3.5625,1.51568 -3.5625,3.46875 l 0,1.5 a 1.9775184,1.9775184 0 0 0 1,1.71875 l 0,0.875 0,14.40625 0,6.40625 c 0,1.91541 1.58955,3.5625 3.53125,3.5625 l 18.875,0 c 1.9417,0 3.53125,-1.64709 3.53125,-3.5625 l 0,-6.40625 0,-14.40625 0,-0.875 a 1.9775184,1.9775184 0 0 0 1,-1.71875 l 0,-1.5 c 0,-1.95307 -1.68119,-3.46875 -3.5625,-3.46875 l -3.6875,0 c -0.25333,-1.71269 -1.74764,-3 -3.46875,-3 l -6.40625,0 z"
-       transform="translate(789.85712,-951.64795)"
-       id="path4909-6"
-       style="opacity:0.07000002;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 20.843747,10.999941 c -0.8864,0 -1.59375,0.669 -1.59375,1.5 l 0,1.5 -5.65625,0 c -0.8864,0 -1.59375,0.669 -1.59375,1.5 l 0,1.5 1.59375,0 20.8125,0 1.59375,0 0,-1.5 c 0,-0.831 -0.70735,-1.5 -1.59375,-1.5 l -5.5625,0 0,-1.5 c 0,-0.831 -0.70735,-1.5 -1.59375,-1.5 l -6.40625,0 z m 0.90625,2 4.5,0 c 0.4155,0 0.75,0.223 0.75,0.5 l 0,0.5 -6,0 0,-0.5 c 0,-0.277 0.3345,-0.5 0.75,-0.5 z m -8.75,5 0,1.59375 0,14.40625 0,6.40625 c 0,0.88636 0.69193,1.59375 1.5625,1.59375 l 18.875,0 c 0.87057,0 1.5625,-0.70739 1.5625,-1.59375 l 0,-6.40625 0,-14.40625 0,-1.59375 -1.5625,0 -18.875,0 -1.5625,0 z m 4,4 c 0.554,0 1,0.35922 1,0.8125 l 0,16.375 c 0,0.4533 -0.446,0.8125 -1,0.8125 -0.554,0 -1,-0.3592 -1,-0.8125 l 0,-16.375 c 0,-0.45328 0.446,-0.8125 1,-0.8125 z m 5,0 c 0.554,0 1,0.35922 1,0.8125 l 0,16.375 c 0,0.4533 -0.446,0.8125 -1,0.8125 -0.554,0 -1,-0.3592 -1,-0.8125 l 0,-16.375 c 0,-0.45328 0.446,-0.8125 1,-0.8125 z m 5,0 c 0.554,0 1,0.35922 1,0.8125 l 0,16.375 c 0,0.4533 -0.446,0.8125 -1,0.8125 -0.554,0 -1,-0.3592 -1,-0.8125 l 0,-16.375 c 0,-0.45328 0.446,-0.8125 1,-0.8125 z m 5,0 c 0.554,0 1,0.35922 1,0.8125 l 0,16.375 c 0,0.4533 -0.446,0.8125 -1,0.8125 -0.554,0 -1,-0.3592 -1,-0.8125 l 0,-16.375 c 0,-0.45328 0.446,-0.8125 1,-0.8125 z"
-       id="path4810"
-       style="color:#000000;fill:url(#linearGradient4868);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>