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

1 files changed, 54 insertions, 54 deletions

diff --git a/common/xfwm4/assets-dark.svg b/common/xfwm4/assets-dark.svg
index bcff6ba..795261c 100644
--- a/common/xfwm4/assets-dark.svg
+++ b/common/xfwm4/assets-dark.svg
@@ -24,7 +24,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="stop4421" />
     </linearGradient>
@@ -32,7 +32,7 @@
        id="selected_fg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#ffffffgit;stop-opacity:1;"
+         style="stop-color:#fdf6e3git;stop-opacity:1;"
          offset="0"
          id="stop4416" />
     </linearGradient>
@@ -111,7 +111,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -160,7 +160,7 @@
      id="layer1"
      transform="translate(5,-547.36215)">
     <rect
-       style="opacity:1;fill:#2f343f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#002b36;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="menu-active"
        width="26"
        height="16"
@@ -220,7 +220,7 @@
          y="0"
          x="0" />
       <g
-         style="fill:#5294e2;fill-opacity:1"
+         style="fill:#268bd2;fill-opacity:1"
          transform="translate(25,2.9999812)"
          id="g5140-7">
         <rect
@@ -315,7 +315,7 @@
          y="0"
          x="0" />
       <g
-         style="fill:#5294e2;fill-opacity:1"
+         style="fill:#268bd2;fill-opacity:1"
          transform="translate(22.999996,-1.0000226)"
          id="g5193-7">
         <rect
@@ -471,7 +471,7 @@
          id="rect4138-9"
          transform="translate(0,552.36216)"
          d="m 6,174 0,1 -1,0 0,27 2,0 0,-28 -1,0 z"
-         style="opacity:1;fill:#2f343f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="opacity:1;fill:#002b36;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          inkscape:connector-curvature="0" />
       <rect
          y="726.36218"
@@ -529,7 +529,7 @@
          style="opacity:1"
          id="g4206">
         <rect
-           style="opacity:1;fill:#2f343f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="opacity:1;fill:#002b36;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect4138"
            width="28"
            height="28"
@@ -577,7 +577,7 @@
                    transform="translate(58,0)">
                   <path
                      inkscape:connector-curvature="0"
-                     style="fill:#cc575d;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                     style="fill:#dc322f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
                      d="m 414,58 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m -3,3.921875 0.75,0 c 0.008,-9e-5 0.0156,-3.45e-4 0.0234,0 0.19121,0.0084 0.3824,0.09643 0.51562,0.234375 L 414,63.867188 415.73438,62.15625 c 0.19921,-0.172875 0.335,-0.229125 0.51562,-0.234375 l 0.75,0 0,0.75 c 0,0.214853 -0.0258,0.412987 -0.1875,0.5625 l -1.71094,1.710937 1.6875,1.6875 C 416.9302,66.77394 416.99999,66.9729 417,67.171875 l 0,0.75 -0.75,0 c -0.19898,-8e-6 -0.39794,-0.06982 -0.53906,-0.210937 L 414,66 l -1.71094,1.710938 c -0.14112,0.141142 -0.34009,0.210937 -0.53906,0.210937 l -0.75,0 0,-0.75 c 0,-0.198967 0.0698,-0.397935 0.21094,-0.539063 l 1.71094,-1.6875 -1.71094,-1.710937 C 411.05288,63.088403 410.98357,62.882438 411,62.671875 l 0,-0.75 z"
                      transform="translate(962.00001,190.00002)"
                      id="path4068-7-5-9-6-5-8-5" />
@@ -586,45 +586,45 @@
               <g
                  id="g4778-2-68-8-7-9"
                  transform="translate(1323,246.86719)"
-                 style="fill:#ffffff;fill-opacity:1">
+                 style="fill:#fdf6e3;fill-opacity:1">
                 <g
-                   style="display:inline;fill:#ffffff;fill-opacity:1"
+                   style="display:inline;fill:#fdf6e3;fill-opacity:1"
                    id="layer9-9-4-4-1-1-7"
                    transform="translate(-60,-518)" />
                 <g
                    id="layer10-2-1-8-0-4-4"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer11-16-4-9-6-9-0"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    transform="matrix(0.75,0,0,0.75,2,2.0546875)"
                    id="g2996-76-5-96-3-7"
-                   style="fill:#ffffff;fill-opacity:1">
+                   style="fill:#fdf6e3;fill-opacity:1">
                   <g
                      transform="translate(-60,-518)"
                      id="layer12-4-5-7-9-4-5"
