fullcolor: drive-optical

thanks, Sam

fixes https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/issues/136

20 files changed, 162 insertions, 13 deletions

diff --git a/Adwaita/16x16/devices/drive-harddisk.png b/Adwaita/16x16/devices/drive-harddisk.png
index bec3a098f..c3f1cc146 100644
--- a/Adwaita/16x16/devices/drive-harddisk.png
+++ b/Adwaita/16x16/devices/drive-harddisk.png
diff --git a/Adwaita/16x16/devices/drive-removable-media.png b/Adwaita/16x16/devices/drive-removable-media.png
index d6c7690a3..0cfbb30ce 100644
--- a/Adwaita/16x16/devices/drive-removable-media.png
+++ b/Adwaita/16x16/devices/drive-removable-media.png
diff --git a/Adwaita/16x16/legacy/drive-optical.png b/Adwaita/16x16/legacy/drive-optical.png
deleted file mode 100644
index 6f92488b8..000000000
--- a/Adwaita/16x16/legacy/drive-optical.png
+++ /dev/null
diff --git a/Adwaita/22x22/devices/drive-harddisk.png b/Adwaita/22x22/devices/drive-harddisk.png
index 8b6dd01c9..6f0f5515a 100644
--- a/Adwaita/22x22/devices/drive-harddisk.png
+++ b/Adwaita/22x22/devices/drive-harddisk.png
diff --git a/Adwaita/22x22/devices/drive-removable-media.png b/Adwaita/22x22/devices/drive-removable-media.png
index 98b373179..37a4c1455 100644
--- a/Adwaita/22x22/devices/drive-removable-media.png
+++ b/Adwaita/22x22/devices/drive-removable-media.png
diff --git a/Adwaita/22x22/legacy/drive-optical.png b/Adwaita/22x22/legacy/drive-optical.png
deleted file mode 100644
index 580228eef..000000000
--- a/Adwaita/22x22/legacy/drive-optical.png
+++ /dev/null
diff --git a/Adwaita/24x24/devices/drive-harddisk.png b/Adwaita/24x24/devices/drive-harddisk.png
index 28bb5b550..bb98a5f0b 100644
--- a/Adwaita/24x24/devices/drive-harddisk.png
+++ b/Adwaita/24x24/devices/drive-harddisk.png
diff --git a/Adwaita/24x24/devices/drive-removable-media.png b/Adwaita/24x24/devices/drive-removable-media.png
index ad090d104..95d5e5732 100644
--- a/Adwaita/24x24/devices/drive-removable-media.png
+++ b/Adwaita/24x24/devices/drive-removable-media.png
diff --git a/Adwaita/24x24/legacy/drive-optical.png b/Adwaita/24x24/legacy/drive-optical.png
deleted file mode 100644
index 0c53d7f8d..000000000
--- a/Adwaita/24x24/legacy/drive-optical.png
+++ /dev/null
diff --git a/Adwaita/32x32/devices/drive-harddisk.png b/Adwaita/32x32/devices/drive-harddisk.png
index e1be8f657..a0a07d719 100644
--- a/Adwaita/32x32/devices/drive-harddisk.png
+++ b/Adwaita/32x32/devices/drive-harddisk.png
diff --git a/Adwaita/32x32/devices/drive-removable-media.png b/Adwaita/32x32/devices/drive-removable-media.png
index c30eb02ab..2d03d5858 100644
--- a/Adwaita/32x32/devices/drive-removable-media.png
+++ b/Adwaita/32x32/devices/drive-removable-media.png
diff --git a/Adwaita/32x32/legacy/drive-optical.png b/Adwaita/32x32/legacy/drive-optical.png
deleted file mode 100644
index 3f2cd3457..000000000
--- a/Adwaita/32x32/legacy/drive-optical.png
+++ /dev/null
diff --git a/Adwaita/48x48/devices/drive-harddisk.png b/Adwaita/48x48/devices/drive-harddisk.png
index 14a15def8..f013a22c2 100644
--- a/Adwaita/48x48/devices/drive-harddisk.png
+++ b/Adwaita/48x48/devices/drive-harddisk.png
diff --git a/Adwaita/48x48/devices/drive-removable-media.png b/Adwaita/48x48/devices/drive-removable-media.png
index 2cd92234b..c0cb1decd 100644
--- a/Adwaita/48x48/devices/drive-removable-media.png
+++ b/Adwaita/48x48/devices/drive-removable-media.png
diff --git a/Adwaita/48x48/devices/media-removable.png b/Adwaita/48x48/devices/media-removable.png
index 5d24f6515..c1c682094 100644
--- a/Adwaita/48x48/devices/media-removable.png
+++ b/Adwaita/48x48/devices/media-removable.png
diff --git a/Adwaita/48x48/legacy/drive-optical.png b/Adwaita/48x48/legacy/drive-optical.png
deleted file mode 100644
index 3bec42571..000000000
--- a/Adwaita/48x48/legacy/drive-optical.png
+++ /dev/null
diff --git a/Adwaita/512x512/devices/drive-harddisk.png b/Adwaita/512x512/devices/drive-harddisk.png
index 9f20e524b..dec39d517 100644
--- a/Adwaita/512x512/devices/drive-harddisk.png
+++ b/Adwaita/512x512/devices/drive-harddisk.png
diff --git a/Adwaita/512x512/devices/drive-optical.png b/Adwaita/512x512/devices/drive-optical.png
new file mode 100644
index 000000000..6b122516d
--- /dev/null
+++ b/Adwaita/512x512/devices/drive-optical.png
diff --git a/Adwaita/512x512/devices/drive-removable-media.png b/Adwaita/512x512/devices/drive-removable-media.png
index d471cfe59..a64e0601a 100644
--- a/Adwaita/512x512/devices/drive-removable-media.png
+++ b/Adwaita/512x512/devices/drive-removable-media.png
diff --git a/src/fullcolor/drives.svg b/src/fullcolor/drives.svg
index a5b647055..d00f93511 100644
--- a/src/fullcolor/drives.svg
+++ b/src/fullcolor/drives.svg
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="96"
    inkscape:export-xdpi="96"
    inkscape:export-filename="Template.png"
