> 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 :backdrop, PanelToplevel :backdrop, PanelWidget, PanelApplet, -PanelToplevel { +PanelToplevel, +.desktop-panel { padding: 0; background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.15)), @@ -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.15)), @@ -47,7 +50,8 @@ }
background-image: -gtk-gradient (linear, left top, left bottom, @@ -69,7 +73,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.7)), to (shade (@dark_bg_color, 0.8))); @@ -77,7 +83,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.3)), to (shade (@dark_bg_color, 1.1)));
=== modified file 'Radiance/gtk-3.0/gtk.css' --- Radiance/gtk-3.0/gtk.css 2012-03-30 16:29:46 +0000 +++ Radiance/gtk-3.0/gtk.css 2012-04-29 19:58:57 +0000 @@ -32,7 +32,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");
« Back to merge proposal
> 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' gtk-3.0/ apps/gnome- panel.css 2012-04-29 13:37:13 +0000 gtk-3.0/ apps/panel. css 2012-04-29 20:03:01 +0000 -image: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 1.5)),
to (shade (@dark_bg_color, 1.05))); menubar. menuitem, menubar, menubar. menuitem { menubar. menuitem, Bar-icon- visible: true; -image: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 1.5)),
--- Ambiance/
+++ Ambiance/
@@ -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
@@ -31,7 +32,9 @@
PanelApplet > GtkMenuBar.menubar,
PanelApplet > GtkMenuBar.
PanelMenuBar.
-PanelMenuBar.
+PanelMenuBar.
+.desktop-panel .menubar,
+.desktop-panel .menubar .menuitem {
-PanelMenu
background
@@ -47,7 +50,8 @@
}
PanelApplet .button:backdrop, -inner- border: 2;
-PanelApplet .button {
+PanelApplet .button,
+.desktop-panel .button {
-GtkButton
background -image: -gtk-gradient (linear, left top, left bottom, active: prelight: backdrop, active: prelight, active: backdrop, active: prelight, -image: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 0.85)),
to (shade (@dark_bg_color, 1.0)));
@@ -70,7 +74,9 @@
PanelApplet .button:
PanelApplet .button:
PanelApplet .button:
-PanelApplet .button:active {
+PanelApplet .button:active,
+.desktop-panel .button:
+.desktop-panel .button:active {
background
@@ -78,7 +84,8 @@
}
PanelApplet .button: prelight: backdrop, -image: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 1.7)),
to (shade (@dark_bg_color, 1.25)));
-PanelApplet .button:prelight {
+PanelApplet .button:prelight,
+.desktop-panel .button:prelight {
background
=== modified file 'Ambiance/ gtk-3.0/ gtk.css' gtk-3.0/ gtk.css 2012-03-30 16:29:46 +0000 gtk-3.0/ gtk.css 2012-04-29 19:58:43 +0000 widgets. css"); widgets- backdrop. css"); gedit.css" ); gnome-panel. css"); panel.css" ); gnome-terminal. css"); nautilus. css"); unity.css" );
--- Ambiance/
+++ Ambiance/
@@ -33,7 +33,7 @@
@import url("gtk-
@import url("gtk-
@import url("apps/
-@import url("apps/
+@import url("apps/
@import url("apps/
@import url("apps/
@import url("apps/
=== renamed file 'Radiance/ gtk-3.0/ apps/gnome- panel.css' => 'Radiance/ gtk-3.0/ apps/panel. css' gtk-3.0/ apps/gnome- panel.css 2012-04-29 13:37:13 +0000 gtk-3.0/ apps/panel. css 2012-04-29 20:02:52 +0000 -image: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 1.15)), menubar. menuitem, menubar, menubar. menuitem { menubar. menuitem, Bar-icon- visible: true; -image: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 1.15)),
--- Radiance/
+++ Radiance/
@@ -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 {
padding: 0;
background
@@ -31,7 +32,9 @@
PanelApplet > GtkMenuBar.menubar,
PanelApplet > GtkMenuBar.
PanelMenuBar.
-PanelMenuBar.
+PanelMenuBar.
+.desktop-panel .menubar,
+.desktop-panel .menubar .menuitem {
-PanelMenu
background
@@ -47,7 +50,8 @@
}
PanelApplet .button:backdrop, -inner- border: 2;
-PanelApplet .button {
+PanelApplet .button,
+.desktop-panel .button {
-GtkButton
background -image: -gtk-gradient (linear, left top, left bottom, active: prelight: backdrop, active: prelight, active: backdrop, active: prelight, -image: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 0.7)),
to (shade (@dark_bg_color, 0.8)));
@@ -69,7 +73,9 @@
PanelApplet .button:
PanelApplet .button:
PanelApplet .button:
-PanelApplet .button:active {
+PanelApplet .button:active,
+.desktop-panel .button:
+.desktop-panel .button:active {
background
@@ -77,7 +83,8 @@
}
PanelApplet .button: prelight: backdrop, -image: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 1.3)),
to (shade (@dark_bg_color, 1.1)));
-PanelApplet .button:prelight {
+PanelApplet .button:prelight,
+.desktop-panel .button:prelight {
background
=== modified file 'Radiance/ gtk-3.0/ gtk.css' gtk-3.0/ gtk.css 2012-03-30 16:29:46 +0000 gtk-3.0/ gtk.css 2012-04-29 19:58:57 +0000 widgets. css"); widgets- backdrop. css"); gedit.css" ); gnome-panel. css"); panel.css" ); gnome-terminal. css"); nautilus. css"); unity.css" );
--- Radiance/
+++ Radiance/
@@ -32,7 +32,7 @@
@import url("gtk-
@import url("gtk-
@import url("apps/
-@import url("apps/
+@import url("apps/
@import url("apps/
@import url("apps/
@import url("apps/