From fdcaf4c04644d94382029763f8decd0a51d9a787 Mon Sep 17 00:00:00 2001
From: Horst3180 <horst3180@users.noreply.github.com>
Date: Tue, 15 Sep 2015 16:31:10 +0200
Subject: [PATCH] fix atom menubar and libreoffice menuitems

---
 common/gtk-2.0/main.rc                                 | 3 +++
 common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc | 2 ++
 common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc      | 4 +++-
 common/gtk-3.0/3.16/gtk-contained-dark.css             | 2 +-
 common/gtk-3.0/3.16/gtk-contained-darker.css           | 2 +-
 common/gtk-3.0/3.16/gtk-contained-solid-dark.css       | 2 +-
 common/gtk-3.0/3.16/gtk-contained-solid-darker.css     | 2 +-
 common/gtk-3.0/3.16/gtk-contained-solid.css            | 2 +-
 common/gtk-3.0/3.16/gtk-contained.css                  | 2 +-
 9 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/common/gtk-2.0/main.rc b/common/gtk-2.0/main.rc
index 85116e6..665be9b 100644
--- a/common/gtk-2.0/main.rc
+++ b/common/gtk-2.0/main.rc
@@ -719,6 +719,9 @@ style "menu_item"
   # See https://bugs.freedesktop.org/show_bug.cgi?id=38038
   bg[SELECTED] = @selected_fg_color
 
+	fg[NORMAL] = @fg_color
+	fg[SELECTED] = @fg_color
+
   text[PRELIGHT] = @fg_color
 
   engine "pixmap" {
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
index 66c77b5..4d4834c 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
@@ -2,6 +2,8 @@ style "menubar" {
 
   bg[NORMAL] = "#2f343f"
   fg[NORMAL] = "#afb8c5"
+  fg[PRELIGHT] = "#afb8c5"
+  fg[ACTIVE] = "#afb8c5"
   fg[SELECTED] = @selected_fg_color
   fg[INSENSITIVE] = shade(0.7, "#afb8c5")
 
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
index 96df39c..f072850 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
@@ -2,7 +2,9 @@ style "menubar" {
 
   bg[NORMAL] = "#e7e8eb"
   fg[NORMAL] = "#70788d"
-  fg[SELECTED] = @fg_color
+  fg[PRELIGHT] = "#70788d"
+  fg[ACTIVE] = "#70788d"
+  fg[SELECTED] = @selected_fg_color
   fg[INSENSITIVE] = shade(1.3, "#70788d")
 
   xthickness = 0
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index f9f1f7f..56056ca 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -3294,7 +3294,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 074a139..306b6ba 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -3297,7 +3297,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index ecaf9ae..799f196 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -3294,7 +3294,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index 38bbe40..5fc94d4 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -3297,7 +3297,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 354b165..1b44d4b 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -3297,7 +3297,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 9684134..5be879f 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -3297,7 +3297,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {