From 5c055ae34eb460fe65adc9ce0eabeb5dd2fad2d0 Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Sat, 21 Sep 2013 00:21:55 +0530
Subject: [PATCH] Merged changes to GTK2 theme from master

---
 gtk-2.0/gtkrc | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index 570083d..b1effa9 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -1,6 +1,6 @@
 # Numix GTK Theme
 
-gtk_color_scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#333333\nfg_color:#555555\ntooltip_fg_color:#dedede\nselected_fg_color:#f9f9f9\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dcdcdc\ntoolbar_bg_color:#dedede\ntoolbar_fg_color:#555555\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dcdcdc\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#fc6f5d"
+gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#333333\nfg_color:#555555\ntooltip_fg_color:#dedede\nselected_fg_color:#f9f9f9\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dcdcdc\ntoolbar_bg_color:#dedede\ntoolbar_fg_color:#555555\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dcdcdc\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#fc6f5d"
 
 # Default Style
 
@@ -194,8 +194,8 @@ style "murrine-button"  = "murrine-wider" {
 }
 
 style "murrine-scrollbar" {
-	bg[NORMAL] = shade (0.90, @bg_color)
-	bg[PRELIGHT] = shade (0.80, @bg_color)
+	bg[NORMAL] = mix (0.21, @fg_color, @bg_color)
+	bg[PRELIGHT] = mix (0.31, @fg_color, @bg_color)
 	bg[ACTIVE] = @selected_bg_color
 
 	engine "murrine" {
@@ -423,11 +423,12 @@ style "murrine-toolbutton" = "murrine-button" {
 
 class "GtkToolbar" style "murrine-toolbar"
 class "GtkHandleBox" style "murrine-toolbar"
+widget_class "*Toolbar*.*Separator*" style "murrine-toolbar"
 
 # Panels
 
 style "murrine-panel" = "murrine-thin" {
-	xthickness = 4
+	xthickness = 2
 
 	bg[NORMAL] = @panel_bg_color
 	bg[PRELIGHT] =  mix (0.21, @panel_fg_color, @panel_bg_color)
@@ -607,8 +608,8 @@ style "chrome-gtk-frame" {
 	ChromeGtkFrame::incognito-frame-gradient-color = @menubar_bg_color
 
 	ChromeGtkFrame::scrollbar-trough-color = @bg_color
-	ChromeGtkFrame::scrollbar-slider-prelight-color = shade (0.8, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-normal-color = shade (0.9, @bg_color)
+	ChromeGtkFrame::scrollbar-slider-normal-color =  mix (0.21, @fg_color, @bg_color)
+	ChromeGtkFrame::scrollbar-slider-prelight-color =  mix (0.31, @fg_color, @bg_color)
 }
 
 class "ChromeGtkFrame" style "chrome-gtk-frame"
@@ -621,11 +622,13 @@ class "GtkWidget" style "murrine-default"
 
 class "GtkFrame" style "murrine-wide"
 class "MetaFrames" style "metacity-frame"
-class "GtkSeparator" style "murrine-wide"
 class "GtkWindow" style "metacity-frame"
+
+class "GtkSeparator" style "murrine-wide"
 class "GtkCalendar" style "murrine-wide"
 
 class "GtkSpinButton" style "murrine-spinbutton"
+
 class "GtkScale" style "murrine-scale"
 class "GtkVScale" style "murrine-vscale"
 class "GtkHScale" style "murrine-hscale"