Merge lp:~vanvugt/ubuntu-themes/fix-1725921 into lp:ubuntu-themes

[Daniel van Vugt]

Remove an old workaround which would force combobox menu text
to be dark. Starting in r583 the combobox menu background also
changed to dark, so forcing the text to dark made it almost the
same colour as the background. (LP: #1725921)

[Marco Trevisan (Treviño) (3v1n0)]

Looks good, thanks.

Can you also prepare a MP tracking X for backporting to xenial?

review: Approve

[Daniel van Vugt (vanvugt)]

Yes, certainly I will do xenial. But correct process is to make sure bionic is done first.

=== modified file 'Ambiance/gtk-2.0/gtkrc'
--- Ambiance/gtk-2.0/gtkrc	2017-10-06 07:50:10 +0000
+++ Ambiance/gtk-2.0/gtkrc	2018-03-02 06:55:31 +0000
@@ -571,15 +571,6 @@
 	text[INSENSITIVE] = darker (@bg_color)
 }
 
-# Workaround style for menus where the text color is used instead of the fg color.
-style "menuitem_text_is_fg_color_workaround" {
-	text[NORMAL]        = @fg_color
-	text[PRELIGHT]      = @selected_fg_color
-	text[SELECTED]      = @selected_fg_color
-	text[ACTIVE]        = @fg_color
-	text[INSENSITIVE]   = "#99958b"
-}
-
 # Workaround style for places where the fg color is used instead of the text color.
 style "fg_is_text_color_workaround" {
 	fg[NORMAL]        = @text_color
@@ -707,8 +698,6 @@
 # Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
 # Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
 widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
-# This is the part of the workaround that fixes the menus
-widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
 
 # Work around the usage of GtkLabel inside GtkListItems to display text.
 # This breaks because the label is shown on a background that is based on the base color.