Merge lp:~markellmtthw/egtk/update-gtk2-colors into lp:egtk/1.0

[Matthew Markell]

I have changed all of the GTK2 dark colors to light and changed the selection blue to match GTK3's.

GTK2 is now much more consistent to GTK3

NEEDS TESTING

[Matthew Markell (markellmtthw)]

Don't merge this just yet, I found a few minor niggles that I want to work out first.

[lp:~markellmtthw/egtk/update-gtk2-colors]

375. By Matthew Markell on 2012-01-17

Mostly fixed all remaining problems. There is a black border around MenuItems that needs to be removed but I don't know how to change that

[Matthew Markell (markellmtthw)]

Ready for testing folks :D

=== modified file 'gtk-2.0/gtkrc'
--- gtk-2.0/gtkrc	2011-10-10 12:08:02 +0000
+++ gtk-2.0/gtkrc	2012-01-17 16:05:30 +0000
@@ -7,13 +7,14 @@
 #
 # See the file COPYING for the full license text.
 
-gtk_color_scheme	= "bg_color:#DEDEDE\nselected_bg_color:#A9C3D9\nbase_color:#FFF"	# Background, base
+gtk_color_scheme	= "bg_color:#DEDEDE\nselected_bg_color:#4a90d9\nbase_color:#FFF"	# Background, base
 gtk_color_scheme	= "fg_color:#4D4D4D\nselected_fg_color:#FFF\ntext_color:#4D4D4D"	# Foreground, text
 gtk_color_scheme 	= "sidebar_color:#DEDEDE"                                           # Custom colors
 gtk_color_scheme	= "tooltip_bg_color:#000\ntooltip_fg_color:#FFF"                    # Tooltips
 gtk_color_scheme	= "link_color:#08C"                                                 # Hyperlinks
 gtk_color_scheme	= "frame_color:#D1D1D1\ninactive_frame_color:#D1D1D1"               # Fix for Chrome
-gtk_color_scheme	= "bg_color_dark:#383838\ntext_color_dark:#FFF"                     # Dark colors
+gtk_color_scheme	= "bg_color_dark:#F0F0F0\ntext_color_dark:#4d4d4d\ntext_color_dark_selected:#FFF"                     # Dark colors - NO MORE DARKS
+
 
 gtk-icon-sizes		= "gtk-button=16,16"				                                # Set icon size for buttons
 gtk-button-images	= 0									                                # Disables icons for buttons with text
@@ -150,20 +151,20 @@
 
 	bg[NORMAL]          = @bg_color_dark
 	bg[PRELIGHT]        = shade (1.02, @bg_color_dark)
-	bg[SELECTED]        = shade (0.90, @selected_bg_color)
+	bg[SELECTED]        = shade (1.1, @selected_bg_color)
 	bg[INSENSITIVE]     = @bg_color_dark
 	bg[ACTIVE]          = shade (1.04, @bg_color_dark)
 
 	fg[NORMAL]          = @text_color_dark
-	fg[PRELIGHT]        = @text_color_dark
-	fg[SELECTED]        = @text_color_dark
-	fg[ACTIVE]          = @text_color_dark
+	fg[PRELIGHT]        = @text_color_dark_selected
+	fg[SELECTED]        = @text_color_dark_selected
+	fg[ACTIVE]          = @text_color_dark_selected
 	fg[INSENSITIVE]     = darker (@bg_color)
 
 	text[NORMAL]        = @text_color_dark
-	text[PRELIGHT]      = @text_color_dark
-	text[ACTIVE]        = @text_color_dark
-	text[SELECTED]      = @text_color_dark
+	text[PRELIGHT]      = @text_color_dark_selected
+	text[ACTIVE]        = @text_color_dark_selected
+	text[SELECTED]      = @text_color_dark_selected
 	text[INSENSITIVE]   = darker (@bg_color_dark)
 }
 
@@ -183,7 +184,7 @@
 
 	bg[ACTIVE]                  = shade (0.80, @bg_color)
 	bg[NORMAL]                  = shade (1.15, @bg_color)
-	bg[PRELIGHT]				= shade (1.13, @selected_bg_color)
+	bg[PRELIGHT]				= shade (1.13, @bg_color)
 	bg[SELECTED]				= shade (0.75, @selected_bg_color)
 	bg[INSENSITIVE]				= shade (0.98, @bg_color)
 	
@@ -271,13 +272,14 @@
 	fg[ACTIVE]                  = @fg_color
 	fg[INSENSITIVE]				= darker (@bg_color)
 
-	bg[SELECTED]				= shade (0.90, @selected_bg_color)
+	bg[SELECTED]				= shade (1.30, @selected_bg_color)
 
 	engine "murrine"
 	{
 		contrast                = 0.8
 		roundness               = 0
 		lightborderstyle		= 1
+
 	}
 }