Merged upstream, supporting 3.22v1.0.0-beta.1

6 files changed, 16 insertions, 16 deletions

diff --git a/common/cinnamon/common-assets/panel/activities-active.svg b/common/cinnamon/common-assets/panel/activities-active.svg
index ae5c602..32c73a6 100644
--- a/common/cinnamon/common-assets/panel/activities-active.svg
+++ b/common/cinnamon/common-assets/panel/activities-active.svg
@@ -26,7 +26,7 @@
      stroke="#ef2929"
      fill="#f57900"
      id="base"
-     pagecolor="#bebebe"
+     pagecolor="#657b83"
      bordercolor="#525252"
      borderopacity="1"
      inkscape:pageopacity="1"
@@ -83,7 +83,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4140" />
     </linearGradient>
diff --git a/common/cinnamon/common-assets/panel/activities.svg b/common/cinnamon/common-assets/panel/activities.svg
index b4a4b0d..b3bcad9 100644
--- a/common/cinnamon/common-assets/panel/activities.svg
+++ b/common/cinnamon/common-assets/panel/activities.svg
@@ -24,7 +24,7 @@
      stroke="#ef2929"
      fill="#f57900"
      id="base"
-     pagecolor="#bebebe"
+     pagecolor="#657b83"
      bordercolor="#525252"
      borderopacity="1"
      inkscape:pageopacity="1"
@@ -134,21 +134,21 @@
      id="layer1"
      transform="translate(0,-276)">
     <rect
-       style="opacity:1;fill:#ffffff;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="opacity:1;fill:#fdf6e3;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="rect4138"
        width="2"
        height="2"
        x="5"
        y="287" />
     <rect
-       style="display:inline;opacity:1;fill:#ffffff;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;enable-background:new"
+       style="display:inline;opacity:1;fill:#fdf6e3;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;enable-background:new"
        id="rect4138-6"
        width="2"
        height="2"
        x="11"
        y="287" />
     <rect
-       style="display:inline;opacity:1;fill:#ffffff;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;enable-background:new"
+       style="display:inline;opacity:1;fill:#fdf6e3;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;enable-background:new"
        id="rect4138-9"
        width="2"
        height="2"
diff --git a/common/cinnamon/common-assets/panel/panel-bottom.svg b/common/cinnamon/common-assets/panel/panel-bottom.svg
index b5635bc..9615d95 100644
--- a/common/cinnamon/common-assets/panel/panel-bottom.svg
+++ b/common/cinnamon/common-assets/panel/panel-bottom.svg
@@ -20,7 +20,7 @@
      id="defs4198" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -66,14 +66,14 @@
          height="26"
          width="27"
          id="rect4713"
-         style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:2;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:#002b36;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
          y="1051.3622"
          x="0"
          height="1"
          width="27"
          id="rect4713-4"
-         style="display:inline;opacity:0.85;fill:#0f1116;fill-opacity:1;stroke:none;stroke-width:2;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:#002b36;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/common/cinnamon/common-assets/panel/panel-top.svg b/common/cinnamon/common-assets/panel/panel-top.svg
index c0a64da..1bd946e 100644
--- a/common/cinnamon/common-assets/panel/panel-top.svg
+++ b/common/cinnamon/common-assets/panel/panel-top.svg
@@ -20,7 +20,7 @@
      id="defs4198" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -58,14 +58,14 @@
      id="layer1"
      transform="translate(0,-1025.3622)">
     <rect
-       style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:2;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:#002b36;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4713"
        width="27"
        height="26"
        x="0"
        y="1025.3622" />
     <rect
-       style="display:inline;opacity:0.85;fill:#0f1116;fill-opacity:1;stroke:none;stroke-width:2;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:#002b36;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4713-4"
        width="27"
        height="1"
diff --git a/common/cinnamon/common-assets/panel/window-list-active-bottom.svg b/common/cinnamon/common-assets/panel/window-list-active-bottom.svg
index fbe4599..5be9bd0 100644
--- a/common/cinnamon/common-assets/panel/window-list-active-bottom.svg
+++ b/common/cinnamon/common-assets/panel/window-list-active-bottom.svg
@@ -26,7 +26,7 @@
      stroke="#ef2929"
      fill="#f57900"
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#808080"
      borderopacity="1"
      inkscape:pageopacity="0"
@@ -81,7 +81,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4137" />
     </linearGradient>
diff --git a/common/cinnamon/common-assets/panel/window-list-active-top.svg b/common/cinnamon/common-assets/panel/window-list-active-top.svg
index 54a9036..30187f9 100644
--- a/common/cinnamon/common-assets/panel/window-list-active-top.svg
+++ b/common/cinnamon/common-assets/panel/window-list-active-top.svg
@@ -26,7 +26,7 @@
      stroke="#ef2929"
      fill="#f57900"
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#808080"
      borderopacity="1"
      inkscape:pageopacity="0"
@@ -81,7 +81,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4137" />
     </linearGradient>