symbolic: contact-new

- clean up weird grouping and layer/context placement

Fixes https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/issues/97

3 files changed, 70 insertions, 62 deletions

diff --git a/Adwaita/scalable/actions/contact-new-symbolic.svg b/Adwaita/scalable/actions/contact-new-symbolic.svg
index 440393755..bd263b464 100644
--- a/Adwaita/scalable/actions/contact-new-symbolic.svg
+++ b/Adwaita/scalable/actions/contact-new-symbolic.svg
@@ -1 +1,42 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16.006" height="16"><g fill="#2e3436"><path d="M6 2a3 3 0 100 6 3 3 0 000-6zM4.5 9A4.49 4.49 0 000 13.5v.5c0 1 1 1 1 1h10s1 0 1-1v-.5A4.49 4.49 0 007.5 9z" style="marker:none" color="#bebebe" overflow="visible"/><path d="M12.006 1.003V3h-2v1.997h2v1.996h2V4.997h2V3h-2V1.003z"/></g></svg>
\ No newline at end of file
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='contact-new-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='1.0.1 (3bc2e813f5, 2020-09-07)' width='16.00585' xmlns='http://www.w3.org/2000/svg'>
+  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#000000' borderlayer='false' borderopacity='0.50196078' inkscape:current-layer='layer4' inkscape:cx='-42.51745' inkscape:cy='18.82673' inkscape:document-rotation='0' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:measure-end='0,0' inkscape:measure-start='0,0' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#e2e2e2' inkscape:pageopacity='0' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='false' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='false' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='1205' inkscape:window-maximized='0' inkscape:window-width='1553' inkscape:window-x='26' inkscape:window-y='23' inkscape:zoom='7.9999999'>
+    <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-332' originy='-852' snapvisiblegridlinesonly='true' spacingx='1' spacingy='1' type='xygrid' visible='true'/>
+    <inkscape:grid dotted='true' empcolor='#3f3fff' empopacity='0' empspacing='4' id='grid3540' originx='-332' originy='-852' spacingx='0.5' spacingy='0.5' type='xygrid'/>
+  </sodipodi:namedview>
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icons</dc:title>
+        <cc:license rdf:resource='http://creativecommons.org/licenses/by-sa/4.0/'/>
+      </cc:Work>
+      <cc:License rdf:about='http://creativecommons.org/licenses/by-sa/4.0/'>
+        <cc:permits rdf:resource='http://creativecommons.org/ns#Reproduction'/>
+        <cc:permits rdf:resource='http://creativecommons.org/ns#Distribution'/>
+        <cc:requires rdf:resource='http://creativecommons.org/ns#Notice'/>
+        <cc:requires rdf:resource='http://creativecommons.org/ns#Attribution'/>
+        <cc:permits rdf:resource='http://creativecommons.org/ns#DerivativeWorks'/>
+        <cc:requires rdf:resource='http://creativecommons.org/ns#ShareAlike'/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <title id='title8473'>Gnome Symbolic Icons</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='ui' transform='translate(-332,-852)'/>
+  <g inkscape:groupmode='layer' id='layer1' inkscape:label='status' transform='translate(-332,-788)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='legacy' transform='translate(-332,-852)'/>
+  <g inkscape:groupmode='layer' id='layer7' inkscape:label='places' transform='translate(-332,-788)'/>
+  <g inkscape:groupmode='layer' id='layer6' inkscape:label='mimetypes' transform='translate(-332,-788)'/>
+  <g inkscape:groupmode='layer' id='layer5' inkscape:label='emotes' transform='translate(-332,-788)'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='emblems' transform='translate(-332,-788)'/>
+  <g inkscape:groupmode='layer' id='layer2' inkscape:label='devices' transform='translate(-332,-788)'/>
+  <g inkscape:groupmode='layer' id='layer8' inkscape:label='categories' transform='translate(-332,-788)'/>
+  <g inkscape:groupmode='layer' id='layer3' inkscape:label='apps' transform='translate(-332,-788)'/>
+  <g inkscape:groupmode='layer' id='layer4' inkscape:label='actions' transform='translate(-332,-788)'>
+    <path inkscape:connector-curvature='0' d='m 338,789 c -1.65685,0 -3,1.34315 -3,3 0,1.65685 1.34315,3 3,3 1.65685,0 3,-1.34315 3,-3 0,-1.65685 -1.34315,-3 -3,-3 z m -1.5,7 c -2.493,0 -4.5,2.007 -4.5,4.5 v 1.5 c 0,1 1,1 1,1 h 10 c 0,0 1,0 1,-1 v -1.5 c 0,-2.493 -2.007,-4.5 -4.5,-4.5 z' id='path4144' sodipodi:nodetypes='ssssssccccccss' style='color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.84615;marker:none;enable-background:accumulate'/>
+    
+    <path inkscape:connector-curvature='0' d='m 344.00584,789.00326 v 1.99673 h -1.99999 v 1.99673 h 1.99999 v 1.99673 h 2.00001 v -1.99673 h 2 v -1.99673 h -2 v -1.99673 z' id='path4360' style='display:inline;fill:#2e3436;fill-opacity:1;stroke:none;enable-background:new'/>
+  </g>
+</svg>
diff --git a/Adwaita/scalable/status/contact-new-symbolic.svg b/Adwaita/scalable/status/contact-new-symbolic.svg
deleted file mode 100644
index acdcc3659..000000000
--- a/Adwaita/scalable/status/contact-new-symbolic.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M6 1a3 3 0 100 6 3 3 0 000-6zM4.5 8A4.49 4.49 0 000 12.5V14c0 1 1 1 1 1h10s1 0 1-1v-1.5A4.49 4.49 0 007.5 8z" style="marker:none" color="#bebebe" overflow="visible" fill="#2e3436"/>
-</svg>
diff --git a/src/symbolic/gnome-stencils.svg b/src/symbolic/gnome-stencils.svg
index d614c0f48..a69a19c3f 100644
--- a/src/symbolic/gnome-stencils.svg
+++ b/src/symbolic/gnome-stencils.svg
@@ -31,13 +31,13 @@
      inkscape:window-height="1376"
      id="namedview88"
      showgrid="true"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="248.36184"
