From acae2bc6541d02f92c68ca4a633f8702aece70f1 Mon Sep 17 00:00:00 2001
From: Santiago Collazo <scollazo@activitycentral.com>
Date: Thu, 29 Nov 2012 18:04:02 +0000
Subject: Merge remote-tracking branch 'ajay/0.97.6-as-base' into devel

---
diff --git a/configure.ac b/configure.ac
index 9b06482..e628f60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.53)
 
-AC_INIT([sugar-artwork],[0.97.12],[],[sugar-artwork])
+AC_INIT([sugar-artwork],[0.98.0],[],[sugar-artwork])
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/gtk3/theme/gtk-widgets.css.em b/gtk3/theme/gtk-widgets.css.em
index 1996034..e7b76c5 100644
--- a/gtk3/theme/gtk-widgets.css.em
+++ b/gtk3/theme/gtk-widgets.css.em
@@ -398,6 +398,10 @@ SugarAlert *:insensitive {
 
 /* Tray */
 
+SugarHTray, SugarVTray {
+    background-color: @toolbar_grey;
+}
+
 SugarHTray * , SugarVTray * { background-color: @toolbar_grey;}
 
 /* Menus and palettes */
--
cgit v0.9.1