[gnome-themes-standard/wip/jimmac/updated-gtk2: 40/106] Cleaned up menubar a bit.

[Jakub Steiner <jimmac src gnome org>]

commit 600f69c87b03d1f6f94d8fefbc85da84b5052e94
Author: Juraj Fiala <doctorjellyface riseup net>
Date:   Sun Jan 24 15:13:41 2016 +0100

    Cleaned up menubar a bit.

 .../gtk-2.0/Menu-Menubar/menubar-button.png        |  Bin 154 -> 0 bytes
 themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png    |  Bin 140 -> 0 bytes
 themes/Adwaita/gtk-2.0/main.rc                     |   18 ++++++------------
 3 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc
index 856e398..748b402 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -689,7 +689,7 @@ style "menubar" {
     image {
       function = BOX
       state    = NORMAL
-      file     = "Menu-Menubar/menubar.png"
+      file     = "assets/line.png"
       border   = {0, 0, 0, 1}
       stretch  = TRUE
     }
@@ -697,17 +697,18 @@ style "menubar" {
 
 }
 
-style "menubar_button" {
+style "menubar_item" {
 
   xthickness = 3
   ythickness = 4
 
+  fg[PRELIGHT] = shade(0.9, @selected_bg_color)
+
   engine "pixmap" {
     image {
       function    = BOX
-      recolorable = TRUE
       state       = PRELIGHT
-      file        = "Menu-Menubar/menubar-button.png"
+      file        = "assets/menubar-item-active.png"
       border      = {0, 0, 0, 3}
       stretch     = TRUE
     }
@@ -715,12 +716,6 @@ style "menubar_button" {
 
 }
 
-style "menubar_item" {
-  xthickness   = 2
-  ythickness   = 3
-  fg[PRELIGHT] = shade(0.9, @selected_bg_color)
-}
-
 style "menu" {
 
   xthickness = 0
@@ -2230,9 +2225,8 @@ class "GtkToolbar"           style "toolbar"
 widget_class "*<GtkMenu>*"                                       style "menu"
 widget_class "*<GtkMenu>*"                                       style "menu_framed_box"
 widget_class "*<GtkMenuItem>*"                                   style "menu_item"
-widget_class "*<GtkMenuBar>.<GtkMenuItem>*"                      style "menubar_item"
 widget_class "*<GtkMenuBar>"                                     style "menubar"
-widget_class "*<GtkMenuBar>*"                                    style "menubar_button"
+widget_class "*<GtkMenuBar>.<GtkMenuItem>*"                      style "menubar_item"
 widget_class "*<GtkCheckButton>*"                                style "checkbutton"
 widget_class "*<GtkComboBox>"                                    style "combobox"
 widget_class "*<GtkComboBox>*<GtkButton>"                        style "combobox_button"