light-themes

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

  1. desktop-panels-929665
  2. Merge into trunk
Proposed by Andrew
Status: Merged
Merge reported by: Andrea Cimitan
Merged at revision: not available
Proposed branch: lp:~and471/light-themes/desktop-panels-929665
Merge into: lp:~ubuntu-art-pkg/light-themes/trunk
Diff against target: 139 lines (+28/-14)
4 files modified
Ambiance/gtk-3.0/apps/panel.css (+13/-6)
Ambiance/gtk-3.0/gtk.css (+1/-1)
Radiance/gtk-3.0/apps/panel.css (+13/-6)
Radiance/gtk-3.0/gtk.css (+1/-1)
To merge this branch: bzr merge lp:~and471/light-themes/desktop-panels-929665
Reviewer Review Type Date Requested Status
Andrew (community) Needs Resubmitting
Andrea Cimitan Needs Fixing
Adolfo Jayme Barrientos (community) Approve
Review via email: mp+92327@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Adolfo Jayme Barrientos (fitojb) :
review: Approve
Revision history for this message
Andrea Cimitan (cimi) wrote :

Could you update with latest trunk?

review: Needs Fixing
Revision history for this message
Andrew (and471) wrote :
Download full text (5.3 KiB)

> 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...

Read more...

review: Needs Resubmitting
Revision history for this message
Andrea Cimitan (cimi) wrote :

push to another branch dude! :-)

Revision history for this message
Andrew (and471) wrote :

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...

Revision history for this message
Andrea Cimitan (cimi) wrote :

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