-     inkscape:cy="81.140725"
+     inkscape:zoom="7.9999999"
+     inkscape:cx="289.48255"
+     inkscape:cy="870.82673"
      inkscape:window-x="26"
      inkscape:window-y="23"
      inkscape:window-maximized="0"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer4"
      showborder="false"
      inkscape:snap-nodes="true"
      inkscape:snap-bbox="true"
@@ -7120,25 +7120,6 @@
     </g>
     <g
        style="enable-background:new"
-       inkscape:label="contact-new"
-       transform="translate(280,640)"
-       id="g4153">
-      <path
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.84614968;marker:none;enable-background:accumulate"
-         d="m 58,149 c -1.656854,0 -3,1.34315 -3,3 0,1.65685 1.343146,3 3,3 1.656854,0 3,-1.34315 3,-3 0,-1.65685 -1.343146,-3 -3,-3 z m -1.5,7 c -2.493,0 -4.5,2.007 -4.5,4.5 v 1.5 c 0,1 1,1 1,1 h 10 c 0,0 1,0 1,-1 v -1.5 c 0,-2.493 -2.007,-4.5 -4.5,-4.5 z"
-         id="path4144"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssssssccccccss" />
-      <rect
-         y="148"
-         x="52"
-         height="16"
-         width="16"
-         id="rect4149"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none" />
-    </g>
-    <g
-       style="enable-background:new"
        id="g4171"
        inkscape:label="network-cellular-disabled-alt"
        transform="translate(-420)">
@@ -19129,36 +19110,6 @@
     </g>
     <g
        style="display:inline;"
