[richfaces-svn-commits] JBoss Rich Faces SVN: r1128 - in trunk/richfaces: dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/css and 10 other directories.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Mon Jun 11 13:54:25 EDT 2007


Author: sergeyhalipov
Date: 2007-06-11 13:54:25 -0400 (Mon, 11 Jun 2007)
New Revision: 1128

Added:
   trunk/richfaces/dataFilterSlider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java
   trunk/richfaces/dataFilterSlider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java
Modified:
   trunk/richfaces/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/css/dataFilterSlider.xcss
   trunk/richfaces/dataFilterSlider/src/main/templates/dataFilterSlider.jspx
   trunk/richfaces/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
   trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
   trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
   trunk/richfaces/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss
   trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
   trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java
   trunk/richfaces/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss
   trunk/richfaces/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
   trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
Log:
Correct support for "plain" skin added.

Added: trunk/richfaces/dataFilterSlider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java
===================================================================
--- trunk/richfaces/dataFilterSlider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java	                        (rev 0)
+++ trunk/richfaces/dataFilterSlider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java	2007-06-11 17:54:25 UTC (rev 1128)
@@ -0,0 +1,66 @@
+/**
+ * License Agreement.
+ *
+ *  JBoss RichFaces 3.0 - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007  Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ */
+
+package org.richfaces.renderkit.html.images;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.util.Date;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.framework.resource.GifRenderer;
+import org.ajax4jsf.framework.resource.InternetResourceBuilder;
+import org.ajax4jsf.framework.resource.Java2Dresource;
+import org.ajax4jsf.framework.resource.ResourceContext;
+
+public abstract class SliderArrowBase  extends Java2Dresource{
+	private static final Dimension dimensions = new Dimension(7, 8);
+
+	public SliderArrowBase() {
+		setRenderer(new GifRenderer());
+		setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
+	}
+	
+	protected Dimension getDimensions(ResourceContext resourceContext) {
+		return dimensions;
+	}
+	public Dimension getDimensions(FacesContext facesContext, Object data) {
+		return dimensions;
+	}
+
+	protected void paint(ResourceContext context, Graphics2D g2d) {
+		Integer color = (Integer) restoreData(context);
+		g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+		g2d.setColor(new Color(color.intValue()));
+		g2d.drawLine(0,2,6,2);
+		g2d.drawLine(1,3,5,3);
+		g2d.drawLine(2,4,4,4);
+		g2d.drawLine(3,5,3,5);
+	}
+	
+	public boolean isCacheable() {
+		return true;
+	}
+
+}

Added: trunk/richfaces/dataFilterSlider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java
===================================================================
--- trunk/richfaces/dataFilterSlider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java	                        (rev 0)
+++ trunk/richfaces/dataFilterSlider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImage.java	2007-06-11 17:54:25 UTC (rev 1128)
@@ -0,0 +1,44 @@
+/**
+ * License Agreement.
+ *
+ *  JBoss RichFaces 3.0 - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007  Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ */
+
+package org.richfaces.renderkit.html.images;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.framework.skin.Skin;
+import org.ajax4jsf.framework.skin.SkinFactory;
+import org.ajax4jsf.framework.util.HtmlColor;
+
+public class SliderArrowImage extends SliderArrowBase {
+	protected Object getDataToStore(FacesContext context, Object data) {
+		Skin skin = SkinFactory.getInstance().getSkin(context);
+		
+		String skinParameter = "generalTextColor";
+		String tmp = (String) skin.getParameter(context, skinParameter);
+		if (null == tmp || "".equals(tmp)) {
+			Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
+			tmp = (String) defaultSkin.getParameter(context, skinParameter);
+		}
+		int intValue = HtmlColor.decode(tmp ==null? "#000000":tmp).getRGB();
+		return new Integer(intValue);
+	}
+
+}
\ No newline at end of file

Modified: trunk/richfaces/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/css/dataFilterSlider.xcss
===================================================================
--- trunk/richfaces/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/css/dataFilterSlider.xcss	2007-06-11 17:41:18 UTC (rev 1127)
+++ trunk/richfaces/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/css/dataFilterSlider.xcss	2007-06-11 17:54:25 UTC (rev 1128)
@@ -16,13 +16,15 @@
            height: 10px;
            overflow:hidden;
            float:left;