Revision history for this message
Andrew (and471) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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-02-08 12:55:19 +0000
+++ Ambiance/gtk-3.0/apps/panel.css 2012-02-09 17:25:24 +0000
@@ -1,7 +1,8 @@
1/* Fallback Mode Panel */1/* Fallback Mode GNOME Panel and other Desktop Panels */
2PanelWidget,2PanelWidget,
3PanelApplet,3PanelApplet,
4PanelToplevel {4PanelToplevel,
5.desktop-panel {
5 background-image: -gtk-gradient (linear, left top, left bottom,6 background-image: -gtk-gradient (linear, left top, left bottom,
6 from (shade (@dark_bg_color, 1.5)),7 from (shade (@dark_bg_color, 1.5)),
7 to (shade (@dark_bg_color, 1.05)));8 to (shade (@dark_bg_color, 1.05)));
@@ -14,7 +15,9 @@
14PanelApplet > GtkMenuBar.menubar,15PanelApplet > GtkMenuBar.menubar,
15PanelApplet > GtkMenuBar.menubar.menuitem,16PanelApplet > GtkMenuBar.menubar.menuitem,
16PanelMenuBar.menubar,17PanelMenuBar.menubar,
17PanelMenuBar.menubar.menuitem {18PanelMenuBar.menubar.menuitem,
19.desktop-panel .menubar,
20.desktop-panel .menubar .menuitem {
18 background-image: -gtk-gradient (linear, left top, left bottom,21 background-image: -gtk-gradient (linear, left top, left bottom,
19 from (shade (@dark_bg_color, 1.5)),22 from (shade (@dark_bg_color, 1.5)),
20 to (shade (@dark_bg_color, 1.05)));23 to (shade (@dark_bg_color, 1.05)));
@@ -27,7 +30,8 @@
27 to (shade (@dark_bg_color, 1.05)));30 to (shade (@dark_bg_color, 1.05)));
28}31}
2932
30PanelApplet .button {33PanelApplet .button,
34.desktop-panel .button {
31 background-image: -gtk-gradient (linear, left top, left bottom,35 background-image: -gtk-gradient (linear, left top, left bottom,
32 from (shade (@dark_bg_color, 1.5)),36 from (shade (@dark_bg_color, 1.5)),
33 to (shade (@dark_bg_color, 1.05)));37 to (shade (@dark_bg_color, 1.05)));
@@ -44,7 +48,9 @@
44}48}
4549
46PanelApplet .button:prelight:active,50PanelApplet .button:prelight:active,
47PanelApplet .button:active {51PanelApplet .button:active,
52.desktop-panel .button:prelight:active,
53.desktop-panel .button:active {
48 background-image: -gtk-gradient (linear, left top, left bottom,54 background-image: -gtk-gradient (linear, left top, left bottom,
49 from (shade (@dark_bg_color, 0.85)),55 from (shade (@dark_bg_color, 0.85)),
50 to (shade (@dark_bg_color, 1.0))); 56 to (shade (@dark_bg_color, 1.0)));
@@ -58,7 +64,8 @@
58 -unico-outer-stroke-width: 0;64 -unico-outer-stroke-width: 0;
59}65}
6066
61PanelApplet .button:prelight {67PanelApplet .button:prelight,
68.desktop-panel .button:prelight {
62 background-image: -gtk-gradient (linear, left top, left bottom,69 background-image: -gtk-gradient (linear, left top, left bottom,
63 from (shade (@dark_bg_color, 1.7)),70 from (shade (@dark_bg_color, 1.7)),
64 to (shade (@dark_bg_color, 1.25)));71 to (shade (@dark_bg_color, 1.25)));
6572
=== modified file 'Ambiance/gtk-3.0/gtk.css'
--- Ambiance/gtk-3.0/gtk.css 2012-02-06 15:10:06 +0000
+++ Ambiance/gtk-3.0/gtk.css 2012-02-09 17:25:24 +0000
@@ -28,7 +28,7 @@
28@define-color transparent rgba (0, 0, 0, 0);28@define-color transparent rgba (0, 0, 0, 0);
2929
30@import url("gtk-widgets.css");30@import url("gtk-widgets.css");
31@import url("apps/gnome-panel.css");31@import url("apps/panel.css");
32@import url("apps/gnome-terminal.css");32@import url("apps/gnome-terminal.css");
33@import url("apps/nautilus.css");33@import url("apps/nautilus.css");
34@import url("apps/unity.css");34@import url("apps/unity.css");
3535
=== 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-02-08 12:55:19 +0000
+++ Radiance/gtk-3.0/apps/panel.css 2012-02-09 17:25:24 +0000
@@ -1,7 +1,8 @@
1/* Fallback Mode Panel */1/* Fallback Mode GNOME Panel and other Desktop Panels */
2PanelWidget,2PanelWidget,
3PanelApplet,3PanelApplet,
4PanelToplevel {4PanelToplevel,
5.desktop-panel {
5 padding: 0;6 padding: 0;
6 background-image: -gtk-gradient (linear, left top, left bottom,7 background-image: -gtk-gradient (linear, left top, left bottom,
7 from (shade (@dark_bg_color, 1.15)),8 from (shade (@dark_bg_color, 1.15)),
@@ -14,7 +15,9 @@
14PanelApplet > GtkMenuBar.menubar,15PanelApplet > GtkMenuBar.menubar,
15PanelApplet > GtkMenuBar.menubar.menuitem,16PanelApplet > GtkMenuBar.menubar.menuitem,
16PanelMenuBar.menubar,17PanelMenuBar.menubar,
17PanelMenuBar.menubar.menuitem {18PanelMenuBar.menubar.menuitem,
19.desktop-panel .menubar,
20.desktop-panel .menubar .menuitem {
18 background-image: -gtk-gradient (linear, left top, left bottom,21 background-image: -gtk-gradient (linear, left top, left bottom,
19 from (shade (@dark_bg_color, 1.15)),22 from (shade (@dark_bg_color, 1.15)),
20 to (shade (@dark_bg_color, 0.95)));23 to (shade (@dark_bg_color, 0.95)));
@@ -27,7 +30,8 @@
27 to (shade (@dark_bg_color, 0.95)));30 to (shade (@dark_bg_color, 0.95)));
28}31}
2932
30PanelApplet .button {33PanelApplet .button,
34.desktop-panel .button {
31 background-image: -gtk-gradient (linear, left top, left bottom,35 background-image: -gtk-gradient (linear, left top, left bottom,
32 from (shade (@dark_bg_color, 1.15)),36 from (shade (@dark_bg_color, 1.15)),
33 to (shade (@dark_bg_color, 0.95))); 37 to (shade (@dark_bg_color, 0.95)));
@@ -44,7 +48,9 @@
44}48}
4549
46PanelApplet .button:prelight:active,50PanelApplet .button:prelight:active,
47PanelApplet .button:active {51PanelApplet .button:active,
52.desktop-panel .button:prelight:active,
53.desktop-panel .button:active {
48 background-image: -gtk-gradient (linear, left top, left bottom,54 background-image: -gtk-gradient (linear, left top, left bottom,
49 from (shade (@dark_bg_color, 0.7)),55 from (shade (@dark_bg_color, 0.7)),
50 to (shade (@dark_bg_color, 0.8))); 56 to (shade (@dark_bg_color, 0.8)));
@@ -58,7 +64,8 @@
58 -unico-outer-stroke-width: 0;64 -unico-outer-stroke-width: 0;
59}65}
6066
61PanelApplet .button:prelight {67PanelApplet .button:prelight,
68.desktop-panel .button:prelight {
62 background-image: -gtk-gradient (linear, left top, left bottom,69 background-image: -gtk-gradient (linear, left top, left bottom,
63 from (shade (@dark_bg_color, 1.2)),70 from (shade (@dark_bg_color, 1.2)),
64 to (shade (@dark_bg_color, 1.0))); 71 to (shade (@dark_bg_color, 1.0)));
6572
=== modified file 'Radiance/gtk-3.0/gtk.css'
--- Radiance/gtk-3.0/gtk.css 2011-08-25 11:12:53 +0000
+++ Radiance/gtk-3.0/gtk.css 2012-02-09 17:25:24 +0000
@@ -28,7 +28,7 @@
28@define-color transparent rgba (0, 0, 0, 0);28@define-color transparent rgba (0, 0, 0, 0);
2929
30@import url("gtk-widgets.css");30@import url("gtk-widgets.css");
31@import url("apps/gnome-panel.css");31@import url("apps/panel.css");
32@import url("apps/gnome-terminal.css");32@import url("apps/gnome-terminal.css");
33@import url("apps/nautilus.css");33@import url("apps/nautilus.css");
34@import url("apps/unity.css");34@import url("apps/unity.css");

Subscribers

People subscribed via source and target branches