Merge lp:~viking.redwolf/ubuntu/oneiric/lubuntu-artwork/lubuntu-artwork-fix-877293 into lp:ubuntu/oneiric/lubuntu-artwork

[Redwolf]

This is a syntax correction that avoids terminal dropped errors when opening gedit and some other gtk3 apps.

[Julien Lavergne (gilir)]

Thanks Rafael. I'm ok with the change, but I don't think we should include it in Oneiric.
Now, only fixes for important bugs are allow in Oneiric. I think this error is harmless, so I don't think it's necessary for Oneiric. But, it makes sense to fix it in Precise. Could you do another merge proposal, but against lp:~lubuntu-desktop/+junk/lubuntu-artwork ? Thanks.

[Redwolf (viking.redwolf)]

Seems logic. I'll try to merge to that branch.

 <http://lubuntublog.blogspot.com/> <http://www.lubuntu.net/>

2011/11/16 Julien Lavergne <email address hidden>

> Thanks Rafael. I'm ok with the change, but I don't think we should include
> it in Oneiric.
> Now, only fixes for important bugs are allow in Oneiric. I think this
> error is harmless, so I don't think it's necessary for Oneiric. But, it
> makes sense to fix it in Precise. Could you do another merge proposal, but
> against lp:~lubuntu-desktop/+junk/lubuntu-artwork ? Thanks.
> --
>
> https://code.launchpad.net/~rafaellaguna/ubuntu/oneiric/lubuntu-artwork/lubuntu-artwork-fix-877293/+merge/82322
> You are the owner of
> lp:~rafaellaguna/ubuntu/oneiric/lubuntu-artwork/lubuntu-artwork-fix-877293.
>

Unmerged revisions

20. By Redwolf on 2011-11-15

* usr/share/themes/Lubuntu-default/
 - Correct gtk-button border properties syntax (LP: #877293)

19. By Julien Lavergne on 2011-10-28

* usr/share/themes/Lubuntu-default/
 - Disable inset text style, to reduce CPU usage (LP: #878958)

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-25 01:13:54 +0000
+++ debian/changelog	2011-11-15 21:34:26 +0000
@@ -1,3 +1,17 @@
+lubuntu-artwork (0.19ubuntu1) oneiric; urgency=low
+
+  * usr/share/themes/Lubuntu-default/
+   - Correct gtk-button border properties syntax (LP: #877293)
+
+ -- 神癒礁湖 <[e-mail]>  Tue, 15 Nov 2011 22:23:36 +0100
+
+lubuntu-artwork (0.19) precise; urgency=low
+
+  * usr/share/themes/Lubuntu-default/
+   - Disable inset text style, to reduce CPU usage (LP: #878958)
+
+ -- Julien Lavergne <[e-mail]>  Fri, 28 Oct 2011 13:39:35 +0200
+
 lubuntu-artwork (0.18) oneiric; urgency=low
 
   * usr/share/themes/Lubuntu-default/

=== modified file 'usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc'
--- usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc	2011-08-21 00:20:13 +0000
+++ usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc	2011-11-15 21:34:26 +0000
@@ -156,7 +156,7 @@
 		stepperstyle		= 1			# 0 = standard, 1 = integrated stepper handles, 2 = unknown
 		progressbarstyle	= 0			# 0 = nothing, 1 = stripes, 2 = lines
 		shadow_shades		= {0.5, 0.0}		# gradient for shadows.		
-		textstyle		= 1			# 0 = normal text, 1 = inset		
+		textstyle		= 0			# 0 = normal text, 1 = inset		
 		toolbarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient		
 		trough_shades		= {0.98, 1.06}		# draw gradient on trough of GtkScrollbar and GtkProgressbar
 	}

=== modified file 'usr/share/themes/Lubuntu-default/gtk-3.0/gtk-buttons.css'
--- usr/share/themes/Lubuntu-default/gtk-3.0/gtk-buttons.css	2011-08-21 00:20:13 +0000
+++ usr/share/themes/Lubuntu-default/gtk-3.0/gtk-buttons.css	2011-11-15 21:34:26 +0000
@@ -156,7 +156,7 @@
  ************/
 column-header .button {
 	border-radius: 0;
-	padding: -1 2;
+	padding: 1 2;
 	background-image: -gtk-gradient (linear,
 		left top, left bottom,
 		from (shade (@listview_header_gradient_a,1.00)),