gtk-css-engine r19 - in bzr-playground: . themes/Gilouche-CSS/gtk-2.0

[robsta svn gnome org]

Author: robsta
Date: Mon Aug 18 13:50:59 2008
New Revision: 19
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=19&view=rev

Log:
Merge latest theme from Andreas.

Added:
   bzr-playground/themes/Gilouche-CSS/gtk-2.0/button-back.png
   bzr-playground/themes/Gilouche-CSS/gtk-2.0/slider-background.png
Modified:
   bzr-playground/   (props changed)
   bzr-playground/themes/Gilouche-CSS/gtk-2.0/arrow-up.png
   bzr-playground/themes/Gilouche-CSS/gtk-2.0/styles.css

Modified: bzr-playground/themes/Gilouche-CSS/gtk-2.0/arrow-up.png
==============================================================================
Binary files bzr-playground/themes/Gilouche-CSS/gtk-2.0/arrow-up.png	(original) and bzr-playground/themes/Gilouche-CSS/gtk-2.0/arrow-up.png	Mon Aug 18 13:50:59 2008 differ

Added: bzr-playground/themes/Gilouche-CSS/gtk-2.0/button-back.png
==============================================================================
Binary files (empty file) and bzr-playground/themes/Gilouche-CSS/gtk-2.0/button-back.png	Mon Aug 18 13:50:59 2008 differ

Added: bzr-playground/themes/Gilouche-CSS/gtk-2.0/slider-background.png
==============================================================================
Binary files (empty file) and bzr-playground/themes/Gilouche-CSS/gtk-2.0/slider-background.png	Mon Aug 18 13:50:59 2008 differ

Modified: bzr-playground/themes/Gilouche-CSS/gtk-2.0/styles.css
==============================================================================
--- bzr-playground/themes/Gilouche-CSS/gtk-2.0/styles.css	(original)
+++ bzr-playground/themes/Gilouche-CSS/gtk-2.0/styles.css	Mon Aug 18 13:50:59 2008
@@ -57,6 +57,10 @@
 	background-image: url(arrow-up.png);
 }
 
+* {
+background-color: #fbf8f1;
+}
+
 arrow[orientation=down] {
 	background-color: yellow;
 	background-image: url(foo.svg);
@@ -81,10 +85,17 @@
 	background-color: green;
 }
 
+<<<<<<< TREE
 /* Seems like all boxes used all over the place*/
 box {
 	background-color: #fbf8f1;
 	border: 0px solid black;
+=======
+/* Seems like all boxes used all over the place*/
+ box {
+	border: 0px solid black;
+	background-color: red;
+>>>>>>> MERGE-SOURCE
 }
 
 /* A button*/
@@ -109,7 +120,7 @@
 
 slider {
 	background-color: #fff;
-/*	background-image: url(slider-background.png); */
+	background-image: url(slider-background.png);
 	border: 1px solid #587ba1;
 }