Merge lp://staging/~and471/light-themes/desktop-panels-929665 into lp://staging/~ubuntu-art-pkg/light-themes/trunk

Could you update with latest trunk?

> Could you update with latest trunk?

yes sure, below is the bzr diff (use this as the patch, don't merge with the branch as it hasn't changed)

=== renamed file 'Ambiance/gtk-3.0/apps/gnome-panel.css' => 'Ambiance/gtk-3.0/apps/panel.css'
--- Ambiance/gtk-3.0/apps/gnome-panel.css 2012-04-29 13:37:13 +0000
+++ Ambiance/gtk-3.0/apps/panel.css 2012-04-29 20:03:01 +0000
@@ -1,10 +1,11 @@
-/* Fallback Mode Panel */
+/* Fallback Mode GNOME Panel and other Desktop Panels */
 PanelWidget :backdrop,
 PanelApplet :backdrop,
 PanelToplevel :backdrop,
 PanelWidget,
 PanelApplet,
-PanelToplevel {
+PanelToplevel,
+.desktop-panel {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.5)),
                                      to (shade (@dark_bg_color, 1.05)));
@@ -31,7 +32,9 @@
 PanelApplet > GtkMenuBar.menubar,
 PanelApplet > GtkMenuBar.menubar.menuitem,
 PanelMenuBar.menubar,
-PanelMenuBar.menubar.menuitem {
+PanelMenuBar.menubar.menuitem,
+.desktop-panel .menubar,
+.desktop-panel .menubar .menuitem {
     -PanelMenuBar-icon-visible: true;
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.5)),
@@ -47,7 +50,8 @@
 }

 PanelApplet .button:backdrop,
-PanelApplet .button {
+PanelApplet .button,
+.desktop-panel .button {
     -GtkButton-inner-border: 2;

     background-image: -gtk-gradient (linear, left top, left bottom,
@@ -70,7 +74,9 @@
 PanelApplet .button:active:prelight:backdrop,
 PanelApplet .button:active:prelight,
 PanelApplet .button:active:backdrop,
-PanelApplet .button:active {
+PanelApplet .button:active,
+.desktop-panel .button:active:prelight,
+.desktop-panel .button:active {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 0.85)),
                                      to (shade (@dark_bg_color, 1.0)));
@@ -78,7 +84,8 @@
 }

 PanelApplet .button:prelight:backdrop,
-PanelApplet .button:prelight {
+PanelApplet .button:prelight,
+.desktop-panel .button:prelight {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.7)),
                                      to (shade (@dark_bg_color, 1.25)));

=== modified file 'Ambiance/gtk-3.0/gtk.css'
--- Ambiance/gtk-3.0/gtk.css 2012-03-30 16:29:46 +0000
+++ Ambiance/gtk-3.0/gtk.css 2012-04-29 19:58:43 +0000
@@ -33,7 +33,7 @@
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-backdrop.css");
 @import url("apps/gedit.css");
-@import url("apps/gnome-panel.css");
+@import url("apps/panel.css");
 @import url("apps/gnome-terminal.css");
 @import url("apps/nautilus.css");
 @import url("apps/unity.css");

=== renamed file 'Radiance/gtk-3.0/apps/gnome-panel.css' => 'Radiance/gtk-3.0/apps/panel.css'
--- Radiance/gtk-3.0/apps/gnome-panel.css 2012-04-29 13:37:13 +0000
+++ Radiance/gtk-3.0/apps/panel.css 2012-04-29 20:02:52 +0000
@@ -1,10 +1,11 @@
-/* Fallback Mode Panel */
+/* Fallback Mode GNOME Panel and other Desktop Panels */
 PanelWidget :backdrop,
 PanelApplet :ba...

push to another branch dude! :-)

Okay I have now pushed to lp:~and471/+junk/desktop-panels but I do wonder why you are making it a little difficult and frustrating to contribute...

That's for you Andrew! :-)
Because when you work on separate branches you get proper credits!

Look for example here, branches merged and tracked. https://code.launchpad.net/~unity-team/unity/trunk

Oh okay...I guess I was a bit grumpy this morning :) thanks for the merge