light-themes

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

  1. fixes-lp954437
  2. Merge into trunk
Proposed by z
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 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.
lp:~eye-zak-devel/light-themes/fixes-lp954437 updated
219. By z

Fix main menu css selection to be more specific

Revision history for this message
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?

Reply
Revision history for this message
Jeremy Bícha (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.

Reply

Unmerged revisions

219. By z

Fix main menu css selection to be more specific

218. By z

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
=== modified file 'Ambiance/gtk-3.0/apps/gnome-panel.css'
--- Ambiance/gtk-3.0/apps/gnome-panel.css 2012-03-06 15:23:14 +0000
+++ Ambiance/gtk-3.0/apps/gnome-panel.css 2012-03-14 14:19:38 +0000
@@ -23,6 +23,10 @@
23 color: @dark_fg_color;23 color: @dark_fg_color;
24}24}
2525
26PanelMenuBar > GtkMenuItem * {
27 color: @dark_fg_color
28}
29
26.gnome-panel-menu-bar,30.gnome-panel-menu-bar,
27PanelApplet > GtkMenuBar.menubar,31PanelApplet > GtkMenuBar.menubar,
28PanelApplet > GtkMenuBar.menubar.menuitem,32PanelApplet > GtkMenuBar.menubar.menuitem,
@@ -31,6 +35,7 @@
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)));
38 -PanelMenuBar-icon-visible: true;
34}39}
3540
36PanelAppletFrame { 41PanelAppletFrame {
@@ -41,7 +46,9 @@
41 border-width: 0;46 border-width: 0;
42}47}
4348
44PanelApplet .button {49PanelApplet .button,
50PanelApplet #showdesktop-button,
51WnckTasklist #tasklist-button {
45 -GtkButton-inner-border: 2;52 -GtkButton-inner-border: 2;
4653
47 background-image: -gtk-gradient (linear, left top, left bottom,54 background-image: -gtk-gradient (linear, left top, left bottom,
@@ -53,16 +60,22 @@
53 border-width: 0 1px 0 1px;60 border-width: 0 1px 0 1px;
5461
55 color: @dark_fg_color;62 color: @dark_fg_color;
56 text-shadow: none;63 text-shadow: 0 -1 shade (@dark_bg_color, 0.6);
5764
58 -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)));
59 -unico-glow-radius: 0;68 -unico-glow-radius: 0;
60 -unico-inner-stroke-width: 0;69 -unico-inner-stroke-width: 0;
61 -unico-outer-stroke-width: 0;70 -unico-outer-stroke-width: 0;
62}71}
6372
64PanelApplet .button:prelight:active,73PanelApplet .button:prelight:active,
65PanelApplet .button:active {74PanelApplet .button:active,
75PanelApplet #showdesktop-button:prelight:active,
76PanelApplet #showdesktop-button:active,
77WnckTasklist #tasklist-button:prelight:active,
78WnckTasklist #tasklist-button:active {
66 background-image: -gtk-gradient (linear, left top, left bottom,79 background-image: -gtk-gradient (linear, left top, left bottom,
67 from (shade (@dark_bg_color, 0.85)),80 from (shade (@dark_bg_color, 0.85)),
68 to (shade (@dark_bg_color, 1.0))); 81 to (shade (@dark_bg_color, 1.0)));
@@ -70,13 +83,17 @@
70 border-radius: 0;83 border-radius: 0;
71 border-width: 0 1px 0 1px;84 border-width: 0 1px 0 1px;
7285
73 -unico-border-gradient: none;86 -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
87 from (shade (@dark_bg_color, 1.5)),
88 to (shade (@dark_bg_color, 1.05)));
74 -unico-glow-radius: 0;89 -unico-glow-radius: 0;
75 -unico-inner-stroke-width: 0;90 -unico-inner-stroke-width: 0;
76 -unico-outer-stroke-width: 0;91 -unico-outer-stroke-width: 0;
77}92}
7893
79PanelApplet .button:prelight {94PanelApplet .button:prelight,
95PanelApplet #showdesktop-button:prelight,
96WnckTasklist #tasklist-button:prelight {
80 background-image: -gtk-gradient (linear, left top, left bottom,97 background-image: -gtk-gradient (linear, left top, left bottom,
81 from (shade (@dark_bg_color, 1.7)),98 from (shade (@dark_bg_color, 1.7)),
82 to (shade (@dark_bg_color, 1.25)));99 to (shade (@dark_bg_color, 1.25)));
@@ -84,7 +101,9 @@
84 border-radius: 0;101 border-radius: 0;
85 border-width: 0 1px 0 1px;102 border-width: 0 1px 0 1px;
86103
87 -unico-border-gradient: none;104 -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
105 from (shade (@dark_bg_color, 1.5)),
106 to (shade (@dark_bg_color, 1.05)));
88 -unico-glow-radius: 0;107 -unico-glow-radius: 0;
89 -unico-inner-stroke-width: 0;108 -unico-inner-stroke-width: 0;
90 -unico-outer-stroke-width: 0;109 -unico-outer-stroke-width: 0;
91110
=== modified file 'Radiance/gtk-3.0/apps/gnome-panel.css'
--- Radiance/gtk-3.0/apps/gnome-panel.css 2012-03-06 15:23:14 +0000
+++ Radiance/gtk-3.0/apps/gnome-panel.css 2012-03-14 14:19:38 +0000
@@ -23,6 +23,10 @@
23 color: @dark_fg_color;23 color: @dark_fg_color;
24}24}
2525
26PanelMenuBar > GtkMenuItem * {
27 color: @dark_fg_color
28}
29
26.gnome-panel-menu-bar,30.gnome-panel-menu-bar,
27PanelApplet > GtkMenuBar.menubar,31PanelApplet > GtkMenuBar.menubar,
28PanelApplet > GtkMenuBar.menubar.menuitem,32PanelApplet > GtkMenuBar.menubar.menuitem,
@@ -31,6 +35,7 @@
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)));
38 -PanelMenuBar-icon-visible: true;
34}39}
3540
36PanelAppletFrame { 41PanelAppletFrame {
@@ -41,7 +46,9 @@
41 border-width: 0;46 border-width: 0;
42}47}
4348
44PanelApplet .button {49PanelApplet .button,
50PanelApplet #showdesktop-button,
51WnckTasklist #tasklist-button {
45 -GtkButton-inner-border: 2;52 -GtkButton-inner-border: 2;
4653
47 background-image: -gtk-gradient (linear, left top, left bottom,54 background-image: -gtk-gradient (linear, left top, left bottom,
@@ -51,16 +58,22 @@
51 border-radius: 0;58 border-radius: 0;
52 border-width: 0 1px 0 1px;59 border-width: 0 1px 0 1px;
5360
54 text-shadow: none;61 text-shadow: 0 1 shade (@dark_bg_color, 1.08);
5562
56 -unico-border-gradient: none;63 -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
64 from (shade (@dark_bg_color, 1.15)),
65 to (shade (@dark_bg_color, 0.95)));
57 -unico-glow-radius: 0;66 -unico-glow-radius: 0;
58 -unico-inner-stroke-width: 0px;67 -unico-inner-stroke-width: 0px;
59 -unico-outer-stroke-width: 0px;68 -unico-outer-stroke-width: 0px;
60}69}
6170
62PanelApplet .button:prelight:active,71PanelApplet .button:prelight:active,
63PanelApplet .button:active {72PanelApplet .button:active,
73PanelApplet #showdesktop-button:prelight:active,
74PanelApplet #showdesktop-button:active,
75WnckTasklist #tasklist-button:prelight:active,
76WnckTasklist #tasklist-button:active {
64 background-image: -gtk-gradient (linear, left top, left bottom,77 background-image: -gtk-gradient (linear, left top, left bottom,
65 from (shade (@dark_bg_color, 0.7)),78 from (shade (@dark_bg_color, 0.7)),
66 to (shade (@dark_bg_color, 0.8))); 79 to (shade (@dark_bg_color, 0.8)));
@@ -68,13 +81,20 @@
68 border-radius: 0;81 border-radius: 0;
69 border-width: 0 1px 0 1px;82 border-width: 0 1px 0 1px;
7083
71 -unico-border-gradient: none;84 color: @dark_fg_color;
85 text-shadow: 0 1 shade (@dark_bg_color, 0.9);
86
87 -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
88 from (shade (@dark_bg_color, 1.15)),
89 to (shade (@dark_bg_color, 0.95)));
72 -unico-glow-radius: 0;90 -unico-glow-radius: 0;
73 -unico-inner-stroke-width: 0;91 -unico-inner-stroke-width: 0;
74 -unico-outer-stroke-width: 0;92 -unico-outer-stroke-width: 0;
75}93}
7694
77PanelApplet .button:prelight {95PanelApplet .button:prelight,
96PanelApplet #showdesktop-button:prelight,
97WnckTasklist #tasklist-button:prelight {
78 background-image: -gtk-gradient (linear, left top, left bottom,98 background-image: -gtk-gradient (linear, left top, left bottom,
79 from (shade (@dark_bg_color, 1.2)),99 from (shade (@dark_bg_color, 1.2)),
80 to (shade (@dark_bg_color, 1.0))); 100 to (shade (@dark_bg_color, 1.0)));
@@ -82,7 +102,9 @@
82 border-radius: 0;102 border-radius: 0;
83 border-width: 0 1px 0 1px;103 border-width: 0 1px 0 1px;
84104
85 -unico-border-gradient: none;105 -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
106 from (shade (@dark_bg_color, 1.15)),
107 to (shade (@dark_bg_color, 0.95)));
86 -unico-glow-radius: 0;108 -unico-glow-radius: 0;
87 -unico-inner-stroke-width: 0;109 -unico-inner-stroke-width: 0;
88 -unico-outer-stroke-width: 0;110 -unico-outer-stroke-width: 0;