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

8 files changed, 64 insertions, 64 deletions

diff --git a/common/metacity-1/button-bg.svg b/common/metacity-1/button-bg.svg
index 1f225b5..302ee6e 100644
--- a/common/metacity-1/button-bg.svg
+++ b/common/metacity-1/button-bg.svg
@@ -20,7 +20,7 @@
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs24" /><sodipodi:namedview
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1"
      objecttolerance="10"
@@ -69,34 +69,34 @@
              id="path4068-7-5-9-6" /></g></g><g
          id="g4778-2-68"
          transform="translate(1323,246.86719)"
-         style="fill:#ffffff;fill-opacity:1"><g
-           style="display:inline;fill:#ffffff;fill-opacity:1"
+         style="fill:#fdf6e3;fill-opacity:1"><g
+           style="display:inline;fill:#fdf6e3;fill-opacity:1"
            id="layer9-9-4-4"
            transform="translate(-60,-518)" /><g
            id="layer10-2-1-8"
            transform="translate(-60,-518)"
-           style="fill:#ffffff;fill-opacity:1" /><g
+           style="fill:#fdf6e3;fill-opacity:1" /><g
            id="layer11-16-4-9"
            transform="translate(-60,-518)"
-           style="fill:#ffffff;fill-opacity:1" /><g
+           style="fill:#fdf6e3;fill-opacity:1" /><g
            transform="matrix(0.75,0,0,0.75,2,2.0546875)"
            id="g2996-76-5"
-           style="fill:#ffffff;fill-opacity:1"><g
+           style="fill:#fdf6e3;fill-opacity:1"><g
              transform="translate(-60,-518)"
              id="layer12-4-5-7"
-             style="fill:#ffffff;fill-opacity:1"><g
+             style="fill:#fdf6e3;fill-opacity:1"><g
                transform="translate(19,-242)"
                id="layer4-4-1-9-5"
-               style="display:inline;fill:#ffffff;fill-opacity:1" /></g></g><g
+               style="display:inline;fill:#fdf6e3;fill-opacity:1" /></g></g><g
            id="layer13-2-6-11"
            transform="translate(-60,-518)"
-           style="fill:#ffffff;fill-opacity:1" /><g
+           style="fill:#fdf6e3;fill-opacity:1" /><g
            id="layer14-4-0-33"
            transform="translate(-60,-518)"
-           style="fill:#ffffff;fill-opacity:1" /><g
+           style="fill:#fdf6e3;fill-opacity:1" /><g
            id="layer15-7-3-0"
            transform="translate(-60,-518)"
-           style="fill:#ffffff;fill-opacity:1" /></g></g><rect
+           style="fill:#fdf6e3;fill-opacity:1" /></g></g><rect
        y="-185.63782"
        x="645"
        height="16"
diff --git a/common/metacity-1/button-border.svg b/common/metacity-1/button-border.svg
index a1ab948..9cea798 100644
--- a/common/metacity-1/button-border.svg
+++ b/common/metacity-1/button-border.svg
@@ -20,7 +20,7 @@
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs24" /><sodipodi:namedview
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1"
      objecttolerance="10"
diff --git a/common/metacity-1/close-icon.svg b/common/metacity-1/close-icon.svg
index 312fa9e..efc4175 100644
--- a/common/metacity-1/close-icon.svg
+++ b/common/metacity-1/close-icon.svg
@@ -64,38 +64,38 @@
            transform="translate(58,0)" /></g><g
          id="g4778-2-68"
          transform="translate(1323,246.86719)"
-         style="fill:#ffffff;fill-opacity:1"><g
-           style="display:inline;fill:#ffffff;fill-opacity:1"
+         style="fill:#fdf6e3;fill-opacity:1"><g
+           style="display:inline;fill:#fdf6e3;fill-opacity:1"
            id="layer9-9-4-4"
            transform="translate(-60,-518)" /><g
            id="layer10-2-1-8"
            transform="translate(-60,-518)"
-           style="fill:#ffffff;fill-opacity:1" /><g
+           style="fill:#fdf6e3;fill-opacity:1" /><g
            id="layer11-16-4-9"
            transform="translate(-60,-518)"