-       id="g6234-6"
-       inkscape:label="contact-new-old"
-       transform="translate(-108.99435,430.99999)">
-      <rect
-         y="337"
-         x="41.000198"
-         height="16"
-         width="16"
-         id="rect20566-2"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;" />
-      <path
-         style="fill:#2e3436;fill-opacity:1;stroke:none;"
-         d="m 49.55489,345.09373 c -0.70541,0.62353 -1.53918,0.90625 -2.55469,0.90625 -1.01551,0 -1.85318,-0.29053 -2.55859,-0.91406 -1.10938,0.36328 -2.43603,1.28775 -2.4375,2.90234 l -0.0039,3.01172 c -7.2e-4,0.554 0.446,1.00002 1,1.00002 h 8 c 0.554,0 1,-0.44602 1,-1.00002 v -3 c 0,-1.38672 -1.10231,-2.5558 -2.44531,-2.90625 z"
-         id="path3940-5-0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csccsssscc" />
-      <circle
-         r="3"
-         cy="341.99997"
-         cx="47.000198"
-         id="path3942-6-0"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.4000001;marker:none;enable-background:accumulate;" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path26815-7"
-         d="M 53.000194,338.00327 V 340 h -1.999995 v 1.99673 h 1.999995 v 1.99673 H 55.0002 v -1.99673 h 1.999995 V 340 H 55.0002 v -1.99673 z"
-         style="display:inline;fill:#2e3436;fill-opacity:1;stroke:none;" />
-    </g>
-    <g
-       style="display:inline;"
        inkscape:label="document-print-preview"
        id="g27282"
        transform="translate(204.00565,169.99999)">
@@ -20792,11 +20743,6 @@
          d="M 67.160156,663 H 68 v -1 c 0.0081,-1.67271 0,-5 0,-5 0,0 -3.986142,0 -6,0 v 0.8457 c -0.09543,0.61124 0.381397,1.16164 1,1.1543 h 1.585938 l -1.642986,1.64299 -0.649983,0.64998 c -0.654091,0.63582 -0.185235,1.74367 0.726562,1.71679 0.259798,-0.008 0.506378,-0.11632 0.6875,-0.30273 L 64.334916,662.07914 66,660.41406 V 662 c 0,0.68107 0.449195,1 1.160156,1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new;" />
     </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="path4360"
-       d="m 344.00584,789.00326 v 1.99673 h -1.99999 v 1.99673 h 1.99999 v 1.99673 h 2.00001 v -1.99673 h 2 v -1.99673 h -2 v -1.99673 z"
-       style="display:inline;fill:#2e3436;fill-opacity:1;stroke:none" />
     <g
        inkscape:label="view-list-bullet"
        id="g3545"
@@ -22138,5 +22084,29 @@
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cc" />
     </g>
+    <g
+       style="enable-background:new"
+       inkscape:label="contact-new"
+       transform="translate(280,640)"
+       id="g4153">
+      <path
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.84615;marker:none;enable-background:accumulate"
+         d="m 58,149 c -1.656854,0 -3,1.34315 -3,3 0,1.65685 1.343146,3 3,3 1.656854,0 3,-1.34315 3,-3 0,-1.65685 -1.343146,-3 -3,-3 z m -1.5,7 c -2.493,0 -4.5,2.007 -4.5,4.5 v 1.5 c 0,1 1,1 1,1 h 10 c 0,0 1,0 1,-1 v -1.5 c 0,-2.493 -2.007,-4.5 -4.5,-4.5 z"
+         id="path4144"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssssssccccccss" />
+      <rect
+         y="148"
+         x="52"
+         height="16"
+         width="16"
+         id="rect4149"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4360"
+         d="m 64.00584,149.00326 v 1.99673 h -1.99999 v 1.99673 h 1.99999 v 1.99673 h 2.00001 v -1.99673 h 2 v -1.99673 h -2 v -1.99673 z"
+         style="display:inline;fill:#2e3436;fill-opacity:1;stroke:none;enable-background:new" />
+    </g>
   </g>
 </svg>