@@ -15,12 +7,20 @@
    height="560"
    id="svg11300"
    sodipodi:version="0.32"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
    sodipodi:docname="drives.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0"
    style="display:inline;enable-background:new"
-   viewBox="0 0 680 560">
+   viewBox="0 0 680 560"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <title
      id="title4162">Adwaita Icon Template</title>
   <defs
@@ -336,8 +336,8 @@
        inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter12480"
-       x="-0.012"
-       width="1.024"
+       x="-0.012006087"
+       width="1.0240122"
        y="-0.012"
        height="1.024">
       <feGaussianBlur
@@ -1586,6 +1586,29 @@
        y1="291.5"
        x2="65"
        y2="291.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient974"
+       id="linearGradient563"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25,0,0,0.25,300,225)"
+       x1="48"
+       y1="44"
+       x2="464"
+       y2="44" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3723">
+      <rect
+         style="opacity:1;fill:#c0bfbc;stroke-width:8;stroke-linecap:round;stroke-linejoin:round"
+         id="rect3725"
+         width="160"
+         height="42"
+         x="-8"
+         y="268"
+         rx="2"
+         ry="2" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      stroke="#ef2929"
@@ -1599,7 +1622,7 @@
      inkscape:zoom="1"
      inkscape:cx="-99.949399"
      inkscape:cy="101.9264"
-     inkscape:current-layer="g2663"
+     inkscape:current-layer="g559"
      showgrid="false"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
@@ -2082,6 +2105,132 @@
     </g>
   </g>
   <g
