Merge lp:~cimi/light-themes/hack-menu-color-unity into lp:~ubuntu-art-pkg/light-themes/trunk

Proposed by Andrea Cimitan on 2012-02-28
Status: Needs review
Proposed branch: lp:~cimi/light-themes/hack-menu-color-unity
Merge into: lp:~ubuntu-art-pkg/light-themes/trunk
Diff against target: 226 lines (+82/-1) (has conflicts)
2 files modified
Ambiance/gtk-3.0/gtk-widgets.css (+41/-1)
Radiance/gtk-3.0/gtk-widgets.css (+41/-0)
Text conflict in Ambiance/gtk-3.0/gtk-widgets.css
Text conflict in Radiance/gtk-3.0/gtk-widgets.css
To merge this branch: bzr merge lp:~cimi/light-themes/hack-menu-color-unity
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers 2012-02-28 Pending
Review via email: mp+94938@code.launchpad.net

Description of the change

Hack for unity bug

To post a comment you must log in.

Unmerged revisions

181. By Andrea Cimitan on 2012-01-31

Hack to get right menu colors with broken menuitems

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
2--- Ambiance/gtk-3.0/gtk-widgets.css 2012-02-28 11:00:31 +0000
3+++ Ambiance/gtk-3.0/gtk-widgets.css 2012-02-28 11:05:22 +0000
4@@ -962,6 +962,8 @@
5 -unico-inner-stroke-width: 1px 1px 0 1px;
6 }
7
8+Genericmenuitem .menu,
9+DbusmenuGtkMenu .menu,
10 .menubar .menu,
11 .primary-toolbar .menu {
12 background-color: shade (@dark_bg_color, 1.08);
13@@ -1049,6 +1051,7 @@
14 color: @fg_color;
15 }
16
17+<<<<<<< TREE
18 .menuitem {
19 border-radius: 0;
20 border-style: solid;
21@@ -1058,12 +1061,34 @@
22 -unico-inner-stroke-width: 1px;
23 }
24
25+=======
26+Genericmenuitem .menuitem *,
27+Genericmenuitem .menuitem,
28+DbusmenuGtkMenu .menuitem *,
29+DbusmenuGtkMenu .menuitem,
30+.menubar .menuitem *,
31+>>>>>>> MERGE-SOURCE
32 .menubar .menuitem,
33+.primary-toolbar .menuitem *,
34 .primary-toolbar .menuitem {
35 color: @dark_fg_color;
36 }
37
38+<<<<<<< TREE
39 .menuitem:hover {
40+=======
41+.menuitem {
42+ border-radius: 0;
43+ border-style: solid;
44+ border-width: 1;
45+ padding: 2;
46+
47+ -unico-inner-stroke-width: 1;
48+}
49+
50+.menuitem:hover,
51+.menuitem *:hover {
52+>>>>>>> MERGE-SOURCE
53 background-image: -gtk-gradient (linear, left top, left bottom,
54 from (shade (@selected_bg_color, 1.1)),
55 to (shade (@selected_bg_color, 0.9)));
56@@ -1089,13 +1114,16 @@
57 -unico-bullet-color: @fg_color;
58 }
59
60-
61 .menuitem:insensitive,
62 .menuitem *:insensitive {
63 color: mix (@fg_color, @bg_color, 0.5);
64 text-shadow: 0 1 shade (@bg_color, 1.14);
65 }
66
67+Genericmenuitem .menuitem:insensitive,
68+Genericmenuitem .menuitem *:insensitive,
69+DbusmenuGtkMenu .menuitem:insensitive,
70+DbusmenuGtkMenu .menuitem *:insensitive,
71 .menubar .menuitem:insensitive,
72 .menubar .menuitem *:insensitive,
73 .primary-toolbar .menuitem:insensitive,
74@@ -1104,6 +1132,10 @@
75 text-shadow: 0 -1 shade (@dark_bg_color, 0.6);
76 }
77
78+Genericmenuitem .menuitem.check:active,
79+Genericmenuitem .menuitem.radio:active,
80+DbusmenuGtkMenu .menuitem.check:active,
81+DbusmenuGtkMenu .menuitem.radio:active,
82 .menubar .menuitem.check:active,
83 .menubar .menuitem.radio:active,
84 .primary-toolbar .menuitem.check:active,
85@@ -1169,16 +1201,22 @@
86 to (shade (@dark_bg_color, 1.15)));
87 }
88
89+Genericmenuitem .menuitem .accelerator,
90+DbusmenuGtkMenu .menuitem .accelerator,
91 .menubar .menuitem .accelerator,
92 .primary-toolbar .menuitem .accelerator {
93 color: alpha (@dark_fg_color, 0.5);
94 }
95
96+Genericmenuitem .menuitem .accelerator:hover,
97+DbusmenuGtkMenu .menuitem .accelerator:hover,
98 .menubar .menuitem .accelerator:hover,
99 .primary-toolbar .menuitem .accelerator:hover {
100 color: alpha (@selected_fg_color, 0.8);
101 }
102
103+Genericmenuitem .menuitem .accelerator:insensitive,
104+DbusmenuGtkMenu .menuitem .accelerator:insensitive,
105 .menubar .menuitem .accelerator:insensitive,
106 .primary-toolbar .menuitem .accelerator:insensitive {
107 color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);
108@@ -1591,6 +1629,8 @@
109 -GtkWidget-separator-height: 4;
110 }
111
112+Genericmenuitem .menuitem.separator,
113+DbusmenuGtkMenu .menuitem.separator,
114 .menubar .menuitem.separator,
115 .primary-toolbar .menuitem.separator {
116 border-color: shade (@dark_bg_color, 0.96);
117
118=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
119--- Radiance/gtk-3.0/gtk-widgets.css 2012-02-28 11:00:31 +0000
120+++ Radiance/gtk-3.0/gtk-widgets.css 2012-02-28 11:05:22 +0000
121@@ -962,6 +962,8 @@
122 -unico-inner-stroke-width: 1px 1px 0 1px;
123 }
124
125+Genericmenuitem .menu,
126+DbusmenuGtkMenu .menu,
127 .menubar .menu,
128 .primary-toolbar .menu {
129 background-color: shade (@dark_bg_color, 1.08);
130@@ -1051,6 +1053,7 @@
131 color: @fg_color;
132 }
133
134+<<<<<<< TREE
135 .menuitem {
136 border-radius: 0;
137 border-style: solid;
138@@ -1060,12 +1063,34 @@
139 -unico-inner-stroke-width: 1px;
140 }
141
142+=======
143+Genericmenuitem .menuitem *,
144+Genericmenuitem .menuitem,
145+DbusmenuGtkMenu .menuitem *,
146+DbusmenuGtkMenu .menuitem,
147+.menubar .menuitem *,
148+>>>>>>> MERGE-SOURCE
149 .menubar .menuitem,
150+.primary-toolbar .menuitem *,
151 .primary-toolbar .menuitem {
152 color: @dark_fg_color;
153 }
154
155+<<<<<<< TREE
156 .menuitem:hover {
157+=======
158+.menuitem {
159+ border-radius: 0;
160+ border-style: solid;
161+ border-width: 1;
162+ padding: 2;
163+
164+ -unico-inner-stroke-width: 1;
165+}
166+
167+.menuitem:hover,
168+.menuitem *:hover {
169+>>>>>>> MERGE-SOURCE
170 background-image: -gtk-gradient (linear, left top, left bottom,
171 from (shade (@selected_bg_color, 1.1)),
172 to (shade (@selected_bg_color, 0.9)));
173@@ -1115,6 +1140,10 @@
174 text-shadow: 0 1 shade (@bg_color, 1.14);
175 }
176
177+Genericmenuitem .menuitem:insensitive,
178+Genericmenuitem .menuitem *:insensitive,
179+DbusmenuGtkMenu .menuitem:insensitive,
180+DbusmenuGtkMenu .menuitem *:insensitive,
181 .menubar .menuitem:insensitive,
182 .menubar .menuitem *:insensitive,
183 .primary-toolbar .menuitem:insensitive,
184@@ -1139,6 +1168,10 @@
185 -unico-bullet-color: @selected_fg_color;
186 }
187
188+Genericmenuitem .menuitem.check:active,
189+Genericmenuitem .menuitem.radio:active,
190+DbusmenuGtkMenu .menuitem.check:active,
191+DbusmenuGtkMenu .menuitem.radio:active,
192 .menubar .menuitem GtkCalendar,
193 .menubar .menuitem GtkCalendar.button,
194 .menubar .menuitem GtkCalendar.header,
195@@ -1188,16 +1221,22 @@
196 to (shade (@dark_bg_color, 1.15)));
197 }
198
199+Genericmenuitem .menuitem .accelerator,
200+DbusmenuGtkMenu .menuitem .accelerator,
201 .menubar .menuitem .accelerator,
202 .primary-toolbar .menuitem .accelerator {
203 color: alpha (@dark_fg_color, 0.6);
204 }
205
206+Genericmenuitem .menuitem .accelerator:hover,
207+DbusmenuGtkMenu .menuitem .accelerator:hover,
208 .menubar .menuitem .accelerator:hover,
209 .primary-toolbar .menuitem .accelerator:hover {
210 color: alpha (@selected_fg_color, 0.8);
211 }
212
213+Genericmenuitem .menuitem .accelerator:insensitive,
214+DbusmenuGtkMenu .menuitem .accelerator:insensitive,
215 .menubar .menuitem .accelerator:insensitive,
216 .primary-toolbar .menuitem .accelerator:insensitive {
217 color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.6);
218@@ -1608,6 +1647,8 @@
219 -GtkWidget-separator-height: 4;
220 }
221
222+Genericmenuitem .menuitem.separator,
223+DbusmenuGtkMenu .menuitem.separator,
224 .menubar .menuitem.separator,
225 .primary-toolbar .menuitem.separator {
226 border-color: shade (@dark_bg_color, 0.96);

Subscribers

People subscribed via source and target branches