From 168bdc655943f13ccb7f6178e0de046d4990763b Mon Sep 17 00:00:00 2001
From: Santiago Collazo <scollazo@activitycentral.com>
Date: Tue, 18 Dec 2012 05:40:31 +0000
Subject: Merge remote-tracking branch 'ajay/0.97.6-as-base' into devel

---
diff --git a/configure.ac b/configure.ac
index 3bedb37..3d569f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.53)
 
-AC_INIT([sugar-artwork],[0.98.1],[],[sugar-artwork])
+AC_INIT([sugar-artwork],[0.98.2],[],[sugar-artwork])
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/gtk3/theme/gtk-widgets.css.em b/gtk3/theme/gtk-widgets.css.em
index 7b65a52..94dceda 100644
--- a/gtk3/theme/gtk-widgets.css.em
+++ b/gtk3/theme/gtk-widgets.css.em
@@ -412,6 +412,9 @@ SugarHTray * , SugarVTray * { background-color: @toolbar_grey;}
 /* Menus and palettes */
 
 SugarPaletteWindowWidget {
+    border-width: $(thickness)px;
+    border-color: @button_grey;
+    border-style: solid;
     background-color: @black;
     color: @white;
 }
@@ -776,19 +779,22 @@ SugarFrameWindow {
 
 /* Sugar Canvas icon */
 
-SugarCanvasIcon {
+SugarCanvasIcon,
+SugarKeepIcon.button {
     border-color: transparent;
     border-radius: $(4 * thickness)px;
     border-width: 2px;
     border-style: solid;
 }
 
-SugarCanvasIcon:prelight {
+SugarCanvasIcon:prelight,
+SugarKeepIcon.button:prelight {
     border-color: @zoom_views_prelight;
     background-color: @zoom_views_prelight;
 }
 
-SugarCanvasIcon:active {
+SugarCanvasIcon:active,
+SugarKeepIcon.button.toggle-press {
     border-color: @zoom_views_active;
     background-color: @zoom_views_active;
 }
--
cgit v0.9.1