Merge remote-tracking branch 'ajay/0.97.6-as-base' into devel

4 files changed, 20 insertions, 9 deletions

diff --git a/configure.ac b/configure.ac
index 1ac4ac2..27942e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.53)
 
-AC_INIT([sugar-artwork],[0.97.9],[],[sugar-artwork])
+AC_INIT([sugar-artwork],[0.97.10],[],[sugar-artwork])
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/gtk3/theme/assets/Makefile.am b/gtk3/theme/assets/Makefile.am
index 52f78e1..c098cc5 100644
--- a/gtk3/theme/assets/Makefile.am
+++ b/gtk3/theme/assets/Makefile.am
@@ -9,7 +9,7 @@ assets =			\
 	checkbox-unchecked-selected.svg	\
 	checkbox-checked.svg		\
 	checkbox-checked-selected.svg   \
-	cursor-handle-insert.svg	\
+	cursor-handle-insertion.svg	\
 	cursor-handle-bottom.svg	\
 	cursor-handle-top.svg
 
diff --git a/gtk3/theme/assets/cursor-handle-insert.svg b/gtk3/theme/assets/cursor-handle-insertion.svg
index 1bcc86a..1bcc86a 100644
--- a/gtk3/theme/assets/cursor-handle-insert.svg
+++ b/gtk3/theme/assets/cursor-handle-insertion.svg
diff --git a/gtk3/theme/gtk-widgets.css.em b/gtk3/theme/gtk-widgets.css.em
index dcd3304..7928f2b 100644
--- a/gtk3/theme/gtk-widgets.css.em
+++ b/gtk3/theme/gtk-widgets.css.em
@@ -76,7 +76,7 @@ icon_large = icon_base * 5
     /* 0.05 works good for both the sugar and sugar-xo themes */
     -GtkWidget-cursor-aspect-ratio: 0.05;
 
-    -GtkWidget-wide-separators: false;
+    -GtkWidget-wide-separators: true;
     -GtkWidget-separator-height: $thickness;
     -GtkWidget-separator-width: $thickness;
 
@@ -462,7 +462,6 @@ SugarPaletteWindow SugarGroupBox *:insensitive {
 
 .menuitem.separator {
     padding: $(subcell_size)px 0px;
-    color: @button_grey;
 }
 
 SugarPaletteHeader.menuitem {
@@ -538,9 +537,10 @@ GtkProgressBar.trough {
 
 /* Separators */
 
-GtkVSeparator, GtkHSeparator,
-.toolbar GtkSeparatorToolItem {
-    color: @button_grey;
+.separator {
+    border-style: solid;
+    border-color: @button_grey;
+    border-width: $thickness;
 }
 
 /* Tool buttons */
@@ -806,8 +806,19 @@ SugarCanvasIcon:active {
     background-image: url("assets/cursor-handle-top.svg");
 }
 
-.cursor-handle.insert-cursor {
-    background-image: url("assets/cursor-handle-insert.svg");
+.cursor-handle.insertion-cursor {
+    background-image: url("assets/cursor-handle-insertion.svg");
+}
+
+/* Application specific properties */
+
+EvView {
+    background-color: @panel_grey;
+}
+
+EvView:selected,
+ApDocView:selected {
+    background-color: @selection_grey;
 }
 
 /* Application specific properties */