More work on the theme

5 files changed, 36 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index 7f7168a..1bf63b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,9 +24,9 @@ mkinstalldirs
 Makefile.in.in
 po/POTFILES
 po/stamp-it
-art/cursor/cursorthemegen/cursorthemegen
-art/cursor/olpc/theme
-art/icon-theme/index.theme
+cursor/cursorthemegen/cursorthemegen
+cursor/sugar/theme
+icons/index.theme
 .deps
 .libs
 po/.intltool-merge-cache
diff --git a/gtk/theme/Makefile.am b/gtk/theme/Makefile.am
new file mode 100644
index 0000000..efd1a3d
--- /dev/null
+++ b/gtk/theme/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = sugar sugar-xo
diff --git a/gtk/theme/sugar-xo/Makefile.am b/gtk/theme/sugar-xo/Makefile.am
new file mode 100644
index 0000000..45fc79f
--- /dev/null
+++ b/gtk/theme/sugar-xo/Makefile.am
@@ -0,0 +1,5 @@
+themedir = $(datadir)/themes/sugar-xo/gtk-2.0
+theme_DATA = gtkrc 
+
+EXTRA_DIST = \
+	$(theme_DATA)
diff --git a/gtk/theme/sugar-xo/gtkrc b/gtk/theme/sugar-xo/gtkrc
new file mode 100644
index 0000000..4a0e1d2
--- /dev/null
+++ b/gtk/theme/sugar-xo/gtkrc
@@ -0,0 +1,16 @@
+style "default"
+{
+    bg[NORMAL] = "#BFBFBF"
+
+    engine "sugar"
+    {
+    }
+}
+
+style "toolbar"
+{
+    bg[NORMAL] = "#262626"
+}
+
+class "GtkWidget" style "default"
+class "GtkToolbar" style "toolbar"
diff --git a/gtk/theme/sugar/gtkrc b/gtk/theme/sugar/gtkrc
index 4a0e1d2..b8f45ec 100644
--- a/gtk/theme/sugar/gtkrc
+++ b/gtk/theme/sugar/gtkrc
@@ -1,16 +1,24 @@
 style "default"
 {
+    GtkToolbar::shadow-type = GTK_SHADOW_NONE
+
     bg[NORMAL] = "#BFBFBF"
+    bg[PRELIGHT] = "#000000"
 
     engine "sugar"
     {
     }
 }
 
-style "toolbar"
+style "toolbox"
 {
-    bg[NORMAL] = "#262626"
+    bg[NORMAL] = "#4D4D4D"
+    bg[ACTIVE] = "#000000"
+    fg[NORMAL] = "#FFFFFF"
+    
+    GtkButton::inner-border = { 10, 10, 10, 10 }
 }
 
 class "GtkWidget" style "default"
-class "GtkToolbar" style "toolbar"
+widget_class "*.SugarToolbox.*" style "toolbox"
+