[gnome-themes-standard] Window decorations: made the dark variation window title look carved as in the s

[Lapo Calamandrei <lapo src gnome org>]

commit 9a1d78c1fd1c09450c45afb3a5caf79c3fc4d088
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Sat Feb 18 15:26:10 2012 +0100

    Window decorations: made the dark variation window title look
                        carved as in the standard version.
    
                        Use widget theme text color for backdrop window
                        title.

 themes/Adwaita/gtk-3.0/gnome-applications.css  |    4 ----
 themes/Adwaita/gtk-3.0/gtk-main-dark.css       |    7 +++++--
 themes/Adwaita/gtk-3.0/gtk-main.css            |    4 +++-
 themes/Adwaita/metacity-1/metacity-theme-3.xml |   20 +++++++++++++++-----
 4 files changed, 23 insertions(+), 12 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications.css b/themes/Adwaita/gtk-3.0/gnome-applications.css
index 7a9f181..ec71d3a 100644
--- a/themes/Adwaita/gtk-3.0/gnome-applications.css
+++ b/themes/Adwaita/gtk-3.0/gnome-applications.css
@@ -198,10 +198,6 @@ GeditWindow .pane-separator:hover {
    color: @borders;
 }
 
-GeditPanel {
-    background-color: red;
-}
-
 GeditPanel .toolbar {
     border-style: none;
     background-color: transparent;
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index de512f1..adaa529 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -169,8 +169,11 @@
 @define-color scale_progress_border #1864b2;
 @define-color scale_progress_border_b #3e90e5;
 
- define-color wm_highlight shade (@theme_bg_color, 1.4);
- define-color wm_title_highlight #111111;
+ define-color wm_title @theme_fg_color;
+ define-color wm_unfocused_title @theme_unfocused_fg_color;
+ define-color wm_highlight shade(@theme_bg_color, 1.4);
+ define-color wm_title_highlight_dark @button_text_shadow;
+ define-color wm_title_highlight alpha(#000000, 0.0);
 
 @define-color wm_bg_a shade (@theme_bg_color, 1.3);
 @define-color wm_bg_b @theme_bg_color;
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index 0095ebf..9e339bb 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -29,7 +29,6 @@
 @define-color theme_unfocused_selected_bg_color shade(@theme_unfocused_bg_color, 0.95);
 @define-color theme_unfocused_selected_fg_color @theme_fg_color;
 @define-color unfocused_button_background @theme_unfocused_bg_color;
- define-color unfocused_borders @borders;
 @define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
 @define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
 @define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
@@ -191,7 +190,10 @@
 @define-color inset_light_color alpha(white, 0.45);
 @define-color inset_dark_color alpha(black, 0.07);
 
+ define-color wm_title @theme_fg_color;
+ define-color wm_unfocused_title @theme_unfocused_fg_color;
 @define-color wm_highlight #ffffff;
+ define-color wm_title_highlight_dark alpha(#ffffff, 0.0);
 @define-color wm_title_highlight #ffffff;
 
 @define-color wm_bg_a shade (@bg_color, 1.1);
diff --git a/themes/Adwaita/metacity-1/metacity-theme-3.xml b/themes/Adwaita/metacity-1/metacity-theme-3.xml
index a476a35..1360f12 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-3.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-3.xml
@@ -4,7 +4,7 @@
 	<name>Adwaita</name>
 	<author>GNOME Art Team &lt;art.gnome.org&gt;</author>
 	<copyright>&#194; Intel, &#194; Red Hat, Lapo Calamandrei</copyright>
-	<date>2010</date>
+	<date>2012</date>
 	<description>Default GNOME 3 window theme</description>
 </info>
 
@@ -15,9 +15,10 @@
 <constant name="C_border_attached_focused" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
 <constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
 <constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
+<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
 <constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
-<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
+<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
+<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
 <!-- color of the button icons -->
 <constant name="C_icons_focused" value="gtk:text[SELECTED]" />
 <constant name="C_icons_focused_pressed" value="#ffffff" />
@@ -114,20 +115,29 @@
 
 <draw_ops name="title_focused">
 	<title version="< 3.1"
-               x="(0 `max` ((width - title_width) / 2)) + 3"
+               x="(0 `max` ((width - title_width) / 2)) + 2"
                y="(0 `max` ((height - title_height) / 2)) + 2"
                color="C_title_focused_hilight" />
 	<title version="< 3.1"
                x="(0 `max` ((width - title_width) / 2)) + 2"
+               y="(0 `max` ((height - title_height) / 2))"
+               color="C_title_focused_hilight_dark" />
+	<title version="< 3.1"
+               x="(0 `max` ((width - title_width) / 2)) + 2"
                y="(0 `max` ((height - title_height) / 2)) + 1"
                color="C_title_focused" />
 	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 3"
+               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
                y="(0 `max` ((height - title_height) / 2)) + 2"
                ellipsize_width="width"
                color="C_title_focused_hilight" />
 	<title version=">= 3.1"
                x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
+               y="(0 `max` ((height - title_height) / 2))"
+               ellipsize_width="width"
+               color="C_title_focused_hilight_dark" />
+	<title version=">= 3.1"
+               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
                y="(0 `max` ((height - title_height) / 2)) + 1"
                ellipsize_width="width"
                color="C_title_focused" />