gtk-css-engine r87 - in branches/bzr: . libccd/ccd themes/Gilouche-CSS/gtk-2.0 themes/gtk-css-test/gtk-2.0

[robsta svn gnome org]

Author: robsta
Date: Fri Sep  5 11:34:04 2008
New Revision: 87
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=87&view=rev

Log:
* Fix propagation of specificity on selector refinement.
* Merge latest Gilouche-CSS from Andreas Nilsson.


Added:
   branches/bzr/themes/Gilouche-CSS/gtk-2.0/check-inactive.png
   branches/bzr/themes/Gilouche-CSS/gtk-2.0/check-selected.png
   branches/bzr/themes/Gilouche-CSS/gtk-2.0/radiobutton-inactive-selected.png
   branches/bzr/themes/Gilouche-CSS/gtk-2.0/radiobutton-inactive.png
   branches/bzr/themes/Gilouche-CSS/gtk-2.0/radiobutton-selected.png
   branches/bzr/themes/Gilouche-CSS/gtk-2.0/tab-back-down.png
   branches/bzr/themes/Gilouche-CSS/gtk-2.0/tab-back-left.png
   branches/bzr/themes/Gilouche-CSS/gtk-2.0/tab-back-right.png
Modified:
   branches/bzr/   (props changed)
   branches/bzr/libccd/ccd/ccd-selector.c
   branches/bzr/themes/Gilouche-CSS/gtk-2.0/styles.css
   branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css

Modified: branches/bzr/libccd/ccd/ccd-selector.c
==============================================================================
--- branches/bzr/libccd/ccd/ccd-selector.c	(original)
+++ branches/bzr/libccd/ccd/ccd-selector.c	Fri Sep  5 11:34:04 2008
@@ -535,6 +535,13 @@
 
 	self->refinement = selector;
 
+	/* propagate specificity */
+	self->a += selector->a;
+	self->b += selector->b;
+	self->c += selector->c;
+	self->d += selector->d;
+	self->e += selector->e;
+
 	switch (selector->modality) {
 	case CCD_SELECTOR_MODALITY_CLASS:
 		g_assert (selector->c < CCD_SELECTOR_MAX_SPECIFICITY);

Added: branches/bzr/themes/Gilouche-CSS/gtk-2.0/check-inactive.png
==============================================================================
Binary files (empty file) and branches/bzr/themes/Gilouche-CSS/gtk-2.0/check-inactive.png	Fri Sep  5 11:34:04 2008 differ

Added: branches/bzr/themes/Gilouche-CSS/gtk-2.0/check-selected.png
==============================================================================
Binary files (empty file) and branches/bzr/themes/Gilouche-CSS/gtk-2.0/check-selected.png	Fri Sep  5 11:34:04 2008 differ

Added: branches/bzr/themes/Gilouche-CSS/gtk-2.0/radiobutton-inactive-selected.png
==============================================================================
Binary files (empty file) and branches/bzr/themes/Gilouche-CSS/gtk-2.0/radiobutton-inactive-selected.png	Fri Sep  5 11:34:04 2008 differ

Added: branches/bzr/themes/Gilouche-CSS/gtk-2.0/radiobutton-inactive.png
==============================================================================
Binary files (empty file) and branches/bzr/themes/Gilouche-CSS/gtk-2.0/radiobutton-inactive.png	Fri Sep  5 11:34:04 2008 differ

Added: branches/bzr/themes/Gilouche-CSS/gtk-2.0/radiobutton-selected.png
==============================================================================
Binary files (empty file) and branches/bzr/themes/Gilouche-CSS/gtk-2.0/radiobutton-selected.png	Fri Sep  5 11:34:04 2008 differ

Modified: branches/bzr/themes/Gilouche-CSS/gtk-2.0/styles.css
==============================================================================
--- branches/bzr/themes/Gilouche-CSS/gtk-2.0/styles.css	(original)
+++ branches/bzr/themes/Gilouche-CSS/gtk-2.0/styles.css	Fri Sep  5 11:34:04 2008
@@ -20,6 +20,10 @@
 background-image: url(check-selected.png);
 }
 
+check[shadow=etched-in][inconsistent=true] {
+	background-color: green;
+}
+
 /* radiobuttons */
 option {
 background-image: url(radiobutton.png);
@@ -29,11 +33,11 @@
 background-image: url(radiobutton-inactive.png);
 }
 
-option[active=true] {
+option[shadow=in] {
 background-image: url(radiobutton-selected.png);
 }
 
-option:insensitive[active=true] {
+option:insensitive[shadow=in] {
 background-image: url(radiobutton-inactive-selected.png);
 }
 
@@ -54,13 +58,6 @@
 }
 
 
-/* The notebook widget */
-
-
-GtkNotebook extension focus {
-	background-color: red;
-}
-
 /* buttons */
 
 /*regular button*/
@@ -146,6 +143,17 @@
 border: 1px solid #c6b182;
 }
 
+/* window slider sliders...uh*/
+slider[orientation=vertical] {
+background-color: red;
+background-image: url(slider-background.png);
+}
+
+slider[orientation=horizontal] {
+background-color: red;
+background-image: url(slider-background-horizontal.png);
+}
+
 /* the buttons on the scrolled window sliders*/
 box.hscrollbar {
 background-color: blue;
@@ -154,4 +162,4 @@
 /* spinbuttons */
 box.spinbutton-up, box.spinbutton-down {
 border: 1px solid #a99975;
-}
\ No newline at end of file
+}

Added: branches/bzr/themes/Gilouche-CSS/gtk-2.0/tab-back-down.png
==============================================================================
Binary files (empty file) and branches/bzr/themes/Gilouche-CSS/gtk-2.0/tab-back-down.png	Fri Sep  5 11:34:04 2008 differ

Added: branches/bzr/themes/Gilouche-CSS/gtk-2.0/tab-back-left.png
==============================================================================
Binary files (empty file) and branches/bzr/themes/Gilouche-CSS/gtk-2.0/tab-back-left.png	Fri Sep  5 11:34:04 2008 differ

Added: branches/bzr/themes/Gilouche-CSS/gtk-2.0/tab-back-right.png
==============================================================================
Binary files (empty file) and branches/bzr/themes/Gilouche-CSS/gtk-2.0/tab-back-right.png	Fri Sep  5 11:34:04 2008 differ

Modified: branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css
==============================================================================
--- branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css	(original)
+++ branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css	Fri Sep  5 11:34:04 2008
@@ -1,4 +1,4 @@
-
+/*
 arrow[orientation=up] {
 	background-image: url(arrow-up.png);
 }
@@ -101,4 +101,20 @@
 GtkProgressBar:prelight {
 	background-color: yellow;
 }
+*/
+option {
+background-color: blue;
+}
+
+option:insensitive {
+background-color: gray;
+}
+/*
+option[shadow=in] {
+background-color: black);
+}
+*/
+option:insensitive[shadow=in] {
+background-color:white;
+}