Merge branch 'master' into wip/3.18

4 files changed, 24 insertions, 31 deletions

diff --git a/common/cinnamon/common-assets/misc/bg.svg b/common/cinnamon/common-assets/misc/bg.svg
index cf27958..feeddea 100644
--- a/common/cinnamon/common-assets/misc/bg.svg
+++ b/common/cinnamon/common-assets/misc/bg.svg
@@ -15,7 +15,7 @@
    id="svg5386"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="notification.svg">
+   sodipodi:docname="bg.svg">
   <defs
      id="defs5388" />
   <sodipodi:namedview
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="14.604606"
-     inkscape:cy="20.53994"
+     inkscape:zoom="11.313708"
+     inkscape:cx="18.271674"
+     inkscape:cy="5.838404"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -58,7 +58,7 @@
      id="layer1"
      transform="translate(0,-1020.3622)">
     <rect
-       style="display:inline;opacity:0.72;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:0.81;fill:none;fill-opacity:1;stroke:#161a26;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4164-4-3"
        width="23"
        height="21.999889"
@@ -67,7 +67,7 @@
        rx="2.0000005"
        ry="1.9999999" />
     <rect
-       style="display:inline;opacity:0.95;fill:#3c4049;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4164"
        width="22"
        height="20.999971"
@@ -78,7 +78,7 @@
     <g
        transform="translate(-425.99995,658.36226)"
        id="g4271"
-       style="display:inline;opacity:0.75">
+       style="display:inline;opacity:0.65">
       <rect
          ry="8"
          rx="8"
diff --git a/common/cinnamon/common-assets/misc/button-box.svg b/common/cinnamon/common-assets/misc/button-box.svg
index 7435084..036f0d1 100644
--- a/common/cinnamon/common-assets/misc/button-box.svg
+++ b/common/cinnamon/common-assets/misc/button-box.svg
@@ -40,8 +40,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="16"
-     inkscape:cx="-0.14173931"
-     inkscape:cy="13.244492"
+     inkscape:cx="9.376447"
+     inkscape:cy="10.14915"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -83,15 +83,8 @@
      id="layer1"
      transform="translate(-5,-1027.3622)">
     <path
-       style="opacity:0.67;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 0,3.6512857e-5 0,17 c 0,1.108 0.892,2 2,2 l 18,0 c 1.108,0 2,-0.892 2,-2 L 22,3.6512857e-5 Z M 21,1.0000365 21,17 c 0,0.554 -0.446,1 -1,1 L 2,18 C 1.446,18 1,17.554 1,17 L 1,1.0000365 Z"
-       transform="translate(5,1027.3622)"
-       id="rect4147"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssscccsssscc" />
-    <path
-       style="opacity:0.95;fill:#3c4049;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 26,1027.3622 0,17 c 0,0.554 -0.446,1 -1,1 l -18,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-17 z"
+       style="opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 27,1027.3622 0,17.9445 c 0,0.5848 -0.4906,1.0555 -1.1,1.0555 l -19.8,0 c -0.6094,0 -1.1,-0.4707 -1.1,-1.0555 l 0,-17.9445 z"
        id="rect4145-1"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="csssscc" />
diff --git a/common/cinnamon/common-assets/misc/desklet-header.svg b/common/cinnamon/common-assets/misc/desklet-header.svg
index fd6b6df..a6e1054 100644
--- a/common/cinnamon/common-assets/misc/desklet-header.svg
+++ b/common/cinnamon/common-assets/misc/desklet-header.svg
@@ -38,9 +38,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="16.568127"
-     inkscape:cy="2.2143252"
+     inkscape:zoom="15.999999"
+     inkscape:cx="13.051047"
+     inkscape:cy="8.8454562"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -88,7 +88,7 @@
          height="21.999889"
          width="23"
          id="rect4164-4-3"
-         style="display:inline;opacity:0.72000002;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:0.84;fill:none;fill-opacity:1;stroke:#161a26;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
          ry="1.4"
          rx="1.4"
@@ -97,7 +97,7 @@
          height="20.999971"
          width="22"
          id="rect4164"
-         style="display:inline;opacity:0.95;fill:#33373f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:0.95;fill:#2b2f3b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <g
          style="display:inline;opacity:0.75"
          id="g4271"
diff --git a/common/cinnamon/common-assets/misc/osd.svg b/common/cinnamon/common-assets/misc/osd.svg
index e7a4202..df41a00 100644
--- a/common/cinnamon/common-assets/misc/osd.svg
+++ b/common/cinnamon/common-assets/misc/osd.svg
@@ -15,7 +15,7 @@
    id="svg5386"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="notification.svg">
+   sodipodi:docname="osd.svg">
   <defs
      id="defs5388" />
   <sodipodi:namedview
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="8.7900421"
-     inkscape:cy="21.131226"
+     inkscape:zoom="16"
+     inkscape:cx="23.210075"
+     inkscape:cy="11.575503"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -48,7 +48,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -58,7 +58,7 @@
      id="layer1"
      transform="translate(0,-1020.3622)">
     <rect
-       style="display:inline;opacity:0.8;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:0.85;fill:none;fill-opacity:1;stroke:#0f1116;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4164-4-3"
        width="23"
        height="21.999889"
@@ -67,7 +67,7 @@
        rx="2.0000005"
        ry="1.9999999" />
     <rect
-       style="display:inline;opacity:0.95;fill:#252a2f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4164"
        width="22"
        height="20.999971"
@@ -78,7 +78,7 @@
     <g
        transform="translate(-425.99995,658.36226)"
        id="g4271"
-       style="display:inline;opacity:0.75">
+       style="display:inline;opacity:0.65">
       <rect
          ry="8"
          rx="8"