-           border : 1px solid #678BBD;
+           border-width: 1px;
+           border-style: solid;
        }
 
        .range-decor{
             height : 100%;
             width : 100%;
-            border : 1px solid #fff;
+            border-width: 1px;
+            border-style: solid;
         }
 
        .trailer{
@@ -47,12 +49,8 @@
        }
 
        .slider-input-field{
-            border: #000000 1px solid;
-            border-bottom: #b0b0b0 1px solid;
-            border-right: #b0b0b0 1px solid;
-            background: #FFFFFF url('') left top repeat-x;
-            font: normal 11px arial, sans-serif;
-            color: #000000;
+            border: 1px solid;
+            background: left top repeat-x;
             padding: 0px 0px 0px 3px;
             width : 40px;
             margin: 0px 0px 0px 10px;
@@ -70,6 +68,10 @@
     <u:style name="border-color" skin="panelBorderColor"/>
 </u:selector>
 
+<u:selector name=".range">
+    <u:style name="border-color" skin="subBorderColor"/>
+</u:selector>
+
 <u:selector name=".trailer">
     <u:style name="background-image">
         <f:resource f:key="/org/richfaces/renderkit/html/images/sldr_trailer3_bg.gif" />
@@ -84,6 +86,9 @@
     <u:style name="font-family" skin="generalFamilyFont"/>
     <u:style name="font-size" skin="generalSizeFont"/>
     <u:style name="color" skin="controlTextColor"/>
+    <u:style name="border-color" skin="panelBorderColor" />
+    <u:style name="border-bottom-color" skin="subBorderColor" />
+    <u:style name="border-right-color" skin="subBorderColor" />
 </u:selector>
 
 

Modified: trunk/richfaces/dataFilterSlider/src/main/templates/dataFilterSlider.jspx
===================================================================
--- trunk/richfaces/dataFilterSlider/src/main/templates/dataFilterSlider.jspx	2007-06-11 17:41:18 UTC (rev 1127)
+++ trunk/richfaces/dataFilterSlider/src/main/templates/dataFilterSlider.jspx	2007-06-11 17:54:25 UTC (rev 1128)
@@ -15,7 +15,7 @@
     <h:scripts>new org.ajax4jsf.framework.resource.PrototypeScript(),scripts/scriptaculous-js-1.6.5/src/slider.js</h:scripts>
 
     <f:clientid var="clientId"/>
-    <f:resource name="/org/richfaces/renderkit/html/images/sldr_arr.gif" var="arrow" />
+    <f:resource name="org.richfaces.renderkit.html.images.SliderArrowImage" var="arrow" />
     
     <jsp:scriptlet>
 		<![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>

Modified: trunk/richfaces/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
===================================================================
--- trunk/richfaces/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss	2007-06-11 17:41:18 UTC (rev 1127)
+++ trunk/richfaces/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss	2007-06-11 17:54:25 UTC (rev 1128)
@@ -7,29 +7,23 @@
 .dr-dscr{
 }
 .dr-dscr-t{
-	border : 1px solid #c0c0c0;  /*panelBorderColor*/
-	background-color :  #ffffff;  /*tableBackgroundColor*/
+	border-width : 1px;
+	border-style: solid;
 }
 .dr-dscr-button{
-	background-color :#EAF0F8; /*additionalBackgroundColor*/
-	border : 1px solid #c0c0c0;  /*panelBorderColor*/
-	font-family : verdana; /*generalFamilyFont*/
-	font-size : 11px;  /*generalSizeFont*/
+	border-width: 1px;
+	border-style: solid;
 	width : 25px;
 	cursor : pointer;
 }
 .dr-dscr-act{
-	border-top : 2px solid #000000; /*generalTextColor*/
-	color : #000000; /*generalTextColor*/
-	font-family : verdana; /*generalFamilyFont*/
-	font-size : 11px;  /*generalSizeFont*/
+	border-top-width: 2px;
+	border-top-style: solid;
 	width : 25px;
 }
 .dr-dscr-inact{
-	border-top : 2px solid #4A75B5; /*headerBackgroundColor*/
-	color : #4A75B5; /*headerBackgroundColor*/
-	font-family : verdana; /*generalFamilyFont*/
-	font-size : 11px;  /*generalSizeFont*/
+	border-top-width: 2px;
+	border-top-style: solid;
 	width : 25px;
 	cursor : pointer;
 }
@@ -66,5 +60,10 @@
     <u:style name="font-size" skin="generalSizeFont" />
 </u:selector>
 
+<u:selector name=".dr-dscr-t">
+	<u:style name="border-color" skin="panelBorderColor" />
+	<u:style name="background-color" skin="tableBackgroundColor" />
+</u:selector>
 
+
 </f:template>

Modified: trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss	2007-06-11 17:41:18 UTC (rev 1127)
+++ trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss	2007-06-11 17:54:25 UTC (rev 1128)
@@ -7,16 +7,13 @@
 
 
 .dr-menu-list-border { 
-	border : 1px solid #bfbfc0; 
-	background-color : #e7f2fb; 
+	border : 1px solid;
 	float : left; 
 	position : absolute;
 }
 .dr-menu-list-bg {
-	border-top : 1px solid #e7f2fb; 
-	border-left : 1px solid #e7f2fb; 
-	border-right : 1px solid #e7f2fb; 
-	background : url(menu_list_bg.gif) repeat-y left;
+	border : 1px solid;
+	background : repeat-y left;
 }
 .dr-menu-label {
 	left: 0px;
@@ -31,10 +28,8 @@
 	padding : 3px 6px; 
 }
 .dr-menu-label-select {
-	border : 1px solid #bfbfc0; 
+	border : 1px solid;
 	cursor : pointer; 
-	background :  #a9c5e7; 
-	color : #FFFFFF;
 }
 .dr-label-text-decor { 
 	font-weight : bold;

Modified: trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
===================================================================
--- trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss	2007-06-11 17:41:18 UTC (rev 1127)
+++ trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss	2007-06-11 17:54:25 UTC (rev 1128)
@@ -5,26 +5,26 @@
 
 	<f:verbatim><![CDATA[
 
-.dr-insldr-tip{
+.dr-insldr-tip {
 	position : absolute;
 	white-space	: nowrap;
 	padding : 0px 2px 0px 2px;
 	top: -17px;
-	border : 1px solid #E5973E;
+	border : 1px solid;
 }
 
 .dr-insldr-size {
 	width: 100%;
 }
 
-.dr-insldr-left-num{
+.dr-insldr-left-num {
 	text-align : left;
-	border-left : 1px solid #678BBD;
+	border-left: 1px solid;
 	padding : 0px 3px 0px 3px;
 }
 .dr-insldr-right-num{
 	text-align : right;
-	border-right : 1px solid #678BBD;
+	border-right : 1px solid;
 	padding : 0px 3px 0px 3px;
 }
 .dr-insldr-vert-spacer{
@@ -54,19 +54,16 @@
 	height : 8px;
 	font-size : 1px;
 }
-.dr-insldr-track-decor-1{
+.dr-insldr-track-decor-1 {
 	height : 100%;
 	width : 100%;
-	border : 1px solid #678BBD;
+	border : 1px solid;
 }
-.dr-insldr-track-decor-2{
+.dr-insldr-track-decor-2 {
 	border : 1px solid white;
 }
-.dr-insldr-field{
-	border-left: #000000 1px solid;
-	border-top: #000000 1px solid;
-	border-bottom: #b0b0b0 1px solid;
-	border-right: #b0b0b0 1px solid;
+.dr-insldr-field {
+	border: 1px solid;
 	padding: 0px 0px 0px 3px;
 	margin: 0px 0px 0px 10px;
 	background-position: left top;
@@ -133,5 +130,8 @@
 		<u:style name="font-family" skin="generalFamilyFont"/>
 		<u:style name="font-size" skin="generalSizeFont"/>
 		<u:style name="color" skin="controlTextColor"/>
+		<u:style name="border-color" skin="panelBorderColor" />
+	    <u:style name="border-bottom-color" skin="subBorderColor" />
+    	<u:style name="border-right-color" skin="subBorderColor" />
 	</u:selector>
 </f:template>
\ No newline at end of file

Modified: trunk/richfaces/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss
===================================================================
--- trunk/richfaces/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss	2007-06-11 17:41:18 UTC (rev 1127)
+++ trunk/richfaces/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss	2007-06-11 17:54:25 UTC (rev 1128)
@@ -6,15 +6,11 @@
 <f:verbatim>
 <![CDATA[
 .dr-spnr-e {
-	background-color : #ffffff;
 	padding: 0px;
 	margin: 0px;
 	background-position: left top;
 	background-repeat: repeat-x;
-	border-left: #000000 1px solid;
-	border-top: #000000 1px solid;
-	border-bottom: #b0b0b0 1px solid;
-	border-right: #b0b0b0 1px solid;
+	border: 1px solid;
 }
 
 .dr-spnr-i {
@@ -22,8 +18,6 @@
 	padding: 0px 0px 0px 3px;
 	background: none transparent scroll repeat 0% 0%;
 	margin: 0px;
-	font-family: Arial, Verdana, sans-serif;
-    font-size: 11px
 }
 
 .dr-spnr-b {
@@ -48,24 +42,17 @@
 	
 	<u:selector name=".dr-spnr-i">
 		<u:style name="font-size" skin="buttonSizeFont"/>
-		<u:style name="line-height">
-			<f:call name="org.richfaces.component.util.HtmlUtil.addToSize">
-				<f:parameter value="#{a4jSkin.buttonSizeFont}" />
-				<f:parameter value="2" />
-			</f:call>
-		</u:style>
-		<u:style name="height">
-			<f:call name="org.richfaces.component.util.HtmlUtil.addToSize">
-				<f:parameter value="#{a4jSkin.buttonSizeFont}" />
-				<f:parameter value="2" />
-			</f:call>
-		</u:style>
+		<u:style name="font-family" skin="buttonFamilyFont"/>
 	</u:selector>
 
 	<u:selector name=".dr-spnr-e">
 		<u:style name="background-image">
 			<f:resource f:key="org.richfaces.renderkit.html.images.background.SpinnerFieldGradient" />
 		</u:style>
+		<u:style name="background-color" skin="controlBackgroundColor" />
+		<u:style name="border-color" skin="panelBorderColor" />
+	    <u:style name="border-bottom-color" skin="subBorderColor" />
+    	<u:style name="border-right-color" skin="subBorderColor" />
 	</u:selector>
 	
 	<u:selector name=".dr-spnr-b">

Modified: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
===================================================================
--- trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss	2007-06-11 17:41:18 UTC (rev 1127)
+++ trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss	2007-06-11 17:54:25 UTC (rev 1128)
@@ -7,7 +7,7 @@
 
 .dr-menu-separator {
 	font-size : 0px;
-	border-top: 1px solid  #bfbfc0;
+	border-top: 1px solid;
 	margin : 2px 0px 2px 24px;    
 }
 .dr-menu-item {
@@ -20,13 +20,12 @@
 	padding : 2px 36px 2px 2px;
 }
 .dr-menu-item-hover {
-	border : 1px solid #4a70ab; 
+	border : 1px solid;
 	cursor : pointer; 
 }
 .dr-menu-item-disabled {
 	border : 0px solid transparent; 
-	cursor : default; 
-	color : #839eca;
+	cursor : default;
 }
 .dr-menu-icon {	
 	margin-right : 10px;

Modified: trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java
===================================================================
--- trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java	2007-06-11 17:41:18 UTC (rev 1127)
+++ trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java	2007-06-11 17:54:25 UTC (rev 1128)
@@ -134,11 +134,11 @@
 
         String skinParameter = "headerBackgroundColor";
         tmp = (String) skin.getParameter(context, skinParameter);
-        separatorData.setBgColor(HtmlColor.decode(tmp == null ? "#4169E1" : tmp).getRGB());
         if (null == tmp || "".equals(tmp)) {
 			Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
 			tmp = (String) defaultSkin.getParameter(context, skinParameter);
 		}
+        separatorData.setBgColor(HtmlColor.decode(tmp == null ? "#4169E1" : tmp).getRGB());
 
         skinParameter = "overAllBackground";
         tmp = (String) skin.getParameter(context, skinParameter);

Modified: trunk/richfaces/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss
===================================================================
--- trunk/richfaces/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss	2007-06-11 17:41:18 UTC (rev 1127)
+++ trunk/richfaces/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss	2007-06-11 17:54:25 UTC (rev 1128)
@@ -5,8 +5,8 @@
 
 <f:verbatim><![CDATA[
 .dr-stglpnl{
-   border : 1px solid #678FC5;
-   background-color : #BFD0E9;   
+   border-width : 1px;
+   border-style: solid;
    padding : 1px;
    background-position : top right;
    background-repeat : no-repeat;
@@ -16,23 +16,14 @@
 .dr-stglpnl-h{
    border-width: 1px;
    border-style: solid;
-   background-color : #224986;
-   font-size : 11px;
-   color : #ffffff;
    cursor: pointer;
-   font-weight : bold;
-   font-family : verdana;
    padding : 2px;
-   background-image : url(coll_panel_bg.gif);
    background-position : top left;
    background-repeat : repeat-x;
 }
 
 
 .dr-stglpnl-b{
-   font-size : 11px;
-   color : #000000;
-   font-family : verdana;
    padding : 10px;
    text-align : left;
    vertical-align : top;

Modified: trunk/richfaces/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
===================================================================
--- trunk/richfaces/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss	2007-06-11 17:41:18 UTC (rev 1127)
+++ trunk/richfaces/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss	2007-06-11 17:54:25 UTC (rev 1128)
@@ -58,12 +58,11 @@
 
 <f:verbatim>
 
-.dr-tbpnl-cntnt{
+.dr-tbpnl-cntnt {
 	border-width: 1px;
 	border-style: solid;
 	font-size: 11px;
 	font-family: verdana;
-	color: #000000;
 	vertical-align: top;
 }
 
@@ -134,11 +133,11 @@
 		<u:style name="color" skin="tabDisabledTextColor"/>
 	</u:selector>
 <f:verbatim>
-.dr-tbpnl-tb-sel{
+
+.dr-tbpnl-tb-sel {
 	border-width: 1px;
 	border-style: solid;
 	border-bottom : 0px;
-	color : #000000;
 	background-repeat: repeat-x;
 	background-position: top;
 	cursor : default;	
@@ -160,6 +159,7 @@
 
 	<u:selector name=".dr-tbpnl-cntnt">
 		<u:style name="background-color" skin="generalBackgroundColor"/>
+		<u:style name="color" skin="generalTextColor"/>
 		<u:style name="border-color" skin="panelBorderColor"/>
 	</u:selector>
 
@@ -167,6 +167,7 @@
 		<u:style name="background-image">
 			<f:resource f:key="org.richfaces.renderkit.images.TabGradientB" />
 		</u:style>
+		<u:style name="color" skin="selectControlColor" />
 	</u:selector>
 
 	<u:selector name=".dr-tbpnl-tb-dsbl">

Modified: trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
===================================================================
--- trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss	2007-06-11 17:41:18 UTC (rev 1127)
+++ trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss	2007-06-11 17:54:25 UTC (rev 1128)
@@ -43,9 +43,6 @@
 .dr-tree-h-text {
 	width: 100%;
 	cursor: default;
-	color : #000000;
-	font-size : 11px;
-	font-family : verdana;
 	padding : 1px 4px 1px 4px;
 }
 
@@ -55,19 +52,16 @@
 
 .dr-tree-i-sel {
 	padding : 0px 3px 0px 3px;
-	border : 1px solid #678FC5;
+	border : 1px solid;
 	background-color : transparent;
+	background-position: top left;
+	background-repeat: repeat-x;
 }
 
 .dr-tree-i-hl {
 	text-decoration: underline;
-	color : #678FC5;
 }
 
-.dr-tree-i-sel .dr-tree-i-hl {
-	color : red;
-}
-
 .dr-tree-pointer-cursor {
 	cursor: pointer;
 }
@@ -91,8 +85,6 @@
 
 <u:selector name=".dr-tree-i-sel">
    	<u:style name="border-color" skin="headerBackgroundColor" />
-	<u:style name="background-position" value="top left"/>
-	<u:style name="background-repeat" value="repeat-x"/>
 	<u:style name="color" skin="panelTextColor" />
 </u:selector>
 
@@ -121,4 +113,9 @@
 		<f:resource f:key="org.richfaces.renderkit.html.images.TreeLineCollapsedImage"/>
 	</u:style>
 </u:selector>
+
+<u:selector name=".dr-tree-i-sel .dr-tree-i-hl">
+	<u:style name="color" skin="selectControlColor" />
+</u:selector>
+
 </f:template>
\ No newline at end of file




More information about the richfaces-svn-commits mailing list