From 543d5a9a26acd8c3f2c7e89a63c5d58b5c8cfef0 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Mon, 30 May 2016 22:35:54 +0200
Subject: gtk2: fix entry styling (fix #547)

---
 common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc | 42 +++++------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

(limited to 'common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc')

diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
index c02626d..5a9f177 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
@@ -71,10 +71,6 @@ style "menubar-text" {
 }
 
 style "toolbar_entry" {
-  xthickness = 6
-
-  base[NORMAL] = "#fdfdfd"
-  base[INSENSITIVE] = "#f4f5f6"
 
   text[NORMAL] = "#70788d"
 
@@ -82,50 +78,30 @@ style "toolbar_entry" {
 
     image {
       function = SHADOW
-      detail = "entry"
       state = NORMAL
-      shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-bg.png"
-      border = { 12, 12, 12, 12 }
+      detail = "entry"
+      file = "menubar-toolbar/entry-toolbar.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
     image {
       function = SHADOW
+      state = ACTIVE
       detail = "entry"
-      state = INSENSITIVE
-      shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-disabled-bg.png"
-      border = { 12, 12, 12, 12 }
+      file = "menubar-toolbar/entry-active-toolbar.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
     image {
       function = SHADOW
+      state = INSENSITIVE
       detail = "entry"
-      state = ACTIVE
-      file = "menubar-toolbar/toolbar-entry-border-active-bg.png"
-      border = { 12, 12, 12, 12 }
+      file = "menubar-toolbar/entry-disabled-toolbar.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = NORMAL
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = ACTIVE
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
   }
 }
 
-- 
cgit v1.2.3