Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Collazo <scollazo@activitycentral.com>2012-11-29 18:04:02 (GMT)
committer Santiago Collazo <scollazo@activitycentral.com>2012-11-29 18:04:02 (GMT)
commitacae2bc6541d02f92c68ca4a633f8702aece70f1 (patch)
tree307257dccb80930ad71ff543aaba1da119f68a41
parent69a15c33159c3986b2b7e2f639df7d9353255931 (diff)
parentbe3a8f0a477bb8e0b7cc1a457b088afd365b61d0 (diff)
Merge remote-tracking branch 'ajay/0.97.6-as-base' into devel
-rw-r--r--configure.ac2
-rw-r--r--gtk3/theme/gtk-widgets.css.em4
2 files changed, 5 insertions, 1 deletions
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 */