Merge lp:~and471/light-themes/desktop-panels-929665 into lp:~ubuntu-art-pkg/light-themes/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 (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 (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
1=== renamed file 'Ambiance/gtk-3.0/apps/gnome-panel.css' => 'Ambiance/gtk-3.0/apps/panel.css'
2--- Ambiance/gtk-3.0/apps/gnome-panel.css 2012-02-08 12:55:19 +0000
3+++ Ambiance/gtk-3.0/apps/panel.css 2012-02-09 17:25:24 +0000
4@@ -1,7 +1,8 @@
5-/* Fallback Mode Panel */
6+/* Fallback Mode GNOME Panel and other Desktop Panels */
7 PanelWidget,
8 PanelApplet,
9-PanelToplevel {
10+PanelToplevel,
11+.desktop-panel {
12 background-image: -gtk-gradient (linear, left top, left bottom,
13 from (shade (@dark_bg_color, 1.5)),
14 to (shade (@dark_bg_color, 1.05)));
15@@ -14,7 +15,9 @@
16 PanelApplet > GtkMenuBar.menubar,
17 PanelApplet > GtkMenuBar.menubar.menuitem,
18 PanelMenuBar.menubar,
19-PanelMenuBar.menubar.menuitem {
20+PanelMenuBar.menubar.menuitem,
21+.desktop-panel .menubar,
22+.desktop-panel .menubar .menuitem {
23 background-image: -gtk-gradient (linear, left top, left bottom,
24 from (shade (@dark_bg_color, 1.5)),
25 to (shade (@dark_bg_color, 1.05)));
26@@ -27,7 +30,8 @@
27 to (shade (@dark_bg_color, 1.05)));
28 }
29
30-PanelApplet .button {
31+PanelApplet .button,
32+.desktop-panel .button {
33 background-image: -gtk-gradient (linear, left top, left bottom,
34 from (shade (@dark_bg_color, 1.5)),
35 to (shade (@dark_bg_color, 1.05)));
36@@ -44,7 +48,9 @@
37 }
38
39 PanelApplet .button:prelight:active,
40-PanelApplet .button:active {
41+PanelApplet .button:active,
42+.desktop-panel .button:prelight:active,
43+.desktop-panel .button:active {
44 background-image: -gtk-gradient (linear, left top, left bottom,
45 from (shade (@dark_bg_color, 0.85)),
46 to (shade (@dark_bg_color, 1.0)));
47@@ -58,7 +64,8 @@
48 -unico-outer-stroke-width: 0;
49 }
50
51-PanelApplet .button:prelight {
52+PanelApplet .button:prelight,
53+.desktop-panel .button:prelight {
54 background-image: -gtk-gradient (linear, left top, left bottom,
55 from (shade (@dark_bg_color, 1.7)),
56 to (shade (@dark_bg_color, 1.25)));
57
58=== modified file 'Ambiance/gtk-3.0/gtk.css'
59--- Ambiance/gtk-3.0/gtk.css 2012-02-06 15:10:06 +0000
60+++ Ambiance/gtk-3.0/gtk.css 2012-02-09 17:25:24 +0000
61@@ -28,7 +28,7 @@
62 @define-color transparent rgba (0, 0, 0, 0);
63
64 @import url("gtk-widgets.css");
65-@import url("apps/gnome-panel.css");
66+@import url("apps/panel.css");
67 @import url("apps/gnome-terminal.css");
68 @import url("apps/nautilus.css");
69 @import url("apps/unity.css");
70
71=== renamed file 'Radiance/gtk-3.0/apps/gnome-panel.css' => 'Radiance/gtk-3.0/apps/panel.css'
72--- Radiance/gtk-3.0/apps/gnome-panel.css 2012-02-08 12:55:19 +0000
73+++ Radiance/gtk-3.0/apps/panel.css 2012-02-09 17:25:24 +0000
74@@ -1,7 +1,8 @@
75-/* Fallback Mode Panel */
76+/* Fallback Mode GNOME Panel and other Desktop Panels */
77 PanelWidget,
78 PanelApplet,
79-PanelToplevel {
80+PanelToplevel,
81+.desktop-panel {
82 padding: 0;
83 background-image: -gtk-gradient (linear, left top, left bottom,
84 from (shade (@dark_bg_color, 1.15)),
85@@ -14,7 +15,9 @@
86 PanelApplet > GtkMenuBar.menubar,
87 PanelApplet > GtkMenuBar.menubar.menuitem,
88 PanelMenuBar.menubar,
89-PanelMenuBar.menubar.menuitem {
90+PanelMenuBar.menubar.menuitem,
91+.desktop-panel .menubar,
92+.desktop-panel .menubar .menuitem {
93 background-image: -gtk-gradient (linear, left top, left bottom,
94 from (shade (@dark_bg_color, 1.15)),
95 to (shade (@dark_bg_color, 0.95)));
96@@ -27,7 +30,8 @@
97 to (shade (@dark_bg_color, 0.95)));
98 }
99
100-PanelApplet .button {
101+PanelApplet .button,
102+.desktop-panel .button {
103 background-image: -gtk-gradient (linear, left top, left bottom,
104 from (shade (@dark_bg_color, 1.15)),
105 to (shade (@dark_bg_color, 0.95)));
106@@ -44,7 +48,9 @@
107 }
108
109 PanelApplet .button:prelight:active,
110-PanelApplet .button:active {
111+PanelApplet .button:active,
112+.desktop-panel .button:prelight:active,
113+.desktop-panel .button:active {
114 background-image: -gtk-gradient (linear, left top, left bottom,
115 from (shade (@dark_bg_color, 0.7)),
116 to (shade (@dark_bg_color, 0.8)));
117@@ -58,7 +64,8 @@
118 -unico-outer-stroke-width: 0;
119 }
120
121-PanelApplet .button:prelight {
122+PanelApplet .button:prelight,
123+.desktop-panel .button:prelight {
124 background-image: -gtk-gradient (linear, left top, left bottom,
125 from (shade (@dark_bg_color, 1.2)),
126 to (shade (@dark_bg_color, 1.0)));
127
128=== modified file 'Radiance/gtk-3.0/gtk.css'
129--- Radiance/gtk-3.0/gtk.css 2011-08-25 11:12:53 +0000
130+++ Radiance/gtk-3.0/gtk.css 2012-02-09 17:25:24 +0000
131@@ -28,7 +28,7 @@
132 @define-color transparent rgba (0, 0, 0, 0);
133
134 @import url("gtk-widgets.css");
135-@import url("apps/gnome-panel.css");
136+@import url("apps/panel.css");
137 @import url("apps/gnome-terminal.css");
138 @import url("apps/nautilus.css");
139 @import url("apps/unity.css");

Subscribers

People subscribed via source and target branches