From bd613155754e1b8be42934cd75d3268637afb3b3 Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Sun, 14 Dec 2014 18:16:10 +0530
Subject: [PATCH] Popover fixes

---
 gtk-3.0/scss/_entry.scss |  4 +--
 gtk-3.0/scss/_menu.scss  | 57 ++++++++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/_entry.scss
index 445fd55..b0a3474 100755
--- a/gtk-3.0/scss/_entry.scss
+++ b/gtk-3.0/scss/_entry.scss
@@ -48,7 +48,7 @@
 				inset 0 1px alpha($dark_shadow, .12),
 				inset -1px 0 alpha($dark_shadow, .1),
 				inset 0 -1px alpha($dark_shadow, .05),
-				0 1px 2px -1px shade($bg_color, 1.4);
+				0 1px 2px -1px shade($bg, 1.4);
 
 	&:selected, &:selected:focus {
 		background-color: $selected_bg_color;
@@ -70,7 +70,7 @@
 		color: $selected_fg_color;
 	}
 
-	&.image.left { padding-right: ($spacing / 2); }
+	&.image.left { padding-right: $spacing; }
 }
 
 @include exports("entry") {
diff --git a/gtk-3.0/scss/_menu.scss b/gtk-3.0/scss/_menu.scss
index 6fa1a44..49aae6c 100755
--- a/gtk-3.0/scss/_menu.scss
+++ b/gtk-3.0/scss/_menu.scss
@@ -118,8 +118,7 @@
             &, &:focus, &:active, &:insensitive, &:active:insensitive {
                 background-color: transparent;
                 background-image: none;
-                border-color: transparent;
-                border-style: none;
+                border: none;
                 box-shadow: none;
                 color: currentColor;
             }
@@ -189,11 +188,39 @@
             > .toolbar .button {
                 border-radius: 0;
                 border-width: 0;
-                background-image: none;
                 background-color: transparent;
+                background-image: none;
             }
         }
 
+        .list {
+            background-color: transparent;
+            background-image: none;
+        }
+
+        .list-row {
+            &, &.button {
+                background-color: transparent;
+                background-image: none;
+                color: $menu_fg_color;
+
+                &:focus, &:hover, &:active {
+                    background-image: none;
+                    background-color: $selected_bg_color;
+                    color: $selected_fg_color;
+                }
+            }
+        }
+
+        .frame {
+            border-color: border_normal($menu_bg_color);
+            border-radius: $roundness;
+        }
+
+        .entry { @include entry($menu_bg_color, $menu_fg_color);  }
+
+        .button { @include button($menu_bg_color, $menu_fg_color);  }
+
         > .list, > .view, > .toolbar { background-color: transparent; }
 
         .separator {
@@ -206,24 +233,14 @@
     }
 
     GtkModelButton.button {
-        &, &:focus, &:active, &:insensitive, &:active:insensitive {
-            &, &:backdrop {
-                background-color: transparent;
-                background-image: none;
-                border-color: transparent;
-                border-image: none;
-                border-style: none;
-                box-shadow: none;
-                color: $menu_fg_color;
-            }
-        }
+        &, &:backdrop {
+            @include button(transparent, currentColor);
 
-        &:focus:hover, &:active:hover, &:hover, &:selected {
-            background-image: none;
-            background-color: $selected_bg_color;
-            color: $selected_fg_color;
-            border: none;
-            border-radius: 2px;
+            &:focus:hover, &:active:hover, &:hover, &:selected {
+                background-image: none;
+                background-color: $selected_bg_color;
+                color: $selected_fg_color;
+            }
         }
     }
 }