[gnome-themes-standard] menus: make sure menubar style doesn't override real menuitems

[Cosimo Cecchi <cosimoc src gnome org>]

commit ecc340846701f4b46c2f9441175b80c2df5459bd
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jan 16 18:32:31 2012 -0500

    menus: make sure menubar style doesn't override real menuitems
    
    Since we now in GTK propagate the style from the triggering element to
    the generated menu, we have to make sure .menubar .menuitem { }
    selectors don't override the actual menuitem style.

 themes/Adwaita/gtk-3.0/gtk-widgets.css |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 9ebdd9e..741184c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1366,29 +1366,29 @@ GtkTreeMenu .menuitem * {
     color: @menu_fg_color;
 }
 
-.menuitem {
+.menu .menuitem {
     -GtkMenuItem-arrow-scaling: 0.4;
     padding: 4;
 }
 
-.menuitem.arrow {
-    color: @menu_controls_color;
+.menu .menuitem:hover {
+    border-radius: 0;
 }
 
-.menuitem:active,
-.menuitem *:active,
-.menuitem:hover,
-.menuitem *:hover {
+.menu .menuitem:active,
+.menu .menuitem *:active,
+.menu .menuitem:hover,
+.menu .menuitem *:hover {
     background-color: @theme_selected_bg_color;
     color: @theme_selected_fg_color;
 }
 
-.menuitem:insensitive,
-.menuitem *:insensitive {
+.menu .menuitem:insensitive,
+.menu .menuitem *:insensitive {
     color: mix (@menu_fg_color, @menu_bg_color, 0.6);
 }
 
-.menuitem .accelerator:insensitive {
+.menu .menuitem .accelerator:insensitive {
     color: mix (@menu_fg_color, @menu_bg_color, 0.7);
 }
 
@@ -1401,6 +1401,10 @@ GtkTreeMenu .menuitem * {
     color: alpha (@menu_fg_color, 0.3);
 }
 
+.menuitem.arrow {
+    color: @menu_controls_color;
+}
+
 .menuitem.separator {
     color: @menu_separator;