From ca158129aafedf9a477935575cba378c15570168 Mon Sep 17 00:00:00 2001
From: Martin Schenck
Date: Fri, 7 Oct 2016 11:50:35 +0200
Subject: Merged upstream, supporting 3.22

---
 common/metacity-1/metacity-theme-1-dark.xml | 26 +++++++++++++-------------
 common/metacity-1/metacity-theme-1.xml      |  8 ++++----
 common/metacity-1/metacity-theme-2-dark.xml | 26 +++++++++++++-------------
 common/metacity-1/metacity-theme-2.xml      |  8 ++++----
 4 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'common/metacity-1')

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 dc32a14..a1d9b62 100644
--- a/common/metacity-1/metacity-theme-1.xml
+++ b/common/metacity-1/metacity-theme-1.xml
@@ -13,8 +13,8 @@
 <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 dc32a14..a1d9b62 100644
--- a/common/metacity-1/metacity-theme-2.xml
+++ b/common/metacity-1/metacity-theme-2.xml
@@ -13,8 +13,8 @@
 <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 -->
 
-- 
cgit v1.2.3