-                     style="fill:#ffffff;fill-opacity:1">
+                     style="fill:#fdf6e3;fill-opacity:1">
                     <g
                        transform="translate(19,-242)"
                        id="layer4-4-1-9-5-6-3-8"
-                       style="display:inline;fill:#ffffff;fill-opacity:1" />
+                       style="display:inline;fill:#fdf6e3;fill-opacity:1" />
                   </g>
                 </g>
                 <g
                    id="layer13-2-6-11-3-1-6"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer14-4-0-33-2-4-8"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer15-7-3-0-6-6-3"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
               </g>
             </g>
             <rect
@@ -676,7 +676,7 @@
                    transform="translate(58,0)">
                   <path
                      inkscape:connector-curvature="0"
-                     style="fill:#d7787d;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                     style="fill:#cb4b16;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
                      d="m 414,92 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m -3,3.921875 0.75,0 c 0.008,-9e-5 0.0156,-3.45e-4 0.0234,0 0.19121,0.0084 0.3824,0.09643 0.51562,0.234375 L 414,97.867188 415.73438,96.15625 c 0.19921,-0.172875 0.335,-0.229125 0.51562,-0.234375 l 0.75,0 0,0.75 c 0,0.214853 -0.0258,0.412987 -0.1875,0.5625 l -1.71094,1.710937 1.6875,1.687498 c 0.14114,0.14113 0.21093,0.34009 0.21094,0.53907 l 0,0.75 -0.75,0 c -0.19898,-1e-5 -0.39794,-0.0698 -0.53906,-0.21094 L 414,100 l -1.71094,1.71094 c -0.14112,0.14114 -0.34009,0.21094 -0.53906,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.0698,-0.39794 0.21094,-0.53907 l 1.71094,-1.687498 -1.71094,-1.710937 C 411.05288,97.088403 410.98357,96.882438 411,96.671875 l 0,-0.75 z"
                      transform="translate(962,156.00002)"
                      id="path4068-7-5-8-2-3" />
@@ -685,45 +685,45 @@
               <g
                  id="g4778-4-0-2"
                  transform="translate(1323,246.86719)"
-                 style="fill:#ffffff;fill-opacity:1">
+                 style="fill:#fdf6e3;fill-opacity:1">
                 <g
-                   style="display:inline;fill:#ffffff;fill-opacity:1"
+                   style="display:inline;fill:#fdf6e3;fill-opacity:1"
                    id="layer9-9-44-1-6"
                    transform="translate(-60,-518)" />
                 <g
                    id="layer10-2-9-3-3"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer11-16-3-1-7"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    transform="matrix(0.75,0,0,0.75,2,2.0546875)"
                    id="g2996-9-3-3"
-                   style="fill:#ffffff;fill-opacity:1">
+                   style="fill:#fdf6e3;fill-opacity:1">
                   <g
                      transform="translate(-60,-518)"
                      id="layer12-4-7-1-2"
-                     style="fill:#ffffff;fill-opacity:1">
+                     style="fill:#fdf6e3;fill-opacity:1">
                     <g
                        transform="translate(19,-242)"
                        id="layer4-4-1-3-3-7"
-                       style="display:inline;fill:#ffffff;fill-opacity:1" />
+                       style="display:inline;fill:#fdf6e3;fill-opacity:1" />
                   </g>
                 </g>
                 <g
                    id="layer13-2-02-1-6"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer14-4-7-9-6"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer15-7-4-7-9"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
               </g>
             </g>
             <rect
@@ -775,7 +775,7 @@
                    transform="translate(58,0)">
                   <path
                      inkscape:connector-curvature="0"
-                     style="fill:#be3841;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                     style="fill:#dc322f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
                      d="m 414,109 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m -3,3.92188 0.75,0 c 0.008,-1e-4 0.0156,-3.5e-4 0.0234,0 0.19121,0.008 0.3824,0.0964 0.51562,0.23437 l 1.71094,1.71094 1.73438,-1.71094 c 0.19921,-0.17287 0.335,-0.22913 0.51562,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.0258,0.41298 -0.1875,0.5625 l -1.71094,1.71093 1.6875,1.6875 c 0.14114,0.14113 0.21093,0.34009 0.21094,0.53907 l 0,0.75 -0.75,0 c -0.19898,-1e-5 -0.39794,-0.0698 -0.53906,-0.21094 L 414,117 l -1.71094,1.71094 c -0.14112,0.14114 -0.34009,0.21094 -0.53906,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.0698,-0.39794 0.21094,-0.53907 l 1.71094,-1.6875 -1.71094,-1.71093 c -0.15806,-0.14598 -0.22737,-0.35194 -0.21094,-0.5625 l 0,-0.75 z"
                      transform="translate(962.00001,139.00001)"
                      id="path4068-7-5-4-9-7-6" />
