[gnome-themes-standard] menu rewrite

[Lapo Calamandrei <lapo src gnome org>]

commit e3c5b702f68e92677bcc1719cc91bef70ecad567
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Tue Jun 10 17:06:19 2014 +0200

    menu rewrite

 themes/Adwaita/gtk-3.0/_common.scss           |   35 ++++++++---------
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   51 ++++++++++++-------------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   51 ++++++++++++-------------
 3 files changed, 66 insertions(+), 71 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 75e5ad7..7b5ded2 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -658,45 +658,42 @@ column-header { // FIXME: something better
  * Menus *
  *********/
 .menubar {
-  padding: 2px;
-  .menuitem {  // menubar only
-    background-color: $bg_color;
+  padding: 0px;
+  background-color: mix($fg_color,$bg_color,5%); //Uhm?
+  &:backdrop { background-color: $backdrop_bg_color; }
+  & > .menuitem {
     padding: 4px 8px;
-    border-radius: 0;
-    &:hover, &:active {
-      border-width: 0 0 3px;
-      border-style: solid;
-      border-color: $selected_bg_color;
+    &:hover { //Seems like it :hover even with keyboard focus
+      box-shadow: inset 0 -3px $selected_bg_color;
+      color: $selected_bg_color;
     }
     &:insensitive {
       color: $insensitive_fg_color;
+      box-shadow: none;
     }
   }
 }
 
 .menu {
-  .menuitem {  // menubar only
-    background-color: $base_color;
+  padding: 0px;
+  background-color: $base_color;
+  border: 1px solid $borders_color;
+  .menuitem {
     padding: 4px;
-    border-radius: 0;
     &:hover {
-      border: none;
       color: $selected_fg_color;
       background-color: $selected_bg_color;
     }
-    &:active {
-      border: none;
-      color: $selected_fg_color;
-      background-color: if($variant=='light', darken($selected_bg_color, 10%), darken($selected_bg_color, 
5%));
+    &:backdrop, &:backdrop:hover {
+      color: $backdrop_fg_color;
+      background-color: $backdrop_base_color;
     }
     &.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); } // submenu indicators
   }
-  .separator { 
-    color: transparentize($borders_color,0.8);
-  }
 }
 
 
+
 /***************
  * Popovers   *
  ***************/
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index e8a5022..afd1642 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -726,34 +726,33 @@ column-header .button:backdrop {
  * Menus *
  *********/
 .menubar {
-  padding: 2px; }
-  .menubar .menuitem {
-    background-color: #393f3f;
-    padding: 4px 8px;
-    border-radius: 0; }
-    .menubar .menuitem:hover, .menubar .menuitem:active {
-      border-width: 0 0 3px;
-      border-style: solid;
-      border-color: #215d9c; }
-    .menubar .menuitem:insensitive {
-      color: #939695; }
+  padding: 0px;
+  background-color: #424747; }
+  .menubar:backdrop {
+    background-color: #393f3f; }
+  .menubar > .menuitem {
+    padding: 4px 8px; }
+    .menubar > .menuitem:hover {
+      box-shadow: inset 0 -3px #215d9c;
+      color: #215d9c; }
+    .menubar > .menuitem:insensitive {
+      color: #939695;
+      box-shadow: none; }
 
-.menu .menuitem {
+.menu {
+  padding: 0px;
   background-color: #333333;
-  padding: 4px;
-  border-radius: 0; }
-  .menu .menuitem:hover {
-    border: none;
-    color: white;
-    background-color: #215d9c; }
-  .menu .menuitem:active {
-    border: none;
-    color: white;
-    background-color: #1c5187; }
-  .menu .menuitem.arrow {
-    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
-.menu .separator {
-  color: rgba(28, 31, 31, 0.2); }
+  border: 1px solid #1c1f1f; }
+  .menu .menuitem {
+    padding: 4px; }
+    .menu .menuitem:hover {
+      color: white;
+      background-color: #215d9c; }
+    .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
+      color: #c9cbc9;
+      background-color: #262626; }
+    .menu .menuitem.arrow {
+      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
 
 /***************
  * Popovers   *
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index b3538eb..de59b58 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -726,34 +726,33 @@ column-header .button:backdrop {
  * Menus *
  *********/
 .menubar {
-  padding: 2px; }
-  .menubar .menuitem {
-    background-color: #ededed;
-    padding: 4px 8px;
-    border-radius: 0; }
-    .menubar .menuitem:hover, .menubar .menuitem:active {
-      border-width: 0 0 3px;
-      border-style: solid;
-      border-color: #4a90d9; }
-    .menubar .menuitem:insensitive {
-      color: #8d9091; }
+  padding: 0px;
+  background-color: #e3e3e3; }
+  .menubar:backdrop {
+    background-color: #ededed; }
+  .menubar > .menuitem {
+    padding: 4px 8px; }
+    .menubar > .menuitem:hover {
+      box-shadow: inset 0 -3px #4a90d9;
+      color: #4a90d9; }
+    .menubar > .menuitem:insensitive {
+      color: #8d9091;
+      box-shadow: none; }
 
-.menu .menuitem {
+.menu {
+  padding: 0px;
   background-color: white;
-  padding: 4px;
-  border-radius: 0; }
-  .menu .menuitem:hover {
-    border: none;
-    color: white;
-    background-color: #4a90d9; }
-  .menu .menuitem:active {
-    border: none;
-    color: white;
-    background-color: #2a76c6; }
-  .menu .menuitem.arrow {
-    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
-.menu .separator {
-  color: rgba(161, 161, 161, 0.2); }
+  border: 1px solid #a1a1a1; }
+  .menu .menuitem {
+    padding: 4px; }
+    .menu .menuitem:hover {
+      color: white;
+      background-color: #4a90d9; }
+    .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
+      color: #54595a;
+      background-color: #fcfcfc; }
+    .menu .menuitem.arrow {
+      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
 
 /***************
  * Popovers   *