-           style="fill:#ffffff;fill-opacity:1" /><g
+           style="fill:#fdf6e3;fill-opacity:1" /><g
            transform="matrix(0.75,0,0,0.75,2,2.0546875)"
            id="g2996-76-5"
-           style="fill:#ffffff;fill-opacity:1"><g
+           style="fill:#fdf6e3;fill-opacity:1"><g
              transform="translate(-60,-518)"
              id="layer12-4-5-7"
-             style="fill:#ffffff;fill-opacity:1"><g
+             style="fill:#fdf6e3;fill-opacity:1"><g
                transform="translate(19,-242)"
                id="layer4-4-1-9-5"
-               style="display:inline;fill:#ffffff;fill-opacity:1"><path
+               style="display:inline;fill:#fdf6e3;fill-opacity:1"><path
                  inkscape:connector-curvature="0"
                  d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z"
                  id="path10839-9-2-2"
-                 style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';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;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /></g></g></g><g
+                 style="color:#657b83;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';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;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /></g></g></g><g
            id="layer13-2-6-11"
            transform="translate(-60,-518)"
-           style="fill:#ffffff;fill-opacity:1" /><g
+           style="fill:#fdf6e3;fill-opacity:1" /><g
            id="layer14-4-0-33"
            transform="translate(-60,-518)"
-           style="fill:#ffffff;fill-opacity:1" /><g
+           style="fill:#fdf6e3;fill-opacity:1" /><g
            id="layer15-7-3-0"
            transform="translate(-60,-518)"
-           style="fill:#ffffff;fill-opacity:1" /></g></g><rect
+           style="fill:#fdf6e3;fill-opacity:1" /></g></g><rect
        y="-185.63782"
        x="645"
        height="16"
diff --git a/common/metacity-1/metacity-theme-1-dark.xml b/common/metacity-1/metacity-theme-1-dark.xml
index 4cb97be..6b680aa 100644
--- a/common/metacity-1/metacity-theme-1-dark.xml
+++ b/common/metacity-1/metacity-theme-1-dark.xml
@@ -13,30 +13,30 @@
 <constant name="C_title_focused" value="#afb8c6" />
 <constant name="C_title_unfocused" value="#8a939f" />
 
-<constant name="C_wm_bg_focused" value="#2f343f" />
-<constant name="C_wm_bg_unfocused" value="#2f343f" />
+<constant name="C_wm_bg_focused" value="#002b36" />
+<constant name="C_wm_bg_unfocused" value="#002b36" />
 
 <constant name="C_wm_highlight" value="#353a48" />
 
 <!-- window button colors -->
 
 <!-- close -->
-<constant name="C_button_close_bg_focused" value="#cc575d" />
-<constant name="C_button_close_bg_hover" value="#d7787d" />
-<constant name="C_button_close_bg_active" value="#be3841" />
+<constant name="C_button_close_bg_focused" value="#dc322f" />
+<constant name="C_button_close_bg_hover" value="#cb4b16" />
+<constant name="C_button_close_bg_active" value="#dc322f" />
 
-<constant name="C_icon_close_bg" value="#2f343f" />
+<constant name="C_icon_close_bg" value="#002b36" />
 
 <!-- minimize, maximize -->
-<constant name="C_button_bg_hover" value="#454C5C" />
-<constant name="C_button_bg_active" value="#5294e2" />
+<constant name="C_button_bg_hover" value="#657b83" />
+<constant name="C_button_bg_active" value="#268bd2" />
 
-<constant name="C_button_border_hover" value="#262932" />
+<constant name="C_button_border_hover" value="#002b36" />
 
-<constant name="C_icon_bg_focused" value="#90939B" />
-<constant name="C_icon_bg_unfocused" value="#666A74" />
-<constant name="C_icon_bg_hover" value="#C4C7CC" />
-<constant name="C_icon_bg_active" value="#5294e2" />
+<constant name="C_icon_bg_focused" value="#93a1a1" />
+<constant name="C_icon_bg_unfocused" value="#657b83" />
+<constant name="C_icon_bg_hover" value="#93a1a1" />
+<constant name="C_icon_bg_active" value="#268bd2" />
 
 <!-- geometries -->
 
