From 5db8d234d12711f9f3dfb3e612af14e012a95aae Mon Sep 17 00:00:00 2001
From: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date: Wed, 21 Oct 2015 17:27:09 +0200
Subject: Gtk+-3.18 submarine themes: fix menu items in dropdown menus of
 GtkComboBox

---
 desktop-themes/Blue-Submarine/gtk-3.0/menu.css  | 28 +++++++++++++++++++------
 desktop-themes/Green-Submarine/gtk-3.0/menu.css | 28 +++++++++++++++++++------
 2 files changed, 44 insertions(+), 12 deletions(-)

(limited to 'desktop-themes')

diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/menu.css b/desktop-themes/Blue-Submarine/gtk-3.0/menu.css
index 35c67f45..21ea28c9 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/menu.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/menu.css
@@ -162,16 +162,32 @@ GtkTreeMenu .menuitem {
     border-width: 0px;
 }
 
-/* Workaround for lp:949368 */
-.toolbar GtkComboBox .menuitem *, 
-GtkComboBox .menuitem * {
-    transition: all 300ms ease-out;
+.toolbar GtkComboBox .menuitem,
+GtkComboBox .menuitem {
+    transition: all 500ms ease-out;
     color: @menu_fg_dark_color;
     text-shadow: 0px 1px @menu_shadow_dark_color;
 }
 
-GtkComboBox .menuitem:hover * {
-    background-color: shade (@theme_bg_dark_color, 1.2);
+/* needed for .menuitem with gtk+-3.18 */
+GtkTreeMenu.menu .menuitem GtkCellView {
+    background-image: none;
+    background-color: transparent;
+    color: @menu_fg_dark_color;
+    text-shadow: 0px 1px @menu_shadow_dark_color;
+}
+
+GtkTreeMenu.menu .menuitem:hover,
+GtkComboBox .menuitem:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    color: shade (@theme_selected_bg_color, 1.6);
+    text-shadow: 0px 1px @theme_selected_shadow_color;
+}
+
+GtkTreeMenu.menu .menuitem:hover GtkCellView {
     color: shade (@theme_selected_bg_color, 1.6);
     text-shadow: 0px 1px @theme_selected_shadow_color;
 }
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/menu.css b/desktop-themes/Green-Submarine/gtk-3.0/menu.css
index 5f3daa44..57946bb9 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/menu.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/menu.css
@@ -159,16 +159,32 @@ GtkTreeMenu .menuitem {
     border-width: 0px;
 }
 
-/* Workaround for lp:949368 */
-.toolbar GtkComboBox .menuitem *, 
-GtkComboBox .menuitem * {
-    transition: all 300ms ease-out;
+.toolbar GtkComboBox .menuitem,
+GtkComboBox .menuitem {
+    transition: all 500ms ease-out;
     color: @menu_fg_dark_color;
     text-shadow: 0px 1px @menu_shadow_dark_color;
 }
 
-GtkComboBox .menuitem:hover * {
-    background-color: shade (@theme_bg_dark_color, 1.2);
+/* needed for .menuitem with gtk+-3.18 */
+GtkTreeMenu.menu .menuitem GtkCellView {
+    background-image: none;
+    background-color: transparent;
+    color: @menu_fg_dark_color;
+    text-shadow: 0px 1px @menu_shadow_dark_color;
+}
+
+GtkTreeMenu.menu .menuitem:hover,
+GtkComboBox .menuitem:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    color: shade (@theme_selected_bg_color, 1.6);
+    text-shadow: 0px 1px @theme_selected_shadow_color;
+}
+
++GtkTreeMenu.menu .menuitem:hover GtkCellView {
     color: shade (@theme_selected_bg_color, 1.3);
        text-shadow: 0px 1px @theme_selected_shadow_color;
 }
-- 
cgit v1.2.1