From 858c9ff681c0f8d83f2b4f4b541bbca7dffc6f9e Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Sun, 18 Sep 2011 13:44:36 +0200
Subject: [PATCH] * usr/share/themes/Lubuntu-default/  - Fix bug for the white
 menu items on gtk3 theme. (LP: #853172)  - Adjust menuitems border for panel
 buttons.

---
 debian/changelog                                |   8 ++++++++
 .../widgets/Panel/panel-button-active.png       | Bin 363 -> 627 bytes
 .../Lubuntu-default/gtk-3.0/gtk-menus.css       |  14 +++++++++-----
 .../themes/Lubuntu-default/lubuntu.desktop      |  10 +++++-----
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62db662..afcf977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lubuntu-artwork (0.18) UNRELEASED; urgency=low
+
+  * usr/share/themes/Lubuntu-default/
+   - Fix bug for the white menu items on gtk3 theme. (LP: #853172)
+   - Adjust menuitems border for panel buttons.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 18 Sep 2011 13:38:07 +0200
+
 lubuntu-artwork (0.17) oneiric; urgency=low
 
   * usr/share/lxdm/themes/Lubuntu
diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/widgets/Panel/panel-button-active.png b/usr/share/themes/Lubuntu-default/gtk-2.0/widgets/Panel/panel-button-active.png
index 6fe52aec309a35323c714ffcfc04d8394b0a13e5..93e3c81e4d0e50b8f6084e298f3b3e0d63dee6d1 100644
GIT binary patch
delta 595
zcmV-Z0<8V(0`mlr90dW$<Zy|RArpTFVoOIv00000008+zyMF)x010qNS#tmY3ljhU
z3ljkVnw%H_000McNliru+X)O48zz>p$jbl#0q{vgK~z}7?U+GN+dvS7zp-~s;zSe#
zv<gtsQ^o)PNubK7O085CQb?A|4qX;Iun`mCs&ld9+0omXd44+%Y%qz}OJIK;@2hzK
z(ZvU!dIG<wbKc`T+=%zJ&*6Z@kYm1S>kD3QA9UB}1wp48bW{*@u0eG{kY^i{*uS3z
zF`WaBv!<)%M9^#JViA@l+jGDH@S`+n4opjfd|}C-Bwkc<fX~1UHZ}#Wl|{#;1uU?G
z6zBw483CPWlk{c!WdwAX0_}eTGb5n=6le-GMnJQzsk)76Mji0`1yQIHf7P>g=y$iP
zWRMWTg^1i5QM(QyOk5&Xe+)nxV5%T%BQkgenE@d-KR+3A0x+;9ZG1|c2{3a&3*2Rk
z-cmeUE!V9P$exy~jitIb0%=`jKx4?RMnSxhj`<v<wgmA}$1Fe`;CFwb#{Uk81FqtG
zvK)|<mo~ZH@N5Mv1t5g55RuAIUMxG|LkMdT>GTwClLhx9O2$R8Cm)h9JSVNJNvBAc
zPGyGYv6cC>5joAqM6t)Ceu!qvkqN+F+`II3=Em^b%qp2@otY%gu_g0N&6>n{H!=Ze
zRJ8JBtVT1-&I~3~C(lF1V0AityKF$K`1{w>SjL%Zr&H!GGy9*+do=w7I1`bhIApFy
hw*N^8;k$@@djP#ZUlWGJVmtr<002ovPDHLkV1i!v1?m6*

delta 329
zcmV-P0k;101nUBj90dTs<3JygArpTYbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oe
zd2z{QJOBUy{YgYYRCwC#n9T~qAP|Hd?WxfBf4)9IPlfi<WTRAJEB=JuW>FC1N{k<4
z#$+KP&PuuD_J&wuyT!^xm)0EQtH{&mV8{a?6Qis-Xk`i%+n)0UM8lN8P6mI}gz>5s
zE6QwyFun(4N|}(~8|@ZOnFACoD${87>uU_=aT60lV|)nnBU@)ObmFZ(2KQs~9Cu<o
z{0l?rW}eUhU{)Co14}UU+ss=v01zr;!p+dzW+42hnJNP-2Ee8aM#`9g0Wl0*rHF~L
zU>3}RSui$AIcFaEQ~Dk2r;#}=nPp|9@_soPA7yY_NsM~DWMDT9bC30!gFD%wnHXNF
ba|kd1EB-U@yT_QI00000NkvXXu0mjf9zKt;

diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-menus.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-menus.css
index 46358da..aa5ec4f 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-menus.css
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-menus.css
@@ -12,7 +12,7 @@
 /* menuitem */
 .menuitem {
 	padding: 2;
-	border-width: 1;
+	border-width: 0;
 	border-radius: 0;
 	text-shadow: 0 1 alpha (shade (@button_bg_color, 1.25), 0.4);
 	border-style: solid;
@@ -28,10 +28,14 @@
 	-unico-inner-stroke-style: none;
 }
 
-.menuitem:prelight,
-.menuitem *:prelight {
-	color: @selected_fg_color;
-	text-shadow: none;
+.menubar.menuitem:prelight {
+    background-image: none;
+    background-color: @menu_bg_color;
+    color: @menu_fg_color;
+    border-style: solid;
+    border-radius: 0;
+    border-width: 0;
+    border-color: @inactive_frame_color;
 }
 
 .menuitem:insensitive,
diff --git a/usr/share/themes/Lubuntu-default/lubuntu.desktop b/usr/share/themes/Lubuntu-default/lubuntu.desktop
index 99c691a..9383d5e 100644
--- a/usr/share/themes/Lubuntu-default/lubuntu.desktop
+++ b/usr/share/themes/Lubuntu-default/lubuntu.desktop
@@ -1,6 +1,8 @@
-# Theme for Lubuntu Oneiric Ocelot
-# Author: 神癒礁湖 (Rafael Laguna)
-# Released under GPL. See COPYING for license.
+# Theme for Lubuntu 11.10 (oneiric ocelot)
+# Author: 神癒礁湖 (Rafael Laguna) · rafaellaguna@ubuntu.com
+# Released under GPL3. See COPYING for license.
+# For questions & feedback: lubuntu-desktop@lists.launchpad.net
+# Subscribe here: https://launchpad.net/~lubuntu-desktop
 
 [Desktop Entry]
 Type=X-GNOME-Metatheme
@@ -8,8 +10,6 @@ Name=lubuntu
 Comment=Lubuntu desktop default theme
 Encoding=UTF-8
 
-Name[ca_ES]=lubuntu
-
 [X-GNOME-Metatheme]
 CursorSize=24
 GtkTheme=lubuntu