[gnome-themes-standard] dark menus without th eseparator glitch

[Jakub Steiner <jimmac src gnome org>]

commit cbf92e4a3b5e2630282d81f0eef9011b5a9c2a88
Author: Jakub Steiner <jimmac gmail com>
Date:   Sat Apr 9 23:33:09 2011 +0200

    dark menus without th eseparator glitch
    
    - to work around the fact we cannot get rif of the separator between menubar
      menutitem and the actual menu, we do not draw the border. Sadly that looks odd
      for light backgrounds. Having grey similar to the button is sadly the grey
      where the contrast to fg sucks most. So the lesser evil is to use a dark
      border.

 themes/Adwaita/gtk-3.0/gtk-dark.css    |    3 +++
 themes/Adwaita/gtk-3.0/gtk-widgets.css |   29 ++++++++++++++++++-----------
 themes/Adwaita/gtk-3.0/gtk.css         |    3 +++
 3 files changed, 24 insertions(+), 11 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 5399a16..fd24c52 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -7,6 +7,9 @@
 @define-color theme_selected_bg_color #f57900;
 @define-color theme_selected_fg_color #ffffff;
 
+ define-color menu_bg_color shade (@theme_bg_color, 0.4);
+ define-color menu_fg_color #ffffff;
+
 @define-color theme_tooltip_bg_color #000000;
 @define-color theme_tooltip_fg_color #eeeeee;
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index ad91ef3..2d2c9da 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -521,27 +521,28 @@ GtkComboBox.button {
 /* remove the image from the prelight areas */
 .menubar.menuitem:prelight {
     background-image: none;
-    background-color: @theme_base_color;
-    color: @theme_text_color;
+    background-color: @menu_bg_color;
+    color: @menu_fg_color;
 
     border-style: solid;
-    border-radius: 3;
-    border-width: 1;
+    border-radius: 5;
+    border-width: 0;
     border-color: @inactive_frame_color;
 }
 
 .menubar.menuitem {
-    border-width: 1;
+    border-width: 0;
     border-style: none;
+    padding: 3 5;
 }
 
 .menu {
-    padding: 2;
-
-    background-color: @theme_base_color;
+    padding: 0;
 
+    background-color: @menu_bg_color;
+    color: @menu_fg_color;
     border-style: solid;
-    border-width: 1;
+    border-width: 0;
     border-radius: 0;
     border-color: @inactive_frame_color;
 
@@ -549,8 +550,14 @@ GtkComboBox.button {
 
 }
 
+.menuitem:insensitive {
+    /* there is some weird alpha precomposing issues with this - ghosts on dark background */
+    color: mix (@menu_fg_color, @menu_bg_color, 0.8);
+}
+
 .menuitem {
     -adwaita-menuitem-arrow-color: @menu_controls_color;
+    padding: 4;
 }
 
 .menuitem.accelerator {
@@ -567,8 +574,8 @@ GtkComboBox.button {
     background-color: @theme_selected_bg_color;
     color: @theme_selected_fg_color;
     border-style: solid;
-    border-width: 1;
-    border-radius: 1;
+    border-width: 0;
+    border-radius: 0;
     border-color: darker (@theme_selected_bg_color);
 }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index c1f05ab..7a6bd1f 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -18,6 +18,9 @@
 @define-color theme_selected_bg_color @selected_bg_color;
 @define-color theme_selected_fg_color @selected_fg_color;
 
+ define-color menu_bg_color shade (@theme_bg_color, 0.45);
+ define-color menu_fg_color #ffffff;
+
 @define-color link_color #4a90d9;
 @define-color frame_color #8a9580;
 @define-color inactive_frame_color #c7ccc1;