Merge lp:~dashua/light-themes/natty-fixes into lp:~ubuntu-art-pkg/light-themes/trunk

[James Schriver]

@Paul, here are all the fixes in one branch. Everything should be good to go unless I made an error in the packaging.

=== modified file 'Ambiance/gtk-2.0/apps/chromium.rc'
--- Ambiance/gtk-2.0/apps/chromium.rc	2011-03-17 13:57:19 +0000
+++ Ambiance/gtk-2.0/apps/chromium.rc	2011-04-11 15:58:05 +0000
@@ -12,7 +12,7 @@
 style "chrome-gtk-frame"
 {
   ChromeGtkFrame::frame-color = "#3c3b37"
-  ChromeGtkFrame::inactive-frame-color = "#3c3b37"
+  ChromeGtkFrame::inactive-frame-color = lighter ("#3c3b37")
 
   ChromeGtkFrame::frame-gradient-size = 16
   ChromeGtkFrame::frame-gradient-color = "#5c5b56"

=== modified file 'Ambiance/metacity-1/metacity-theme-1.xml'
--- Ambiance/metacity-1/metacity-theme-1.xml	2011-03-12 14:23:38 +0000
+++ Ambiance/metacity-1/metacity-theme-1.xml	2011-04-11 15:58:05 +0000
@@ -5,7 +5,7 @@
   	<name>Ambiance</name>
   	<author>Kenneth Wimer, James Schriver, Andrea Cimitan</author>
   	<copyright>Canonical Ltd.</copyright>
-  	<date>Aug, 2010</date>
+  	<date>April, 2011</date>
   	<description>Metacity theme</description>
 </info>
 
@@ -198,16 +198,16 @@
 <!-- Window Frames -->
 
 <draw_ops name="draw_frame">
-    <rectangle color="shade/gtk:bg[NORMAL]/0.7" x="0" y="0" width="width" height="height" filled="true"/>
+    <rectangle color="shade/#3c3b37/0.7" x="0" y="0" width="width" height="height" filled="true"/>
     <gradient type="vertical" x="0" y="0" width="width" height="60">
         <color value="shade/#3c3b37/1.2" />
-        <color value="shade/gtk:bg[NORMAL]/0.7" />
+        <color value="shade/#3c3b37/0.7" />
     </gradient>
 </draw_ops>
 
 <!-- bottom border -->
 <draw_ops name="bottom_edge">
-	<line color="shade/gtk:bg[NORMAL]/0.7" x1="0" x2="width" y1="height-1" y2="height-1"/>
+	<line color="shade/#3c3b37/0.7" x1="0" x2="width" y1="height-1" y2="height-1"/>
 </draw_ops>
 
 <draw_ops name="border">

=== modified file 'Radiance/gtk-2.0/apps/chromium.rc'
--- Radiance/gtk-2.0/apps/chromium.rc	2011-03-17 13:57:19 +0000
+++ Radiance/gtk-2.0/apps/chromium.rc	2011-04-11 15:58:05 +0000
@@ -17,8 +17,8 @@
   ChromeGtkFrame::frame-gradient-size = 16
   ChromeGtkFrame::frame-gradient-color = shade (0.97, @bg_color)
 
-  ChromeGtkFrame::incognito-frame-color = lighter ("#dfd7cf")
-  ChromeGtkFrame::incognito-inactive-frame-color = lighter ("#dfd7cf")
+  ChromeGtkFrame::incognito-frame-color = "#dfd7cf"
+  ChromeGtkFrame::incognito-inactive-frame-color = "#dfd7cf"
 
   ChromeGtkFrame::incognito-frame-gradient-size = 16
   ChromeGtkFrame::incognito-frame-gradient-color = shade (0.97, @bg_color)

=== modified file 'Radiance/metacity-1/metacity-theme-1.xml'
--- Radiance/metacity-1/metacity-theme-1.xml	2011-03-21 19:28:15 +0000
+++ Radiance/metacity-1/metacity-theme-1.xml	2011-04-11 15:58:05 +0000
@@ -39,7 +39,7 @@
 <frame_geometry name="geometry_maximized" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
 	<distance name="left_width" value="0"/>
 	<distance name="right_width" value="0"/>
-	<distance name="bottom_height" value="0"/>
+	<distance name="bottom_height" value="1"/>
 	<distance name="left_titlebar_edge" value="10"/>
   	<distance name="right_titlebar_edge" value="10"/>
   	<distance name="button_width" value="18"/>
@@ -103,18 +103,29 @@
 
 <draw_ops name="draw_title">
     <!-- Background gradient -->
-    <gradient type="vertical" x="0" y="0" width="width" height="top_height">
+    <gradient type="vertical" x="1" y="1" width="width-2" height="top_height-2">
         <color value="#f5f4f1" />
         <color value="#dfd7cf" />
 	<color value="#dfd7cf" />
     </gradient>
     
     <!-- Titlebar outline -->
-    <rectangle color="#dfd7cf" filled="false" x="0" y="0" width="width - 1" height="top_height - 1"/>
+    <rectangle color="shade/#dfd7cf/0.8" filled="false" x="0" y="0" width="width - 1" height="top_height - 1"/>
 
     <!-- Topmost lines -->
-    <line color="shade/#f5f4f1/1.0" x1="0" x2="width" y1="1" y2="1"/>
-
+    <line color="shade/#f5f4f1/1.1" x1="0" x2="width" y1="1" y2="1"/>
+    
+    <!-- Darkening of the left arch -->
+    <line color="shade/#dfd7cf/0.8" x1="0" x2="4" y1="1" y2="1"/>
+    <line color="shade/#dfd7cf/0.8" x1="0" x2="2" y1="2" y2="2"/>
+    <line color="shade/#dfd7cf/0.8" x1="0" x2="1" y1="3" y2="3"/>
+    <line color="shade/#dfd7cf/0.8" x1="0" x2="1" y1="4" y2="4"/>
+    
+    <line color="shade/#dfd7cf/0.8" x1="width-5" x2="width" y1="1" y2="1"/>
+    <line color="shade/#dfd7cf/0.8" x1="width-3" x2="width" y1="2" y2="2"/>
+    <line color="shade/#dfd7cf/0.8" x1="width-2" x2="width" y1="3" y2="3"/>
+    <line color="shade/#dfd7cf/0.8" x1="width-2" x2="width" y1="4" y2="4"/>
+    
     <line color="shade/#dfd7cf/0.96" x1="1" y1="top_height - 1" x2="width - 2" y2="top_height - 1"/>
 </draw_ops>
 
@@ -126,12 +137,25 @@
 	<color value="#dfd7cf" />
     </gradient>
 
-     <!-- Titlebar outline -->
-    <rectangle color="#dfd7cf" filled="false" x="0" y="0" width="width - 1" height="top_height - 1"/>
+    <!-- Titlebar outline -->
+    <rectangle color="shade/#dfd7cf/0.8" filled="false" x="0" y="0" width="width - 1" height="top_height - 1"/>
 
     <!-- Topmost lines -->
-    <line color="shade/#f5f4f1/.9" x1="0" x2="width" y1="1" y2="1"/>
-
+    <line color="shade/#EDE7E1/1.05" x1="0" x2="width" y1="1" y2="1"/>
+    
+    <!-- Darkening of the left arch -->
+    <line color="shade/#dfd7cf/0.8" x1="0" x2="4" y1="1" y2="1"/>
+    <line color="shade/#dfd7cf/0.8" x1="0" x2="2" y1="2" y2="2"/>
+    <line color="shade/#dfd7cf/0.8" x1="0" x2="1" y1="3" y2="3"/>
+    <line color="shade/#dfd7cf/0.8" x1="0" x2="1" y1="4" y2="4"/>
+    <line color="shade/#dfd7cf/0.8" x1="0" x2="0" y1="5" y2="40"/>
+    
+    <line color="shade/#dfd7cf/0.8" x1="width-5" x2="width" y1="1" y2="1"/>
+    <line color="shade/#dfd7cf/0.8" x1="width-3" x2="width" y1="2" y2="2"/>
+    <line color="shade/#dfd7cf/0.8" x1="width-2" x2="width" y1="3" y2="3"/>
+    <line color="shade/#dfd7cf/0.8" x1="width-2" x2="width" y1="4" y2="4"/>
+    <line color="shade/#dfd7cf/0.8" x1="width-1" x2="width" y1="5" y2="90"/>
+  
     <line color="shade/#dfd7cf/0.96" x1="1" y1="top_height - 1" x2="width - 2" y2="top_height - 1"/>
 </draw_ops>
 
@@ -141,30 +165,32 @@
 
 <draw_ops name="draw_title_maximized">
     <!-- Background gradient -->
-    <gradient type="vertical" x="0" y="0" width="width" height="top_height">
-        <color value="#5c5b56" />
+    <gradient type="vertical" x="0" y="1" width="width" height="top_height-1">
+        <color value="#f5f4f1" />
         <color value="#dfd7cf" />
 	<color value="#dfd7cf" />
     </gradient>
     
     <!-- Topmost dark line -->
-    <line color="shade/#5c5b56/1.1" x1="0" x2="width" y1="0" y2="0"/>
-    
-    <line color="shade/#dfd7cf/0.94" x1="1" y1="top_height - 1" x2="width - 2" y2="top_height - 1"/>
+    <line color="shade/#dfd7cf/0.8" x1="0" x2="width" y1="0" y2="0"/>
+    <line color="shade/#f5f4f1/1.1" x1="0" x2="width" y1="1" y2="1"/>    
+
+    <line color="shade/#dfd7cf/0.96" x1="1" y1="top_height - 1" x2="width - 2" y2="top_height - 1"/>
 </draw_ops>
 
 <draw_ops name="draw_title_maximized_unfocused">
     <!-- Background gradient -->
-    <gradient type="vertical" x="0" y="0" width="width" height="top_height">
-        <color value="#494844" />
+    <gradient type="vertical" x="0" y="1" width="width" height="top_height-1">
+        <color value="#EDE7E1" />
         <color value="#dfd7cf" />
 	<color value="#dfd7cf" />
     </gradient>
-    
+
     <!-- Topmost dark line -->
-    <line color="shade/#494844/1.1" x1="0" x2="width" y1="0" y2="0"/>
+    <line color="shade/#dfd7cf/0.8" x1="0" x2="width" y1="0" y2="0"/>
+    <line color="shade/#EDE7E1/1.05" x1="0" x2="width" y1="1" y2="1"/> 
     
-    <line color="shade/#dfd7cf/0.94" x1="1" y1="top_height - 1" x2="width - 2" y2="top_height - 1"/>
+    <line color="shade/#dfd7cf/0.96" x1="1" y1="top_height - 1" x2="width - 2" y2="top_height - 1"/>
 </draw_ops>
 
 <draw_ops name="draw_title_maximized_inactive">
@@ -174,21 +200,21 @@
 <!-- Window Frames -->
 
 <draw_ops name="draw_frame">
-    <rectangle color="shade/gtk:bg[NORMAL]/0.7" x="0" y="0" width="width" height="height" filled="true"/>
+    <rectangle color="shade/gtk:bg[NORMAL]/0.9" x="0" y="0" width="width" height="height" filled="true"/>
     <gradient type="vertical" x="0" y="0" width="width" height="60">
-        <color value="shade/#dfd7cf/1.2" />
-        <color value="shade/gtk:bg[NORMAL]/0.7" />
+        <color value="shade/#dfd7cf/0.8" />
+        <color value="shade/gtk:bg[NORMAL]/0.9" />
     </gradient>
 </draw_ops>
 
 <!-- bottom border -->
 <draw_ops name="bottom_edge">
-	<line color="shade/gtk:bg[NORMAL]/0.7" x1="0" x2="width" y1="height-1" y2="height-1"/>
+	<line color="shade/gtk:bg[NORMAL]/0.9" x1="0" x2="width" y1="height-1" y2="height-1"/>
 </draw_ops>
 
 <draw_ops name="border">
-	<line color="shade/gtk:bg[NORMAL]/0.88" x1="1" y1="height - 2" x2="width - 2" y2="height - 2"/>
-	<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="1" x2="width - 2" y2="height - 2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.98" x1="1" y1="height - 2" x2="width - 2" y2="height - 2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.98" x1="width - 2" y1="1" x2="width - 2" y2="height - 2"/>
 	<line color="shade/gtk:bg[NORMAL]/1.4" x1="1" y1="1" x2="width - 2" y2="1"/>
 	<line color="shade/gtk:bg[NORMAL]/1.4" x1="1" y1="1" x2="1" y2="height - 2"/>
 	

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-11 08:39:58 +0000
+++ debian/changelog	2011-04-11 15:58:05 +0000
@@ -1,3 +1,16 @@
+light-themes (0.1.8.12) UNRELEASED; urgency=low
+
+  [James Schriver]
+  * Ambiance/metacity-1/metacity-theme-1.xml
+    - Darken frame and bottom edge fix for (LP:740579)
+  
+  * Radiance/apps/chromium.rc
+    - Fix incognito theming in Radiance (LP: #697854)
+  * Radiance/metacity/metacity-theme-1.xml
+    - Revert fix borderless overlap (LP: #733504) as this is a fix for "0" pixel borders"
+
+ -- James Schriver <[e-mail]>  Mon, 11 Apr 2011 11:13:13 -0400
+
 light-themes (0.1.8.11) natty; urgency=low
 
   [Andrea Cimitan]