diff --git a/common/metacity-1/metacity-theme-1.xml b/common/metacity-1/metacity-theme-1.xml
index 773ce7a..a1d9b62 100644
--- a/common/metacity-1/metacity-theme-1.xml
+++ b/common/metacity-1/metacity-theme-1.xml
@@ -10,11 +10,11 @@
 
 <!-- meaningfull constants -->
 
-<constant name="C_title_focused" value="#70788d" />
+<constant name="C_title_focused" value="#839496" />
 <constant name="C_title_unfocused" value="#979dac" />
 
-<constant name="C_wm_bg_focused" value="#e7e8eb" />
-<constant name="C_wm_bg_unfocused" value="#e7e8eb" />
+<constant name="C_wm_bg_focused" value="#eee8d5" />
+<constant name="C_wm_bg_unfocused" value="#eee8d5" />
 
 <constant name="C_wm_highlight" value="#eeeff1" />
 
@@ -29,14 +29,14 @@
 
 <!-- minimize, maximize -->
 <constant name="C_button_bg_hover" value="#fdfdfd" />
-<constant name="C_button_bg_active" value="#5294e2" />
+<constant name="C_button_bg_active" value="#268bd2" />
 
 <constant name="C_button_border_hover" value="#D1D3DA" />
 
 <constant name="C_icon_bg_focused" value="#90949E" />
 <constant name="C_icon_bg_unfocused" value="#B6B8C0" />
 <constant name="C_icon_bg_hover" value="#7A7F8B" />
-<constant name="C_icon_bg_active" value="#5294e2" />
+<constant name="C_icon_bg_active" value="#268bd2" />
 
 <!-- geometries -->
 
diff --git a/common/metacity-1/metacity-theme-2-dark.xml b/common/metacity-1/metacity-theme-2-dark.xml
index 4cb97be..6b680aa 100644
--- a/common/metacity-1/metacity-theme-2-dark.xml
+++ b/common/metacity-1/metacity-theme-2-dark.xml
@@ -13,30 +13,30 @@
 <constant name="C_title_focused" value="#afb8c6" />
 <constant name="C_title_unfocused" value="#8a939f" />
 
-<constant name="C_wm_bg_focused" value="#2f343f" />
-<constant name="C_wm_bg_unfocused" value="#2f343f" />
+<constant name="C_wm_bg_focused" value="#002b36" />
+<constant name="C_wm_bg_unfocused" value="#002b36" />
 
 <constant name="C_wm_highlight" value="#353a48" />
 
 <!-- window button colors -->
 
 <!-- close -->
-<constant name="C_button_close_bg_focused" value="#cc575d" />
-<constant name="C_button_close_bg_hover" value="#d7787d" />
-<constant name="C_button_close_bg_active" value="#be3841" />
+<constant name="C_button_close_bg_focused" value="#dc322f" />
+<constant name="C_button_close_bg_hover" value="#cb4b16" />
+<constant name="C_button_close_bg_active" value="#dc322f" />
 
-<constant name="C_icon_close_bg" value="#2f343f" />
+<constant name="C_icon_close_bg" value="#002b36" />
 
 <!-- minimize, maximize -->
-<constant name="C_button_bg_hover" value="#454C5C" />
-<constant name="C_button_bg_active" value="#5294e2" />
+<constant name="C_button_bg_hover" value="#657b83" />
+<constant name="C_button_bg_active" value="#268bd2" />
 
-<constant name="C_button_border_hover" value="#262932" />
+<constant name="C_button_border_hover" value="#002b36" />
 
-<constant name="C_icon_bg_focused" value="#90939B" />
-<constant name="C_icon_bg_unfocused" value="#666A74" />
-<constant name="C_icon_bg_hover" value="#C4C7CC" />
-<constant name="C_icon_bg_active" value="#5294e2" />
+<constant name="C_icon_bg_focused" value="#93a1a1" />
+<constant name="C_icon_bg_unfocused" value="#657b83" />
+<constant name="C_icon_bg_hover" value="#93a1a1" />
+<constant name="C_icon_bg_active" value="#268bd2" />
 
 <!-- geometries -->
 
