refinements

12 files changed, 254 insertions, 0 deletions

diff --git a/common/gtk-2.0/menubar-toolbar/menubar-dark.png b/common/gtk-2.0/menubar-toolbar/menubar-dark.png
new file mode 100644
index 0000000..b7a04f4
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/menubar-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
new file mode 100644
index 0000000..e1ae2d9
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
@@ -0,0 +1,127 @@
+style "menubar" {
+
+  bg[NORMAL] = "#e7e8eb"
+  fg[NORMAL] = "#70788d"
+  fg[SELECTED] = @fg_color
+  fg[INSENSITIVE] = shade(1.3, "#70788d")
+
+  xthickness = 0
+  ythickness = 0
+
+  engine "pixmap" {
+
+    image {
+      function = BOX
+      file  = "menubar-toolbar/menubar-dark.png"
+      stretch  = TRUE
+      border = { 1, 1, 1, 1 }
+    }
+  }
+}
+
+style "menubar-borderless" {
+
+  bg[NORMAL] = "#e7e8eb"
+  fg[NORMAL] = "#70788d"
+  fg[SELECTED] = @fg_color
+  fg[INSENSITIVE] = shade(1.3, "#70788d")
+
+  xthickness = 0
+  ythickness = 0
+
+  engine "pixmap" {
+
+    image {
+      function = BOX
+      file  = "assets/null.png"
+      stretch  = TRUE
+      border = { 1, 1, 1, 1 }
+    }
+  }
+}
+
+style "menubar_item" {
+
+  xthickness = 2
+  ythickness = 4
+
+  fg[PRELIGHT] = @fg_color
+
+  engine "pixmap" {
+
+    image {
+      function = BOX
+      state = PRELIGHT
+      file = "menubar-toolbar/menubar_button-dark.png"
+      border = { 2, 2, 2, 2 }
+      stretch = TRUE
+    }
+  }
+}
+
+style "toolbar_entry" {
+  xthickness = 6
+
+  engine "pixmap" {
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = NORMAL
+      shadow = IN
+      file = "menubar-toolbar/toolbar-entry-border-bg-dark.png"
+      border = { 12, 12, 12, 12 }
+      stretch = TRUE
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = INSENSITIVE
+      shadow = IN
+      file = "menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png"
+      border = { 12, 12, 12, 12 }
+      stretch = TRUE
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = ACTIVE
+      file = "menubar-toolbar/toolbar-entry-border-active-bg-dark.png"
+      border = { 12, 12, 12, 12 }
+      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
+    }
+  }
+}
+
+widget_class "*<GtkMenuBar>*"                                       style "menubar"
+widget_class "*<GtkMenuBar>.<GtkMenuItem>*"                         style "menubar_item"
+
+widget_class "*ThunarWindow*<GtkToolbar>"                           style "menubar"
+widget_class "*CajaNavigationWindow*<GtkToolbar>"                   style "menubar"
+
+
+# Whitelist for dark toolbars
+widget_class "*ThunarWindow*<GtkMenuBar>"                           style "menubar-borderless"
+widget_class "*CajaNavigationWindow*<GtkMenuBar>"                   style "menubar-borderless"
+widget_class "*ThunarWindow*<GtkToolbar>*<GtkEntry>"                style "toolbar_entry"
+widget_class "*CajaNavigationWindow*<GtkToolbar>*<GtkEntry>"        style "toolbar_entry"
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
new file mode 100644
index 0000000..9a4a4e7
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
@@ -0,0 +1,127 @@
+style "menubar" {
+
+  bg[NORMAL] = "#e7e8eb"
+  fg[NORMAL] = "#70788d"
+  fg[SELECTED] = @fg_color
+  fg[INSENSITIVE] = shade(1.3, "#70788d")
+
+  xthickness = 0
+  ythickness = 0
+
+  engine "pixmap" {
+
+    image {
+      function = BOX
+      file  = "menubar-toolbar/menubar.png"
+      stretch  = TRUE
+      border = { 1, 1, 1, 1 }
+    }
+  }
+}
+
+style "menubar-borderless" {
+
+  bg[NORMAL] = "#e7e8eb"
+  fg[NORMAL] = "#70788d"
+  fg[SELECTED] = @fg_color
+  fg[INSENSITIVE] = shade(1.3, "#70788d")
+
+  xthickness = 0
+  ythickness = 0
+
+  engine "pixmap" {
+
+    image {
+      function = BOX
+      file  = "assets/null.png"
+      stretch  = TRUE
+      border = { 1, 1, 1, 1 }
+    }
+  }
+}
+
+style "menubar_item" {
+
+  xthickness = 2
+  ythickness = 4
+
+  fg[PRELIGHT] = @fg_color
+
+  engine "pixmap" {
+
+    image {
+      function = BOX
+      state = PRELIGHT
+      file = "menubar-toolbar/menubar_button.png"
+      border = { 2, 2, 2, 2 }
+      stretch = TRUE
+    }
+  }
+}
+
+style "toolbar_entry" {
+  xthickness = 6
+
+  engine "pixmap" {
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = NORMAL
+      shadow = IN
+      file = "menubar-toolbar/toolbar-entry-border-bg.png"
+      border = { 12, 12, 12, 12 }
+      stretch = TRUE
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = INSENSITIVE
+      shadow = IN
+      file = "menubar-toolbar/toolbar-entry-border-disabled-bg.png"
+      border = { 12, 12, 12, 12 }
+      stretch = TRUE
+    }
+
+    image {
+      function = SHADOW
+      detail = "entry"
+      state = ACTIVE
+      file = "menubar-toolbar/toolbar-entry-border-active-bg.png"
+      border = { 12, 12, 12, 12 }
+      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
+    }
+  }
+}
+
+widget_class "*<GtkMenuBar>*"                                       style "menubar"
+widget_class "*<GtkMenuBar>.<GtkMenuItem>*"                         style "menubar_item"
+
+widget_class "*ThunarWindow*<GtkToolbar>"                           style "menubar"
+widget_class "*CajaNavigationWindow*<GtkToolbar>"                   style "menubar"
+
+
+# Whitelist for dark toolbars
+widget_class "*ThunarWindow*<GtkMenuBar>"                           style "menubar-borderless"
+widget_class "*CajaNavigationWindow*<GtkMenuBar>"                   style "menubar-borderless"
+widget_class "*ThunarWindow*<GtkToolbar>*<GtkEntry>"                style "toolbar_entry"
+widget_class "*CajaNavigationWindow*<GtkToolbar>*<GtkEntry>"        style "toolbar_entry"
diff --git a/common/gtk-2.0/menubar-toolbar/menubar.png b/common/gtk-2.0/menubar-toolbar/menubar.png
new file mode 100644
index 0000000..ff49952
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/menubar.png
diff --git a/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png b/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png
new file mode 100644
index 0000000..717575a
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/menubar_button.png b/common/gtk-2.0/menubar-toolbar/menubar_button.png
new file mode 100644
index 0000000..92870f4
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/menubar_button.png
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png
new file mode 100644
index 0000000..f8ce4d8
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png
new file mode 100644
index 0000000..c978290
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png
new file mode 100644
index 0000000..2882909
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png
new file mode 100644
index 0000000..1bef4f5
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png
new file mode 100644
index 0000000..1267825
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png
new file mode 100644
index 0000000..d5dea4a
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png