+     id="g561"
+     inkscape:label="artwork:drive-optical"
+     inkscape:groupmode="layer"
+     style="display:inline"
+     transform="translate(0,260)">
+    <g
+       inkscape:groupmode="layer"
+       id="g479"
+       inkscape:label="baseplate"
+       style="display:none"
+       sodipodi:insensitive="true">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.3013px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;enable-background:new"
+         x="31.855944"
+         y="356.30042"
+         id="text469"
+         inkscape:label="context"><tspan
+           sodipodi:role="line"
+           id="tspan467"
+           x="31.855944"
+           y="356.30042">devices</tspan></text>
+      <text
+         inkscape:label="icon-name"
+         id="text473"
+         y="382.09937"
+         x="31.264769"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.3013px;line-height:22.8767px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;enable-background:new"
+         xml:space="preserve"><tspan
+           y="382.09937"
+           x="31.264769"
+           id="tspan471"
+           sodipodi:role="line">drive-optical</tspan></text>
+      <rect
+         style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         id="rect475"
+         width="512"
+         height="512"
+         x="24"
+         y="424"
+         inkscape:label="512x512" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path477"
+         d="M 24,424 V 936 H 535.875 V 424 h -36 V 900 H 60 V 424 Z"
+         style="display:inline;overflow:visible;visibility:visible;opacity:0.4;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g559"
+       inkscape:label="icons"
+       style="display:inline">
+      <g
+         transform="matrix(4,0,0,4,-1175.9999,-282.86368)"
+         style="display:inline;enable-background:new"
+         id="g495">
+        <rect
+           y="2242"
+           x="-1.5000001e-06"
+           height="128"
+           width="128"
+           id="rect483"
+           style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+           transform="translate(299.99997,-2069.9999)" />
+        <rect
+           ry="8"
+           rx="8"
+           y="204"
+           x="312"
+           height="83.999992"
+           width="104"
+           id="rect485"
+           style="display:inline;opacity:1;fill:url(#linearGradient563);fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
+        <rect
+           style="display:inline;opacity:1;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+           id="rect487"
+           width="104"
+           height="86.000099"
+           x="312"
+           y="184"
+           rx="8"
+           ry="8" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path493"
+           transform="translate(19.99997,-2281.9999)"
+           d="m 300,2466 c -4.432,0 -8,3.568 -8,8 v 66 h 104 v -66 c 0,-4.432 -3.568,-8 -8,-8 z"
+           style="display:inline;opacity:1;fill:#ffa348;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
+      </g>
+      <g
+         id="g1608"
+         transform="matrix(4,0,0,4,-620.95312,-2520.625)">
+        <rect
+           style="display:inline;fill:#3d3846;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;enable-background:new"
+           id="rect1889"
+           width="80"
+           height="4"
+           x="186"
+           y="834"
+           rx="2"
+           ry="2" />
+        <g
+           id="g3721"
+           clip-path="url(#clipPath3723)"
+           style="display:inline;enable-background:new"
+           transform="translate(162,568)">
+          <path
+             id="path3176"
+             style="opacity:1;fill:#c0bfbc;stroke-width:8;stroke-linecap:round;stroke-linejoin:round"
+             d="m 64,216 a 40,40 0 0 0 -40,40 40,40 0 0 0 40,40 40,40 0 0 0 40,-40 40,40 0 0 0 -40,-40 z m 0,32 a 8,8 0 0 1 8,8 8,8 0 0 1 -8,8 8,8 0 0 1 -8,-8 8,8 0 0 1 8,-8 z" />
+          <path
+             id="path2161"
+             style="opacity:1;fill:#deddda;stroke-width:8;stroke-linecap:round;stroke-linejoin:round"
+             d="M 72,58 A 40,40 0 0 0 32,98 40,40 0 0 0 72,138 40,40 0 0 0 112,98 40,40 0 0 0 72,58 Z m 0,32 a 8,8 0 0 1 8,8 8,8 0 0 1 -8,8 8,8 0 0 1 -8,-8 8,8 0 0 1 8,-8 z"
+             transform="translate(-8,156)" />
+          <path
+             id="circle2742"
+             style="opacity:1;fill:#f6f5f4;stroke-width:8;stroke-linecap:round;stroke-linejoin:round"
+             d="M 72,60 A 38,38 0 0 0 34,98 38,38 0 0 0 72,136 38,38 0 0 0 110,98 38,38 0 0 0 72,60 Z m 0,26 A 12,12 0 0 1 84,98 12,12 0 0 1 72,110 12,12 0 0 1 60,98 12,12 0 0 1 72,86 Z"
+             transform="translate(-8,156)" />
+        </g>
+      </g>
+    </g>
+  </g>
+  <g
      transform="translate(0,260)"
      style="display:inline"
      inkscape:groupmode="layer"