Fix invisible text on window buttons (#505)

* Improve readability of gtk-color-scheme in gtkrc of gtk-2.0

* Fix invisible text on window buttons on xfce4-panel on Arc-Dark

4 files changed, 42 insertions, 7 deletions

diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc
index a0b7950..dffd215 100644
--- a/common/gtk-2.0/gtkrc
+++ b/common/gtk-2.0/gtkrc
@@ -1,4 +1,17 @@
-gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#5c616c\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#5c616c\nbg_color:#F5F6F7\ninsensitive_bg_color:#fbfcfc\ninsensitive_fg_color:#a9acb2\nnotebook_bg:#ffffff\ndark_sidebar_bg:#353945\ntooltip_bg_color:#353945\nlink_color:#5294E2\nmenu_bg:#ffffff"
+gtk-color-scheme = "base_color: #ffffff"
+gtk-color-scheme = "text_color: #5c616c"
+gtk-color-scheme = "bg_color: #f5f6f7"
+gtk-color-scheme = "fg_color: #5c616c"
+gtk-color-scheme = "tooltip_bg_color: #353945"
+gtk-color-scheme = "tooltip_fg_color: #ffffff"
+gtk-color-scheme = "selected_bg_color: #5294e2"
+gtk-color-scheme = "selected_fg_color: #ffffff"
+gtk-color-scheme = "insensitive_bg_color: #fbfcfc"
+gtk-color-scheme = "insensitive_fg_color: #a9acb2"
+gtk-color-scheme = "notebook_bg: #ffffff"
+gtk-color-scheme = "dark_sidebar_bg: #353945"
+gtk-color-scheme = "link_color: #5294e2"
+gtk-color-scheme = "menu_bg: #ffffff"
 
 gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller.
 gtk-auto-mnemonics = 1
diff --git a/common/gtk-2.0/gtkrc-dark b/common/gtk-2.0/gtkrc-dark
index 958386b..d9858e9 100644
--- a/common/gtk-2.0/gtkrc-dark
+++ b/common/gtk-2.0/gtkrc-dark
@@ -1,4 +1,17 @@
-gtk-color-scheme = "base_color:#404552\nfg_color:#D3DAE3\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#D3DAE3\nbg_color:#383C4A\ninsensitive_bg_color:#3e4350\ninsensitive_fg_color:#7c818c\nnotebook_bg:#404552\ndark_sidebar_bg:#353945\ntooltip_bg_color:#353945\nlink_color:#5294E2\nmenu_bg:#383C4A"
+gtk-color-scheme = "base_color: #404552"
+gtk-color-scheme = "text_color: #d3dae3"
+gtk-color-scheme = "bg_color: #383c4a"
+gtk-color-scheme = "fg_color: #d3dae3"
+gtk-color-scheme = "tooltip_bg_color: #353945"
+gtk-color-scheme = "tooltip_fg_color: #ffffff"
+gtk-color-scheme = "selected_bg_color: #5294e2"
+gtk-color-scheme = "selected_fg_color: #ffffff"
+gtk-color-scheme = "insensitive_bg_color: #3e4350"
+gtk-color-scheme = "insensitive_fg_color: #7c818c"
+gtk-color-scheme = "notebook_bg: #404552"
+gtk-color-scheme = "dark_sidebar_bg: #353945"
+gtk-color-scheme = "link_color: #5294e2"
+gtk-color-scheme = "menu_bg: #383c4a"
 
 gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller.
 gtk-auto-mnemonics = 1
diff --git a/common/gtk-2.0/gtkrc-darker b/common/gtk-2.0/gtkrc-darker
index c5af97b..a1a5829 100644
--- a/common/gtk-2.0/gtkrc-darker
+++ b/common/gtk-2.0/gtkrc-darker
@@ -1,4 +1,17 @@
-gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#5c616c\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#5c616c\nbg_color:#F5F6F7\ninsensitive_bg_color:#fbfcfc\ninsensitive_fg_color:#a9acb2\nnotebook_bg:#ffffff\ndark_sidebar_bg:#353945\ntooltip_bg_color:#353945\nlink_color:#5294E2\nmenu_bg:#ffffff"
+gtk-color-scheme = "base_color: #ffffff"
+gtk-color-scheme = "text_color: #5c616c"
+gtk-color-scheme = "bg_color: #f5f6f7"
+gtk-color-scheme = "fg_color: #5c616c"
+gtk-color-scheme = "tooltip_bg_color: #353945"
+gtk-color-scheme = "tooltip_fg_color: #ffffff"
+gtk-color-scheme = "selected_bg_color: #5294e2"
+gtk-color-scheme = "selected_fg_color: #ffffff"
+gtk-color-scheme = "insensitive_bg_color: #fbfcfc"
+gtk-color-scheme = "insensitive_fg_color: #a9acb2"
+gtk-color-scheme = "notebook_bg: #ffffff"
+gtk-color-scheme = "dark_sidebar_bg: #353945"
+gtk-color-scheme = "link_color: #5294e2"
+gtk-color-scheme = "menu_bg: #ffffff"
 
 gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller.
 gtk-auto-mnemonics = 1
diff --git a/common/gtk-2.0/panel.rc b/common/gtk-2.0/panel.rc
index b761e91..212c704 100644
--- a/common/gtk-2.0/panel.rc
+++ b/common/gtk-2.0/panel.rc
@@ -102,10 +102,6 @@ style "window-buttons" = "theme-panel"
   bg[PRELIGHT] = shade(0.9, @selected_bg_color)
   bg[SELECTED] = @selected_bg_color
 
-  fg[NORMAL] = shade(0.7, @base_color)
-  fg[ACTIVE] = @base_color
-  fg[PRELIGHT] = @base_color
-
   engine "murrine" {
     reliefstyle = 0
     glazestyle = 0