light-themes

Merge lp:~cimi/light-themes/firefox-radiance-menubaritem-fix into lp:~ubuntu-art-pkg/light-themes/trunk

  1. firefox-radiance-menubaritem-fix
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Merged at revision: 52
Proposed branch: lp:~cimi/light-themes/firefox-radiance-menubaritem-fix
Merge into: lp:~ubuntu-art-pkg/light-themes/trunk
Diff against target: 51 lines (+13/-2)
3 files modified
Ambiance/gtk-2.0/gtkrc (+1/-1)
Radiance/gtk-2.0/gtkrc (+5/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~cimi/light-themes/firefox-radiance-menubaritem-fix
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+37603@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-2.0/gtkrc'
2--- Ambiance/gtk-2.0/gtkrc 2010-09-27 15:18:59 +0000
3+++ Ambiance/gtk-2.0/gtkrc 2010-10-05 14:06:11 +0000
4@@ -41,7 +41,7 @@
5 GtkToolbar::shadow-type = GTK_SHADOW_NONE
6 GtkTreeView::expander-size = 7
7 GtkTreeView::vertical-separator = 0
8- GtkTreeView::odd-row-color = shade (0.96, @base_color)
9+# GtkTreeView::odd-row-color = shade (0.96, @base_color)
10 GtkNotebook::tab-overlap = -1
11
12 GtkMenu::horizontal-padding = 0
13
14=== modified file 'Radiance/gtk-2.0/gtkrc'
15--- Radiance/gtk-2.0/gtkrc 2010-09-27 15:18:59 +0000
16+++ Radiance/gtk-2.0/gtkrc 2010-10-05 14:06:11 +0000
17@@ -41,7 +41,7 @@
18 GtkToolbar::shadow-type = GTK_SHADOW_NONE
19 GtkTreeView::expander-size = 7
20 GtkTreeView::vertical-separator = 0
21- GtkTreeView::odd-row-color = shade (0.96, @base_color)
22+# GtkTreeView::odd-row-color = shade (0.96, @base_color)
23 GtkNotebook::tab-overlap = -1
24
25 GtkMenu::horizontal-padding = 0
26@@ -286,6 +286,10 @@
27 }
28
29 style "menubar" = "dark" {
30+ # those two lines were added to fix firefox's menubar item text
31+ bg[SELECTED] = "#ece7e2"
32+ fg[SELECTED] = @fg_color
33+
34 engine "murrine" {
35 textstyle = 1
36 text_shade = 1.23
37
38=== modified file 'debian/changelog'
39--- debian/changelog 2010-09-27 14:46:35 +0000
40+++ debian/changelog 2010-10-05 14:06:11 +0000
41@@ -1,3 +1,10 @@
42+light-themes (0.1.8.2) maverick; urgency=low
43+
44+ * Removes a warning due to the usage of symbolic colors for odd-row-color
45+ * Workaround for firefox's menubar item text in Radiance
46+
47+ -- Andrea Cimitan <andrea.cimitan@gmail.com> Tue, 05 Oct 2010 15:40:26 +0200
48+
49 light-themes (0.1.8.1) maverick; urgency=low
50
51 * helps making disabled menu items more readable (LP: #617192)