Merge lp:~eye-zak-devel/light-themes/fixes-lp954437 into lp:~ubuntu-art-pkg/light-themes/trunk

Proposed by z on 2012-03-13
Status: Needs review
Proposed branch: lp:~eye-zak-devel/light-themes/fixes-lp954437
Merge into: lp:~ubuntu-art-pkg/light-themes/trunk
Diff against target: 184 lines (+55/-14)
2 files modified
Ambiance/gtk-3.0/apps/gnome-panel.css (+26/-7)
Radiance/gtk-3.0/apps/gnome-panel.css (+29/-7)
To merge this branch: bzr merge lp:~eye-zak-devel/light-themes/fixes-lp954437
Reviewer Review Type Date Requested Status
Light Themes Contributors 2012-03-13 Pending
Review via email: mp+97295@code.launchpad.net

Description of the change

Fixes lp:954437

This bug affects only gnome-fallback sessions

Show desktop and tasklist have light backgrounds, they should be dark like the rest of the panel.

Font colour in main menu panel menus is grey, not white.

To post a comment you must log in.
219. By z on 2012-03-14

Fix main menu css selection to be more specific

Benjamin Drung (bdrung) wrote :

Thanks for your work. Your proposed branch fixed bug #955376 and #981289.

The main menu icon is smaller than it used to be in GNOME 2. Can you make it bigger?

Jeremy Bicha (jbicha) wrote :

