[richfaces-svn-commits] JBoss Rich Faces SVN: r8530 - in trunk/samples/laguna/src/main/resources: org/richfaces/laguna and 1 other directory.

Author: admitriev Date: 2008-05-12 12:46:06 -0400 (Mon, 12 May 2008) New Revision: 8530 Modified: trunk/samples/laguna/src/main/resources/META-INF/skins/laguna.skin.properties trunk/samples/laguna/src/main/resources/org/richfaces/laguna/calendar.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataFilterSlider.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataTable.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/datascroller.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dropdownmenu.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/modalPanel.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelBar.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelMenu.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/simpleTogglePanel.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/tabPanel.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/toolBar.xcss Log: Modified: trunk/samples/laguna/src/main/resources/META-INF/skins/laguna.skin.properties =================================================================== --- trunk/samples/laguna/src/main/resources/META-INF/skins/laguna.skin.properties 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/META-INF/skins/laguna.skin.properties 2008-05-12 16:46:06 UTC (rev 8530) @@ -1,3 +1,5 @@ -baseSkin=classic -gradientType=glass +baseSkin=blueSky +gradientType=plastic generalStyleSheet=resource:///META-INF/skins/laguna.xcss + +intShadow=#dadada Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/calendar.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/calendar.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/calendar.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -7,6 +7,7 @@ </u:selector> <u:selector name=".rich-calendar-exterior"> + <u:style name="border-color" skin="tableBorderColor" /> </u:selector> <u:selector name=".rich-calendar-header-optional"> @@ -28,7 +29,8 @@ </u:selector> <u:selector name=".rich-calendar-cell"> - </u:selector> + <u:style name="border-color" skin="tableBorderColor" /> +</u:selector> <u:selector name=".rich-calendar-tool"> <u:style name="background-repeat" value="repeat-x" /> @@ -57,9 +59,11 @@ </u:selector> <u:selector name=".rich-calendar-days"> + <u:style name="border-color" skin="tableBorderColor" /> </u:selector> <u:selector name=".rich-calendar-weekends"> + <u:style name="color" skin="calendarHolidaysTextColor" /> </u:selector> <u:selector name=".rich-calendar-week"> @@ -72,6 +76,7 @@ <f:attribute name="baseColor" skin="panelBorderColor" /> </f:resource> </u:style> + <u:style name="border-color" skin="tableBorderColor" /> </u:selector> @@ -128,6 +133,7 @@ </u:selector> <u:selector name=".rich-calendar-toolfooter"> + <u:style name="border-color" skin="tableBorderColor" /> </u:selector> <u:selector name=".rich-calendar-tool-btn"> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataFilterSlider.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataFilterSlider.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataFilterSlider.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -17,14 +17,14 @@ <u:selector name=".rich-dataFilterSlider-track"> <u:style name="border-width" value="1px" /> <u:style name="border-style" value="solid" /> - <u:style name="border-color" skin="panelBorderColor" /> + <u:style name="border-color" skin="tableBorderColor" /> <u:style name="background-position" value="0% 50%" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> <f:attribute name="valign" value="middle" /> <f:attribute name="gradientHeight" value="4px" /> - <f:attribute name="baseColor" skin="headerGradientColor" /> + <f:attribute name="baseColor" skin="headerBackgroundColor" /> </f:resource> </u:style> </u:selector> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataTable.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataTable.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataTable.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -55,8 +55,6 @@ </u:selector> <u:selector name=".rich-table-headercell" > - <u:style name="border-right-color" skin="tableSubfooterBackgroundColor" /> - <u:style name="border-bottom-color" skin="tableSubfooterBackgroundColor" /> </u:selector> <u:selector name=".rich-table-subheader" > Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/datascroller.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/datascroller.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/datascroller.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -1,26 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml" > - - <u:selector name=".rich-datascr"> - </u:selector> - - <u:selector name=".rich-dtascroller-table"> - </u:selector> - - <u:selector name=".rich-datascr-button-dsbld"> - </u:selector> - - <u:selector name=".rich-datascr-button"> - </u:selector> - - <u:selector name=".rich-datascr-ctrls-separator"> - </u:selector> - - <u:selector name=".rich-datascr-act"> - </u:selector> - - <u:selector name=".rich-datascr-inact"> - </u:selector> +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f='http:/jsf.exadel.com/template' + xmlns:u='http:/jsf.exadel.com/template/util' + xmlns="http://www.w3.org/1999/xhtml" > + + <u:selector name=".rich-datascr"> + </u:selector> + + <u:selector name=".rich-dtascroller-table"> + <u:style name="border-color" skin="tableBorderColor" /> + </u:selector> + + <u:selector name=".rich-datascr-button-dsbld"> + <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="background-position" value="0% 0%" /> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> + <f:attribute name="valign" value="top" /> + + <f:attribute name="gradientHeight" value="16px" /> + <f:attribute name="baseColor" skin="headerGradientColor" /> + </f:resource> + </u:style> + </u:selector> + + <u:selector name=".rich-datascr-button"> + <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="background-position" value="0% 0%" /> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> + <f:attribute name="valign" value="top" /> + + <f:attribute name="gradientHeight" value="16px" /> + <f:attribute name="baseColor" skin="headerBackgroundColor" /> + </f:resource> + </u:style> + </u:selector> + + <u:selector name=".rich-datascr-ctrls-separator"> + </u:selector> + + <u:selector name=".rich-datascr-act"> + </u:selector> + + <u:selector name=".rich-datascr-inact"> + </u:selector> </f:template> \ No newline at end of file Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dropdownmenu.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dropdownmenu.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dropdownmenu.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -14,10 +14,8 @@ <u:selector name=".rich-ddmenu-label-unselect"> </u:selector> - - <u:selector name=".rich-menu-list-border"> - <u:style name="opacity" value="0.8" /> - <u:style name="filter" value="progid:DXImageTransform.Microsoft.Alpha(opacity=80);}" /> + + <u:selector name=".rich-menu-list-border"> </u:selector> - + </f:template> \ No newline at end of file Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/modalPanel.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/modalPanel.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/modalPanel.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -25,19 +25,17 @@ </u:selector> <u:selector name=".rich-mp-content"> - <u:style name="padding" value="0px" /> - <u:style name="background-color" value="transparent" /> + <u:style name="padding" value="0px" /> + <u:style name="border-color" skin="tableBorderColor" /> </u:selector> <u:selector name=".rich-mpnl-body"> <u:style name="background-color" skin="generalBackgroundColor" /> </u:selector> - + <u:selector name=".rich-mpnl-header"> - <u:style name="opacity" value="0.8" /> - <u:style name="filter" value="progid:DXImageTransform.Microsoft.Alpha(opacity=80);}" /> </u:selector> - + <u:selector name=".rich-mpnl-text"> </u:selector> @@ -49,7 +47,7 @@ <u:style name="border-top" value="0px" /> <u:style name="border-right" value="0px" /> <u:style name="border-left" value="0px" /> - <u:style name="border-bottom" skin="panelBorderColor" /> + <u:style name="border-color" skin="tableBorderColor" /> <u:style name="background-position" value="0% 50%" /> @@ -68,6 +66,17 @@ <u:selector name=".rich-mpnl-body"> <u:style name="padding" value="10px 10px 10px 14px" /> + <u:style name="background-position" value="0% 0%" /> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> + <f:attribute name="valign" value="top" /> + <f:attribute name="gradientType" value="plain" /> + <f:attribute name="gradientColor" skin="intShadow" /> + <f:attribute name="baseColor" skin="generalBackgroundColor" /> + + <f:attribute name="gradientHeight" value="4px" /> + </f:resource> + </u:style> </u:selector> <u:selector name=".rich-mpnl-mask-div"> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -6,6 +6,7 @@ <u:selector name=".rich-panel"> <u:style name="padding" value="0px" /> <u:style name="margin-bottom" value="5px" /> + <u:style name="border-color" skin="tableBorderColor" /> </u:selector> <u:selector name=".rich-panel-header"> @@ -13,7 +14,7 @@ <u:style name="border-top" value="0px" /> <u:style name="border-right" value="0px" /> <u:style name="border-left" value="0px" /> - <u:style name="border-bottom" skin="panelBorderColor" /> + <u:style name="border-color" skin="tableBorderColor" /> <u:style name="background-position" value="0% 50%" /> @@ -32,5 +33,16 @@ <u:selector name=".rich-panel-body"> <u:style name="padding" value="10px 10px 10px 14px" /> + <u:style name="background-position" value="0% 0%" /> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> + <f:attribute name="valign" value="top" /> + <f:attribute name="gradientType" value="plain" /> + <f:attribute name="gradientColor" skin="intShadow" /> + <f:attribute name="baseColor" skin="generalBackgroundColor" /> + + <f:attribute name="gradientHeight" value="4px" /> + </f:resource> + </u:style> </u:selector> </f:template> \ No newline at end of file Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelBar.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelBar.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelBar.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -4,27 +4,50 @@ xmlns="http://www.w3.org/1999/xhtml" > <u:selector name=".rich-panelbar"> - <u:style name="border-color" skin="panelBorderColor" /> + <u:style name="border-color" skin="tableBorderColor" /> <u:style name="padding" value="0px" /> </u:selector> <u:selector name=".rich-panelbar-header"> <u:style name="padding" value="4px 4px 4px 14px" /> - <u:style name="border-bottom" value="1px solid" /> - <u:style name="border-color" skin="generalBackgroundColor" /> - <u:style name="background-image" value="none" /> - <u:style name="background-color" skin="headerGradientColor" /> + <u:style name="background-position" value="0% 0%" /> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> + <f:attribute name="valign" value="top" /> + + <f:attribute name="gradientHeight" value="22px" /> + <f:attribute name="baseColor" skin="headerBackgroundColor" /> + </f:resource> + </u:style> </u:selector> <u:selector name=".rich-panelbar-header-act"> <u:style name="padding" value="4px 4px 4px 14px" /> <u:style name="border-bottom" value="1px solid" /> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="background-image" value="none" /> - <u:style name="background-color" skin="headerGradientColor" /> + <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="background-position" value="0% 0%" /> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> + <f:attribute name="valign" value="top" /> + + <f:attribute name="gradientHeight" value="22px" /> + <f:attribute name="baseColor" skin="headerBackgroundColor" /> + </f:resource> + </u:style> </u:selector> <u:selector name=".rich-panelbar-content"> - <u:style name="padding" value="4px 4px 4px 14px" /> + <u:style name="padding" value="10px 4px 4px 14px" /> + <u:style name="background-position" value="0% 0%" /> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> + <f:attribute name="valign" value="top" /> + <f:attribute name="gradientType" value="plain" /> + <f:attribute name="gradientColor" skin="intShadow" /> + <f:attribute name="baseColor" skin="generalBackgroundColor" /> + + <f:attribute name="gradientHeight" value="4px" /> + </f:resource> + </u:style> </u:selector> </f:template> \ No newline at end of file Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelMenu.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelMenu.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelMenu.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -9,6 +9,7 @@ <u:selector name=".dr-pmenu-top-group-div"> <u:style name="padding" value="0px" /> <u:style name="margin-bottom" value="1px" /> + <u:style name="border-color" skin="tableBorderColor" /> </u:selector> <u:selector name=".rich-pmenu-group"> @@ -27,6 +28,7 @@ <u:selector name=".rich-pmenu-item"> <u:style name="margin" value="0px" /> + <u:style name="border-color" skin="tableBorderColor" /> </u:selector> <u:selector name=".rich-pmenu-selected-element"> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/simpleTogglePanel.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/simpleTogglePanel.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/simpleTogglePanel.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -6,11 +6,14 @@ <u:selector name=".rich-stglpanel" > <u:style name="padding" value="0px" /> + <u:style name="border-color" skin="tableBorderColor" /> </u:selector> <u:selector name=".rich-stglpanel-header" > <u:style name="padding" value="4px 4px 4px 14px" /> <u:style name="border" value="0px" /> + <u:style name="border-bottom" value="1px solid" /> + <u:style name="border-color" skin="tableBorderColor" /> <u:style name="white-space" value="nowrap" /> <u:style name="background-position" value="0% 50%" /> @@ -31,5 +34,16 @@ <u:selector name=".rich-stglpanel-body" > <u:style name="padding" value="10px 10px 10px 14px" /> + <u:style name="background-position" value="0% 0%" /> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> + <f:attribute name="valign" value="top" /> + <f:attribute name="gradientType" value="plain" /> + <f:attribute name="gradientColor" skin="intShadow" /> + <f:attribute name="baseColor" skin="generalBackgroundColor" /> + + <f:attribute name="gradientHeight" value="4px" /> + </f:resource> + </u:style> </u:selector> </f:template> \ No newline at end of file Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/tabPanel.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/tabPanel.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/tabPanel.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -11,7 +11,7 @@ <u:selector name=".dr-bottom-line"> <u:style name="border-bottom-width" value="3px" /> - <u:style name="border-bottom-color" skin="headerGradientColor" /> + <u:style name="border-bottom-color" skin="headerBackgroundColor" /> </u:selector> <u:selector name=".rich-tab-label"> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/toolBar.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/toolBar.xcss 2008-05-12 16:44:50 UTC (rev 8529) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/toolBar.xcss 2008-05-12 16:46:06 UTC (rev 8530) @@ -7,6 +7,7 @@ <u:selector name=".rich-toolbar"> <u:style name="padding" value="0px 5px 0px 5px" /> <u:style name="height" value="0px" /> + <u:style name="border-color" skin="tableBorderColor" /> <u:style name="background-position" value="0% 50%" /> <u:style name="background-image">