Merged upstream, supporting 3.22

8 files changed, 42 insertions, 42 deletions

diff --git a/common/unity/dash/maximize_dash_pressed.svg b/common/unity/dash/maximize_dash_pressed.svg
index 5f09b02..3cb0e91 100644
--- a/common/unity/dash/maximize_dash_pressed.svg
+++ b/common/unity/dash/maximize_dash_pressed.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="stop4170" />
     </linearGradient>
@@ -42,22 +42,22 @@
     <linearGradient
        id="linearGradient4882">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4884" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop4886" />
     </linearGradient>
     <linearGradient
        id="linearGradient3784-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.21568628;"
+         style="stop-color:#fdf6e3;stop-opacity:0.21568628;"
          offset="0"
          id="stop3786-4" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop3788-6" />
     </linearGradient>
@@ -230,7 +230,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="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               style="fill:#fdf6e3;fill-opacity:1;fill-rule:evenodd;stroke:none"
                id="path4293-4-9-0-2" />
           </g>
         </g>
diff --git a/common/unity/dash/minimize_dash_pressed.svg b/common/unity/dash/minimize_dash_pressed.svg
index 72a57f0..5a53152 100644
--- a/common/unity/dash/minimize_dash_pressed.svg
+++ b/common/unity/dash/minimize_dash_pressed.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="stop4170" />
     </linearGradient>
@@ -42,22 +42,22 @@
     <linearGradient
        id="linearGradient4882">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4884" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop4886" />
     </linearGradient>
     <linearGradient
        id="linearGradient3784-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.21568628;"
+         style="stop-color:#fdf6e3;stop-opacity:0.21568628;"
          offset="0"
          id="stop3786-4" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop3788-6" />
     </linearGradient>
@@ -228,7 +228,7 @@
              id="layer12-45-3-7-96-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;fill:#ffffff;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;fill:#fdf6e3;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
                id="rect9057-3-5-1-1"
                d="m 86.0002,974 0,2 6,0 0,-2 z"
                inkscape:connector-curvature="0" />
diff --git a/common/unity/launcher_icon_selected_back_150.svg b/common/unity/launcher_icon_selected_back_150.svg
index 424c299..22cc776 100644
--- a/common/unity/launcher_icon_selected_back_150.svg
+++ b/common/unity/launcher_icon_selected_back_150.svg
@@ -28,7 +28,7 @@
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1"
      objecttolerance="10"
@@ -57,7 +57,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="stop4138" />
     </linearGradient>
diff --git a/common/unity/launcher_icon_selected_back_54.svg b/common/unity/launcher_icon_selected_back_54.svg
index 0e1b983..0666598 100644
--- a/common/unity/launcher_icon_selected_back_54.svg
+++ b/common/unity/launcher_icon_selected_back_54.svg
@@ -33,7 +33,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="stop4136" />
     </linearGradient>
@@ -48,7 +48,7 @@
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1"
      objecttolerance="10"
diff --git a/common/unity/window-buttons-dark/maximize_pressed.svg b/common/unity/window-buttons-dark/maximize_pressed.svg
index fb686b1..0bbe86c 100644
--- a/common/unity/window-buttons-dark/maximize_pressed.svg
+++ b/common/unity/window-buttons-dark/maximize_pressed.svg
@@ -24,7 +24,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="stop4188" />
     </linearGradient>
@@ -32,7 +32,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="stop4185" />
     </linearGradient>
@@ -50,22 +50,22 @@
     <linearGradient
        id="linearGradient4882">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4884" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop4886" />
     </linearGradient>
     <linearGradient
        id="linearGradient3784-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.21568628;"
+         style="stop-color:#fdf6e3;stop-opacity:0.21568628;"
          offset="0"
          id="stop3786-4" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop3788-6" />
     </linearGradient>
@@ -239,7 +239,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>
diff --git a/common/unity/window-buttons-dark/minimize_pressed.svg b/common/unity/window-buttons-dark/minimize_pressed.svg
index 21645b1..fe3c0fc 100644
--- a/common/unity/window-buttons-dark/minimize_pressed.svg
+++ b/common/unity/window-buttons-dark/minimize_pressed.svg
@@ -24,7 +24,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="stop4172" />
     </linearGradient>
@@ -32,7 +32,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="stop4169" />
     </linearGradient>
@@ -50,22 +50,22 @@
     <linearGradient
        id="linearGradient4882">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4884" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop4886" />
     </linearGradient>
     <linearGradient
        id="linearGradient3784-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.21568628;"
+         style="stop-color:#fdf6e3;stop-opacity:0.21568628;"
          offset="0"
          id="stop3786-4" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop3788-6" />
     </linearGradient>
diff --git a/common/unity/window-buttons/maximize_pressed.svg b/common/unity/window-buttons/maximize_pressed.svg
index 2f55a72..97e7df2 100644
--- a/common/unity/window-buttons/maximize_pressed.svg
+++ b/common/unity/window-buttons/maximize_pressed.svg
@@ -24,7 +24,7 @@
        id="selected_fg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#ffffffgitgitgitgitgit;stop-opacity:1;"
+         style="stop-color:#fdf6e3gitgitgitgitgit;stop-opacity:1;"
          offset="0"
          id="stop4188" />
     </linearGradient>
@@ -32,7 +32,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="stop4185" />
     </linearGradient>
@@ -50,22 +50,22 @@
     <linearGradient
        id="linearGradient4882">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4884" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop4886" />
     </linearGradient>
     <linearGradient
        id="linearGradient3784-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.21568628;"
+         style="stop-color:#fdf6e3;stop-opacity:0.21568628;"
          offset="0"
          id="stop3786-4" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop3788-6" />
     </linearGradient>
@@ -239,7 +239,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>
diff --git a/common/unity/window-buttons/minimize_pressed.svg b/common/unity/window-buttons/minimize_pressed.svg
index ddd2a0c..9ecb186 100644
--- a/common/unity/window-buttons/minimize_pressed.svg
+++ b/common/unity/window-buttons/minimize_pressed.svg
@@ -24,7 +24,7 @@
        id="selected_fg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#ffffffgitgitgit;stop-opacity:1;"
+         style="stop-color:#fdf6e3gitgitgit;stop-opacity:1;"
          offset="0"
          id="stop4172" />
     </linearGradient>
@@ -32,7 +32,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="stop4169" />
     </linearGradient>
@@ -50,22 +50,22 @@
     <linearGradient
        id="linearGradient4882">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4884" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop4886" />
     </linearGradient>
     <linearGradient
        id="linearGradient3784-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.21568628;"
+         style="stop-color:#fdf6e3;stop-opacity:0.21568628;"
          offset="0"
          id="stop3786-4" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fdf6e3;stop-opacity:0;"
          offset="1"
          id="stop3788-6" />
     </linearGradient>