@@ -784,45 +784,45 @@
               <g
                  id="g4778-3-6-0-5"
                  transform="translate(1323,246.86719)"
-                 style="fill:#ffffff;fill-opacity:1">
+                 style="fill:#fdf6e3;fill-opacity:1">
                 <g
-                   style="display:inline;fill:#ffffff;fill-opacity:1"
+                   style="display:inline;fill:#fdf6e3;fill-opacity:1"
                    id="layer9-9-6-0-90-6"
                    transform="translate(-60,-518)" />
                 <g
                    id="layer10-2-3-6-6-1"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer11-16-2-2-6-9"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    transform="matrix(0.75,0,0,0.75,2,2.0546875)"
                    id="g2996-7-0-2-0"
-                   style="fill:#ffffff;fill-opacity:1">
+                   style="fill:#fdf6e3;fill-opacity:1">
                   <g
                      transform="translate(-60,-518)"
                      id="layer12-4-6-3-5-2"
-                     style="fill:#ffffff;fill-opacity:1">
+                     style="fill:#fdf6e3;fill-opacity:1">
                     <g
                        transform="translate(19,-242)"
                        id="layer4-4-1-4-1-7-0"
-                       style="display:inline;fill:#ffffff;fill-opacity:1" />
+                       style="display:inline;fill:#fdf6e3;fill-opacity:1" />
                   </g>
                 </g>
                 <g
                    id="layer13-2-0-2-8-3"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer14-4-4-0-5-8"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer15-7-5-0-0-9"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
               </g>
             </g>
             <rect
@@ -883,45 +883,45 @@
               <g
                  id="g4778-2-68-8-7-6"
                  transform="translate(1323,246.86719)"
-                 style="fill:#ffffff;fill-opacity:1">
+                 style="fill:#fdf6e3;fill-opacity:1">
                 <g
-                   style="display:inline;fill:#ffffff;fill-opacity:1"
+                   style="display:inline;fill:#fdf6e3;fill-opacity:1"
                    id="layer9-9-4-4-1-1-0"
                    transform="translate(-60,-518)" />
                 <g
                    id="layer10-2-1-8-0-4-0"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer11-16-4-9-6-9-6"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    transform="matrix(0.75,0,0,0.75,2,2.0546875)"
                    id="g2996-76-5-96-3-0"
-                   style="fill:#ffffff;fill-opacity:1">
+                   style="fill:#fdf6e3;fill-opacity:1">
                   <g
                      transform="translate(-60,-518)"
                      id="layer12-4-5-7-9-4-0"
-                     style="fill:#ffffff;fill-opacity:1">
+                     style="fill:#fdf6e3;fill-opacity:1">
                     <g
                        transform="translate(19,-242)"
                        id="layer4-4-1-9-5-6-3-3"
-                       style="display:inline;fill:#ffffff;fill-opacity:1" />
+                       style="display:inline;fill:#fdf6e3;fill-opacity:1" />
                   </g>
                 </g>
                 <g
                    id="layer13-2-6-11-3-1-8"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer14-4-0-33-2-4-4"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
                 <g
                    id="layer15-7-3-0-6-6-6"
                    transform="translate(-60,-518)"
-                   style="fill:#ffffff;fill-opacity:1" />
+                   style="fill:#fdf6e3;fill-opacity:1" />
               </g>
             </g>
             <rect
@@ -1083,7 +1083,7 @@
                      sodipodi:nodetypes="csscccsscc"
                      inkscape:connector-curvature="0"
                      d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384"
-                     style="opacity:1;fill:#c4c7cc;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                     style="opacity:1;fill:#93a1a1;fill-opacity:1;fill-rule:evenodd;stroke:none"
                      id="path4293-6-7-1" />
                 </g>
               </g>
@@ -1192,7 +1192,7 @@
                      sodipodi:nodetypes="csscccsscc"
                      inkscape:connector-curvature="0"
                      d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384"
-                     style="opacity:1;fill:#c4c7cc;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                     style="opacity:1;fill:#93a1a1;fill-opacity:1;fill-rule:evenodd;stroke:none"
                      id="path4293-6-7-1-7" />
                 </g>
               </g>
@@ -1500,7 +1500,7 @@
                    id="layer12-45-6-2-7">
                   <path
                      sodipodi:nodetypes="ccccc"
-                     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c4c7cc;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+                     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#93a1a1;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
                      id="rect9057-8-2-3"
                      d="m 86.0002,974 0,2 6,0 0,-2 z"
                      inkscape:connector-curvature="0" />