Merge remote-tracking branch 'origin/roslyn-dark-skin' into dark-skin-gtk-experimental

1 files changed, 32 insertions, 32 deletions

diff --git a/main/src/core/MonoDevelop.Ide/gtkrc.win32 b/main/src/core/MonoDevelop.Ide/gtkrc.win32
index 920bb61149..f8e9f33d06 100644
--- a/main/src/core/MonoDevelop.Ide/gtkrc.win32
+++ b/main/src/core/MonoDevelop.Ide/gtkrc.win32
@@ -1,5 +1,5 @@
-# Windows Theme for Xamarin composed by Lanedo GmbH
-# Copyright 2012 Xamarin Inc.
+# Xamarin Studio Light Windows GTK Theme
+# Copyright 2012-2016 Xamarin Inc.
 # Authors:
 #   Christian Kellner <christian.kellner@lanedo.com>
 #   Carlos Garnacho <carlos.garnacho@lanedo.com>
@@ -12,10 +12,10 @@ gtk-color-scheme =
 "bg_color: #f5f5f5
 fg_color: #000
 base_color: #fff
-text_color: #000
+text_color: @fg_color
 link_color: #5189ed
 selected_bg_color: #cce8ff
-selected_fg_color: #000
+selected_fg_color: @fg_color
 tooltip_bg_color: #f2f2f2
 tooltip_fg_color: #222222
 tooltip_border_color: #b2b2b2"
@@ -39,29 +39,29 @@ style "default" {
 
     ### colours
 
-    bg[NORMAL]      = @bg_color
-    bg[PRELIGHT]    = @bg_color
-    bg[SELECTED]    = @selected_bg_color
+    bg[NORMAL] = @bg_color
+    bg[PRELIGHT] = @bg_color
+    bg[SELECTED] = @selected_bg_color
     bg[INSENSITIVE] = @bg_color
-    bg[ACTIVE]      = @bg_color
+    bg[ACTIVE] = @bg_color
 
-    fg[NORMAL]      = @fg_color
-    fg[PRELIGHT]    = @fg_color
-    fg[SELECTED]    = @selected_fg_color
+    fg[NORMAL] = @fg_color
+    fg[PRELIGHT] = @fg_color
+    fg[SELECTED] = @selected_fg_color
     fg[INSENSITIVE] = darker (@bg_color)
-    fg[ACTIVE]      = @fg_color
+    fg[ACTIVE] = @fg_color
 
-    text[NORMAL]      = @text_color
-    text[PRELIGHT]    = @text_color
-    text[SELECTED]    = @selected_fg_color
+    text[NORMAL] = @fg_color
+    text[PRELIGHT] = @fg_color
+    text[SELECTED] = @selected_fg_color
     text[INSENSITIVE] = darker (@bg_color)
-    text[ACTIVE]      = @text_color
+    text[ACTIVE] = @fg_color
 
-    base[NORMAL]      = @base_color
-    base[PRELIGHT]    = @selected_bg_color
-    base[SELECTED]    = @selected_bg_color
+    base[NORMAL] = @base_color
+    base[PRELIGHT] = @selected_bg_color
+    base[SELECTED] = @selected_bg_color
     base[INSENSITIVE] = @bg_color
-    base[ACTIVE]      = shade (1.3, @selected_bg_color)
+    base[ACTIVE] = shade (1.3, @selected_bg_color)
 
     ### style properties
 
@@ -69,7 +69,7 @@ style "default" {
     GtkWidget::link-color = @link_color
     GtkWidget::visited-link-color = @link_color
 
-    GtkEntry::honors-transparent-bg-hint = 1    # transparent search box background
+    GtkEntry::honors-transparent-bg-hint = 1 # transparent search box background
     GtkEntry::inner-border = { 2, 2, 2, 2 }
 
     GtkButton::child-displacement-x = 0
@@ -151,8 +151,8 @@ style "menu" = "default" {
     xthickness = 0
     ythickness = 0
 
-    fg[PRELIGHT]    = @selected_fg_color
-    text[PRELIGHT]  = @selected_fg_color
+    fg[PRELIGHT] = @selected_fg_color
+    text[PRELIGHT] = @selected_fg_color
 }
 
 style "menubar" = "default" {
@@ -173,7 +173,7 @@ style "menu-item" = "menu" {
 style "menu-separator" = "menu-item" {
     xthickness = 0
     ythickness = 2
-    
+
     engine "xamarin" {
         contrast = 1.0
     }
@@ -218,9 +218,9 @@ style "treeview" = "default"
 
 style "tree-header" = "wide"
 {
-    bg[NORMAL]   = "#f2f2f2"
+    bg[NORMAL] = "#f2f2f2"
     bg[PRELIGHT] = "#d9ebf9"
-    bg[ACTIVE]   = "#bcdcf4"
+    bg[ACTIVE] = "#bcdcf4"
 
     engine "xamarin" {
         focusstyle = 0
@@ -231,8 +231,8 @@ style "icon-view" = "default"
 {
     bg[SELECTED] = "#f5f7fa"
     base[SELECTED] = "#f5f7fa"
-    fg[SELECTED] = "#000"
-    text[SELECTED] = "#000"
+    fg[SELECTED] = @fg_color
+    text[SELECTED] = @fg_color
 }
 
 style "toolbar-combo-box" = "button"
@@ -334,10 +334,10 @@ style "scrollbar" = "default"
     GtkRange::trough-border = 0
     GtkWidget::draw-border = { 0, 0, 0, 0 }
 
-    bg[NORMAL]      = "#CDCDCD" # default slider/stepper color
+    bg[NORMAL] = "#CDCDCD" # default slider/stepper color
     bg[INSENSITIVE] = "#CDCDCD" # disabled slider/stepper color
-    bg[PRELIGHT]    = "#A6A6A6" # hover slider/stepper color
-    bg[ACTIVE]      = "#CDCDCD" # pressed stepper color
+    bg[PRELIGHT] = "#A6A6A6" # hover slider/stepper color
+    bg[ACTIVE] = "#CDCDCD" # pressed stepper color
 
     engine "xamarin"
     {
@@ -386,7 +386,7 @@ style "scale" = "default"
 
 style "link-label-fix"
 {
-	base[PRELIGHT] = @bg_color # disable link hover background
+    base[PRELIGHT] = @bg_color # disable link hover background
 }