diff --git a/common/metacity-1/metacity-theme-2.xml b/common/metacity-1/metacity-theme-2.xml
index 773ce7a..a1d9b62 100644
--- a/common/metacity-1/metacity-theme-2.xml
+++ b/common/metacity-1/metacity-theme-2.xml
@@ -10,11 +10,11 @@
 
 <!-- meaningfull constants -->
 
-<constant name="C_title_focused" value="#70788d" />
+<constant name="C_title_focused" value="#839496" />
 <constant name="C_title_unfocused" value="#979dac" />
 
-<constant name="C_wm_bg_focused" value="#e7e8eb" />
-<constant name="C_wm_bg_unfocused" value="#e7e8eb" />
+<constant name="C_wm_bg_focused" value="#eee8d5" />
+<constant name="C_wm_bg_unfocused" value="#eee8d5" />
 
 <constant name="C_wm_highlight" value="#eeeff1" />
 
@@ -29,14 +29,14 @@
 
 <!-- minimize, maximize -->
 <constant name="C_button_bg_hover" value="#fdfdfd" />
-<constant name="C_button_bg_active" value="#5294e2" />
+<constant name="C_button_bg_active" value="#268bd2" />
 
 <constant name="C_button_border_hover" value="#D1D3DA" />
 
 <constant name="C_icon_bg_focused" value="#90949E" />
 <constant name="C_icon_bg_unfocused" value="#B6B8C0" />
 <constant name="C_icon_bg_hover" value="#7A7F8B" />
-<constant name="C_icon_bg_active" value="#5294e2" />
+<constant name="C_icon_bg_active" value="#268bd2" />
 
 <!-- geometries -->
 
diff --git a/common/metacity-1/metacity-theme-3.xml b/common/metacity-1/metacity-theme-3.xml
index 6a0aeef..7d1b331 100644
--- a/common/metacity-1/metacity-theme-3.xml
+++ b/common/metacity-1/metacity-theme-3.xml
@@ -10,11 +10,11 @@
 
 <!-- meaningfull constants -->
 
-<constant name="C_title_focused" value="gtk:custom(wm_title,#70788d)" />
+<constant name="C_title_focused" value="gtk:custom(wm_title,#839496)" />
 <constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,#979dac)" />
 
-<constant name="C_wm_bg_focused" value="gtk:custom(wm_bg,#e7e8eb)" />
-<constant name="C_wm_bg_unfocused" value="gtk:custom(wm_bg,#e7e8eb)" />
+<constant name="C_wm_bg_focused" value="gtk:custom(wm_bg,#eee8d5)" />
+<constant name="C_wm_bg_unfocused" value="gtk:custom(wm_bg,#eee8d5)" />
 
 <constant name="C_wm_highlight" value="gtk:custom(wm_highlight,#eeeff1)" />
 
@@ -29,14 +29,14 @@
 
 <!-- minimize, maximize -->
 <constant name="C_button_bg_hover" value="gtk:custom(wm_button_hover_bg,#fdfdfd)" />
-<constant name="C_button_bg_active" value="gtk:custom(wm_button_active_bg,#5294E2)" />
+<constant name="C_button_bg_active" value="gtk:custom(wm_button_active_bg,#268bd2)" />
 
 <constant name="C_button_border_hover" value="gtk:custom(wm_button_hover_border,#D1D3DA)" />
 
 <constant name="C_icon_bg_focused" value="gtk:custom(wm_icon_bg,#90949E)" />
 <constant name="C_icon_bg_unfocused" value="gtk:custom(wm_icon_unfocused_bg,#B6B8C0)" />
 <constant name="C_icon_bg_hover" value="gtk:custom(wm_icon_hover_bg,#7A7F8B)" />
-<constant name="C_icon_bg_active" value="gtk:custom(wm_icon_active_bg,#ffffff)" />
+<constant name="C_icon_bg_active" value="gtk:custom(wm_icon_active_bg,#fdf6e3)" />
 
 <!-- geometries -->