Merge lp:~dashua/light-themes/fix.lp.740864 into lp:~ubuntu-art-pkg/light-themes/trunk

[James Schriver]

Added gedit specific theming resolving some usability bugs.

=== added file 'Ambiance/gtk-2.0/apps/gedit.rc'
--- Ambiance/gtk-2.0/apps/gedit.rc	1970-01-01 00:00:00 +0000
+++ Ambiance/gtk-2.0/apps/gedit.rc	2011-04-12 06:04:30 +0000
@@ -0,0 +1,35 @@
+style "gedit-frame"
+{	
+	engine "pixmap"
+	{
+ 		image
+		{
+			function = SHADOW
+		}
+	}
+}
+
+style "thin"
+{ 
+	xthickness = 0 
+	ythickness = 0 
+}
+
+widget_class "*Gedit*.<GtkFrame>*"     			style "gedit-frame"
+widget_class "*Gedit*.<GtkScrolledWindow>"     		style "thin"
+widget_class "*Gedit*.<GtkArrow>*"     			style:highest "default"
+
+style "gedit-notebook" 
+{
+	base[ACTIVE] 	= shade (0.94, @selected_bg_color)
+}
+
+widget_class "*GeditNotebook"				style "gedit-notebook"
+widget_class "*GeditNotebook*Tab*"			style "gedit-notebook"
+
+style "gedit" 
+{
+	GtkComboBox::appears-as-list = 0
+}
+
+widget_class "*Gedit*"     			style "gedit"

=== modified file 'Ambiance/gtk-2.0/gtkrc'
--- Ambiance/gtk-2.0/gtkrc	2011-03-22 02:13:52 +0000
+++ Ambiance/gtk-2.0/gtkrc	2011-04-12 06:04:30 +0000
@@ -703,6 +703,7 @@
 #include "apps/banshee.rc"
 include "apps/chromium.rc"
 include "apps/ff.rc"
+include "apps/gedit.rc"
 include "apps/gnome-panel.rc"
 include "apps/gnome-terminal.rc"
 include "apps/nautilus.rc"

=== added file 'Radiance/gtk-2.0/apps/gedit.rc'
--- Radiance/gtk-2.0/apps/gedit.rc	1970-01-01 00:00:00 +0000
+++ Radiance/gtk-2.0/apps/gedit.rc	2011-04-12 06:04:30 +0000
@@ -0,0 +1,35 @@
+style "gedit-frame"
+{	
+	engine "pixmap"
+	{
+ 		image
+		{
+			function = SHADOW
+		}
+	}
+}
+
+style "thin"
+{ 
+	xthickness = 0 
+	ythickness = 0 
+}
+
+widget_class "*Gedit*.<GtkFrame>*"     			style "gedit-frame"
+widget_class "*Gedit*.<GtkScrolledWindow>"     		style "thin"
+widget_class "*Gedit*.<GtkArrow>*"     			style:highest "default"
+
+style "gedit-notebook" 
+{
+	base[ACTIVE] 	= shade (0.94, @selected_bg_color)
+}
+
+widget_class "*GeditNotebook"				style "gedit-notebook"
+widget_class "*GeditNotebook*Tab*"			style "gedit-notebook"
+
+style "gedit" 
+{
+	GtkComboBox::appears-as-list = 0
+}
+
+widget_class "*Gedit*"     			style "gedit"

=== modified file 'Radiance/gtk-2.0/gtkrc'
--- Radiance/gtk-2.0/gtkrc	2011-03-22 02:13:52 +0000
+++ Radiance/gtk-2.0/gtkrc	2011-04-12 06:04:30 +0000
@@ -671,6 +671,7 @@
 #include "apps/banshee.rc"
 include "apps/chromium.rc"
 include "apps/ff.rc"
+include "apps/gedit.rc"
 include "apps/gnome-panel.rc"
 include "apps/gnome-terminal.rc"
 include "apps/nautilus.rc"

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-11 22:46:04 +0000
+++ debian/changelog	2011-04-12 06:04:30 +0000
@@ -1,7 +1,11 @@
 light-themes (0.1.8.13) UNRELEASED; urgency=low
 
+  [James Schriver]
+  * Ambiance/Radiance/apps/gedit.rc
+    - Add gedit specific theming bits fixes (LP: #740864)
+    - Minor gedit specific theming tweaks
 
- -- Paul Sladen <[e-mail]>  Mon, 11 Apr 2011 23:45:41 +0100
+ -- James Schriver <[e-mail]>  Tue, 12 Apr 2011 01:50:29 -0400
 
 light-themes (0.1.8.12) natty; urgency=low