Benjamin, the smaller menu icon is an upstream bug (which hasn't been filed yet). It would be nice if it were the same size as in the "main menu" applet. Because it's so small and barely distinguishable, I think we should go ahead and leave the menu bar icon disabled for Precise.

Unmerged revisions

219. By z on 2012-03-14

Fix main menu css selection to be more specific

218. By z on 2012-03-13

Fixes lp:954437

Fix font color in main menu panel menus (Ambiance and Radiance)
Include icon in main menu (Ambiance and Radiance)
 - this is debatable, I am just making it more like gnome2

Make "show desktop" and tasklist behave like theme suggests (Ambiance and Radiance)
 - I tried to do this without customizing the behavior the way I thought best. What it should be is debatable, maybe someone with knowledge about this can change it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-3.0/apps/gnome-panel.css'
2--- Ambiance/gtk-3.0/apps/gnome-panel.css 2012-03-06 15:23:14 +0000
3+++ Ambiance/gtk-3.0/apps/gnome-panel.css 2012-03-14 14:19:38 +0000
4@@ -23,6 +23,10 @@
5 color: @dark_fg_color;
6 }
7
8+PanelMenuBar > GtkMenuItem * {
9+ color: @dark_fg_color
10+}
11+
12 .gnome-panel-menu-bar,
13 PanelApplet > GtkMenuBar.menubar,
14 PanelApplet > GtkMenuBar.menubar.menuitem,
15@@ -31,6 +35,7 @@
16 background-image: -gtk-gradient (linear, left top, left bottom,
17 from (shade (@dark_bg_color, 1.5)),
18 to (shade (@dark_bg_color, 1.05)));
19+ -PanelMenuBar-icon-visible: true;
20 }
21
22 PanelAppletFrame {
23@@ -41,7 +46,9 @@
24 border-width: 0;
25 }
26
27-PanelApplet .button {
28+PanelApplet .button,
29+PanelApplet #showdesktop-button,
30+WnckTasklist #tasklist-button {
31 -GtkButton-inner-border: 2;
32
33 background-image: -gtk-gradient (linear, left top, left bottom,
34@@ -53,16 +60,22 @@
35 border-width: 0 1px 0 1px;
36
37 color: @dark_fg_color;
38- text-shadow: none;
39+ text-shadow: 0 -1 shade (@dark_bg_color, 0.6);
40
41- -unico-border-gradient: none;
42+ -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
43+ from (shade (@dark_bg_color, 1.5)),
44+ to (shade (@dark_bg_color, 1.05)));
45 -unico-glow-radius: 0;
46 -unico-inner-stroke-width: 0;
47 -unico-outer-stroke-width: 0;
48 }
49
50 PanelApplet .button:prelight:active,
51-PanelApplet .button:active {
52+PanelApplet .button:active,
53+PanelApplet #showdesktop-button:prelight:active,
54+PanelApplet #showdesktop-button:active,
55+WnckTasklist #tasklist-button:prelight:active,
56+WnckTasklist #tasklist-button:active {
57 background-image: -gtk-gradient (linear, left top, left bottom,
58 from (shade (@dark_bg_color, 0.85)),
59 to (shade (@dark_bg_color, 1.0)));
60@@ -70,13 +83,17 @@
61 border-radius: 0;
62 border-width: 0 1px 0 1px;
63
64- -unico-border-gradient: none;
65+ -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
66+ from (shade (@dark_bg_color, 1.5)),
67+ to (shade (@dark_bg_color, 1.05)));
68 -unico-glow-radius: 0;
69 -unico-inner-stroke-width: 0;
70 -unico-outer-stroke-width: 0;
71 }
72
73-PanelApplet .button:prelight {
74+PanelApplet .button:prelight,
75+PanelApplet #showdesktop-button:prelight,
76+WnckTasklist #tasklist-button:prelight {
77 background-image: -gtk-gradient (linear, left top, left bottom,
78 from (shade (@dark_bg_color, 1.7)),
79 to (shade (@dark_bg_color, 1.25)));
80@@ -84,7 +101,9 @@
81 border-radius: 0;
82 border-width: 0 1px 0 1px;
83
84- -unico-border-gradient: none;
85+ -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
86+ from (shade (@dark_bg_color, 1.5)),
87+ to (shade (@dark_bg_color, 1.05)));
88 -unico-glow-radius: 0;
89 -unico-inner-stroke-width: 0;
90 -unico-outer-stroke-width: 0;
91
92=== modified file 'Radiance/gtk-3.0/apps/gnome-panel.css'
93--- Radiance/gtk-3.0/apps/gnome-panel.css 2012-03-06 15:23:14 +0000
94+++ Radiance/gtk-3.0/apps/gnome-panel.css 2012-03-14 14:19:38 +0000
95@@ -23,6 +23,10 @@
96 color: @dark_fg_color;
97 }
98
99+PanelMenuBar > GtkMenuItem * {
100+ color: @dark_fg_color
101+}
102+
103 .gnome-panel-menu-bar,
104 PanelApplet > GtkMenuBar.menubar,
105 PanelApplet > GtkMenuBar.menubar.menuitem,
106@@ -31,6 +35,7 @@
107 background-image: -gtk-gradient (linear, left top, left bottom,
108 from (shade (@dark_bg_color, 1.15)),
109 to (shade (@dark_bg_color, 0.95)));
110+ -PanelMenuBar-icon-visible: true;
111 }
112
113 PanelAppletFrame {
114@@ -41,7 +46,9 @@
115 border-width: 0;
116 }
117
118-PanelApplet .button {
119+PanelApplet .button,
120+PanelApplet #showdesktop-button,
121+WnckTasklist #tasklist-button {
122 -GtkButton-inner-border: 2;
123
124 background-image: -gtk-gradient (linear, left top, left bottom,
125@@ -51,16 +58,22 @@
126 border-radius: 0;
127 border-width: 0 1px 0 1px;
128
129- text-shadow: none;
130+ text-shadow: 0 1 shade (@dark_bg_color, 1.08);
131
132- -unico-border-gradient: none;
133+ -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
134+ from (shade (@dark_bg_color, 1.15)),
135+ to (shade (@dark_bg_color, 0.95)));
136 -unico-glow-radius: 0;
137 -unico-inner-stroke-width: 0px;
138 -unico-outer-stroke-width: 0px;
139 }
140
141 PanelApplet .button:prelight:active,
142-PanelApplet .button:active {
143+PanelApplet .button:active,
144+PanelApplet #showdesktop-button:prelight:active,
145+PanelApplet #showdesktop-button:active,
146+WnckTasklist #tasklist-button:prelight:active,
147+WnckTasklist #tasklist-button:active {
148 background-image: -gtk-gradient (linear, left top, left bottom,
149 from (shade (@dark_bg_color, 0.7)),
150 to (shade (@dark_bg_color, 0.8)));
151@@ -68,13 +81,20 @@
152 border-radius: 0;
153 border-width: 0 1px 0 1px;
154
155- -unico-border-gradient: none;
156+ color: @dark_fg_color;
157+ text-shadow: 0 1 shade (@dark_bg_color, 0.9);
158+
159+ -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
160+ from (shade (@dark_bg_color, 1.15)),
161+ to (shade (@dark_bg_color, 0.95)));
162 -unico-glow-radius: 0;
163 -unico-inner-stroke-width: 0;
164 -unico-outer-stroke-width: 0;
165 }
166
167-PanelApplet .button:prelight {
168+PanelApplet .button:prelight,
169+PanelApplet #showdesktop-button:prelight,
170+WnckTasklist #tasklist-button:prelight {
171 background-image: -gtk-gradient (linear, left top, left bottom,
172 from (shade (@dark_bg_color, 1.2)),
173 to (shade (@dark_bg_color, 1.0)));
174@@ -82,7 +102,9 @@
175 border-radius: 0;
176 border-width: 0 1px 0 1px;
177
178- -unico-border-gradient: none;
179+ -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
180+ from (shade (@dark_bg_color, 1.15)),
181+ to (shade (@dark_bg_color, 0.95)));
182 -unico-glow-radius: 0;
183 -unico-inner-stroke-width: 0;
184 -unico-outer-stroke-width: 0;

Subscribers

People subscribed via source and target branches