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
=== modified file 'Ambiance/gtk-2.0/gtkrc'
--- Ambiance/gtk-2.0/gtkrc 2010-09-27 15:18:59 +0000
+++ Ambiance/gtk-2.0/gtkrc 2010-10-05 14:06:11 +0000
@@ -41,7 +41,7 @@
41 GtkToolbar::shadow-type = GTK_SHADOW_NONE41 GtkToolbar::shadow-type = GTK_SHADOW_NONE
42 GtkTreeView::expander-size = 742 GtkTreeView::expander-size = 7
43 GtkTreeView::vertical-separator = 043 GtkTreeView::vertical-separator = 0
44 GtkTreeView::odd-row-color = shade (0.96, @base_color)44# GtkTreeView::odd-row-color = shade (0.96, @base_color)
45 GtkNotebook::tab-overlap = -145 GtkNotebook::tab-overlap = -1
4646
47 GtkMenu::horizontal-padding = 047 GtkMenu::horizontal-padding = 0
4848
=== modified file 'Radiance/gtk-2.0/gtkrc'
--- Radiance/gtk-2.0/gtkrc 2010-09-27 15:18:59 +0000
+++ Radiance/gtk-2.0/gtkrc 2010-10-05 14:06:11 +0000
@@ -41,7 +41,7 @@
41 GtkToolbar::shadow-type = GTK_SHADOW_NONE41 GtkToolbar::shadow-type = GTK_SHADOW_NONE
42 GtkTreeView::expander-size = 742 GtkTreeView::expander-size = 7
43 GtkTreeView::vertical-separator = 043 GtkTreeView::vertical-separator = 0
44 GtkTreeView::odd-row-color = shade (0.96, @base_color)44# GtkTreeView::odd-row-color = shade (0.96, @base_color)
45 GtkNotebook::tab-overlap = -145 GtkNotebook::tab-overlap = -1
4646
47 GtkMenu::horizontal-padding = 047 GtkMenu::horizontal-padding = 0
@@ -286,6 +286,10 @@
286}286}
287287
288style "menubar" = "dark" {288style "menubar" = "dark" {
289 # those two lines were added to fix firefox's menubar item text
290 bg[SELECTED] = "#ece7e2"
291 fg[SELECTED] = @fg_color
292
289 engine "murrine" {293 engine "murrine" {
290 textstyle = 1294 textstyle = 1
291 text_shade = 1.23295 text_shade = 1.23
292296
=== modified file 'debian/changelog'
--- debian/changelog 2010-09-27 14:46:35 +0000
+++ debian/changelog 2010-10-05 14:06:11 +0000
@@ -1,3 +1,10 @@
1light-themes (0.1.8.2) maverick; urgency=low
2
3 * Removes a warning due to the usage of symbolic colors for odd-row-color
4 * Workaround for firefox's menubar item text in Radiance
5
6 -- Andrea Cimitan <andrea.cimitan@gmail.com> Tue, 05 Oct 2010 15:40:26 +0200
7
1light-themes (0.1.8.1) maverick; urgency=low8light-themes (0.1.8.1) maverick; urgency=low
29
3 * helps making disabled menu items more readable (LP: #617192)10 * helps making disabled menu items more readable (LP: #617192)