Author: admitriev Date: 2008-06-04 10:58:48 -0400 (Wed, 04 Jun 2008) New Revision: 8901 Modified: trunk/sandbox/samples/darkX/src/main/resources/META-INF/skins/darkX.skin.properties trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/calendar.xcss trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/contextmenu.xcss trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/dataTable.xcss trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/datascroller.xcss trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/dropdownmenu.xcss trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/fileUpload.xcss trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/inplaceselect.xcss trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/inputNumberSpinner.xcss trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/sdt.xcss trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/standard.xcss trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/tabPanel.xcss Log: Modified: trunk/sandbox/samples/darkX/src/main/resources/META-INF/skins/darkX.skin.properties =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/META-INF/skins/darkX.skin.properties 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/META-INF/skins/darkX.skin.properties 2008-06-04 14:58:48 UTC (rev 8901) @@ -1,9 +1,9 @@ -baseSkin=wine +baseSkin=classic gradientType=plastic generalStyleSheet=resource:///META-INF/skins/darkX.xcss -headerBackgroundColor=#516738 +headerBackgroundColor=#1F4986 headerTextColor=#FFFFFF -intShadow=#A69E78 -newBorder=#B6AD84 +intShadow=#c0c0c0 +newBorder=#ADADAD generalTextColor=#474747 Modified: trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/calendar.xcss =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/calendar.xcss 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/calendar.xcss 2008-06-04 14:58:48 UTC (rev 8901) @@ -30,7 +30,7 @@ <u:selector name=".rich-calendar-cell"> <u:style name="border-color" skin="newBorder" /> -</u:selector> + </u:selector> <u:selector name=".rich-calendar-tool"> <u:style name="background-repeat" value="repeat-x" /> @@ -248,7 +248,6 @@ </u:selector> <u:selector name=".rich-calendar-cell-size"> - <u:style name="width" value="27px" /> </u:selector> <u:selector name=".rich-calendar-cell-div"> Modified: trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/contextmenu.xcss =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/contextmenu.xcss 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/contextmenu.xcss 2008-06-04 14:58:48 UTC (rev 8901) @@ -1,10 +1,10 @@ -<?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-cm-attached"> - </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-cm-attached"> + </u:selector> + + </f:template> \ No newline at end of file Modified: trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/dataTable.xcss =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/dataTable.xcss 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/dataTable.xcss 2008-06-04 14:58:48 UTC (rev 8901) @@ -31,26 +31,26 @@ </u:selector> <u:selector name=".rich-table-header" > - <u:style name="background-position" value="0% 50%" /> + <u:style name="background-position" value="0% 0%" /> <u:style name="padding" value="6px " /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> - <f:attribute name="valign" value="middle" /> + <f:attribute name="valign" value="top" /> - <f:attribute name="gradientHeight" value="28px" /> + <f:attribute name="gradientHeight" value="22px" /> <f:attribute name="baseColor" skin="headerBackgroundColor" /> </f:resource> </u:style> </u:selector> <u:selector name=".rich-table-header-continue" > - <u:style name="background-position" value="0% 50%" /> + <u:style name="background-position" value="0% 100%" /> <u:style name="padding" value="6px " /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> - <f:attribute name="valign" value="middle" /> + <f:attribute name="valign" value="top" /> - <f:attribute name="gradientHeight" value="28px" /> + <f:attribute name="gradientHeight" value="22px" /> <f:attribute name="baseColor" skin="headerBackgroundColor" /> </f:resource> </u:style> Modified: trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/datascroller.xcss =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/datascroller.xcss 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/datascroller.xcss 2008-06-04 14:58:48 UTC (rev 8901) @@ -8,16 +8,21 @@ <u:selector name=".rich-dtascroller-table"> <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="background-color" skin="generalBackgroundColor" /> </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="border-color" skin="panelBorderColor" /> + <u:style name="color" skin="headerTextColor" /> + <u:style name="vertical-align" value="middle" /> + <u:style name="font-size" value="150%" /> + <u:style name="line-height" value="50%" /> + <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="top" /> + <f:attribute name="valign" value="middle" /> - <f:attribute name="gradientHeight" value="16px" /> + <f:attribute name="gradientHeight" value="22px" /> <f:attribute name="baseColor" skin="headerBackgroundColor" /> </f:resource> </u:style> @@ -25,12 +30,13 @@ <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="color" skin="panelBorderColor" /> + <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="top" /> + <f:attribute name="valign" value="middle" /> - <f:attribute name="gradientHeight" value="16px" /> + <f:attribute name="gradientHeight" value="22px" /> <f:attribute name="baseColor" skin="headerGradientColor" /> </f:resource> </u:style> @@ -43,5 +49,6 @@ </u:selector> <u:selector name=".rich-datascr-inact"> + <u:style name="color" skin="headerBackgroundColor" /> </u:selector> </f:template> \ No newline at end of file Modified: trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/dropdownmenu.xcss =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/dropdownmenu.xcss 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/dropdownmenu.xcss 2008-06-04 14:58:48 UTC (rev 8901) @@ -16,6 +16,7 @@ </u:selector> <u:selector name=".rich-menu-list-border"> + <u:style name="background-color" skin="generalBackgroundColor" /> <u:style name="filter" value="alpha(opacity=90)" /> <u:style name="opacity" value="0.9" /> </u:selector> Modified: trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/fileUpload.xcss =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/fileUpload.xcss 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/fileUpload.xcss 2008-06-04 14:58:48 UTC (rev 8901) @@ -17,6 +17,7 @@ </u:selector> <u:selector name=".rich-fileupload-toolbar-decor"> + <u:style name="background-color" skin="generalBackgroundColor" /> </u:selector> <u:selector name=".rich-fileupload-button-border"> @@ -121,6 +122,7 @@ </u:selector> <u:selector name=".rich-fileupload-list-overflow"> + <u:style name="background-color" skin="generalBackgroundColor" /> </u:selector> </f:template> Modified: trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/inplaceselect.xcss =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/inplaceselect.xcss 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/inplaceselect.xcss 2008-06-04 14:58:48 UTC (rev 8901) @@ -30,20 +30,6 @@ <u:selector name=".rich-inplace-select-list-decoration"> </u:selector> - <u:selector name=".rich-inplace-select-selected-item"> - <u:style name="background-position" value="0% 50%" /> - <u:style name="border-color" skin="newBorder" /> - <u:style name="color" skin="headerTextColor" /> - <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="36px" /> - <f:attribute name="baseColor" skin="headerBackgroundColor" /> - </f:resource> - </u:style> - </u:selector> - <u:selector name=".rich-inplace-select-shadow-tl"> </u:selector> @@ -98,4 +84,17 @@ <u:selector name=".rich-inplace-select-changed-hover"> </u:selector> + <u:selector name=".rich-inplace-select-selected-item"> + <u:style name="background-position" value="0% 50%" /> + <u:style name="border-color" skin="newBorder" /> + <u:style name="color" skin="headerTextColor" /> + <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="36px" /> + <f:attribute name="baseColor" skin="headerBackgroundColor" /> + </f:resource> + </u:style> + </u:selector> + </f:template> \ No newline at end of file Modified: trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/inputNumberSpinner.xcss =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/inputNumberSpinner.xcss 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/inputNumberSpinner.xcss 2008-06-04 14:58:48 UTC (rev 8901) @@ -9,7 +9,7 @@ <u:selector name=".rich-spinner-c"> </u:selector> - <u:selector name=".dr-spnr-b"> + <u:selector name=".rich-spinner-buttons"> <u:style name="background-position" value="0% 50%" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> @@ -19,6 +19,7 @@ <f:attribute name="baseColor" skin="headerBackgroundColor" /> </f:resource> </u:style> + <u:style name="border-style" value="outset" /> </u:selector> <u:selector name=".rich-spinner-button"> Modified: trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/sdt.xcss =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/sdt.xcss 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/sdt.xcss 2008-06-04 14:58:48 UTC (rev 8901) @@ -29,7 +29,7 @@ </u:selector> <u:selector name=".rich-sdt-header-cell" > - <u:style name="padding-top" value="3px" /> + <u:style name="padding-top" value="5px" /> <u:style name="background-position" value="0% 50%" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> Modified: trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/standard.xcss =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/standard.xcss 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/standard.xcss 2008-06-04 14:58:48 UTC (rev 8901) @@ -46,6 +46,45 @@ </u:style> </u:selector> + <u:selector name="*|button[disabled]"> + <u:style name="font-weight" value="bold" /> + <u:style name="border-color" skin="panelBorderColor" /> + <u:style name="font-size" skin="generalSizeFont" /> + <u:style name="font-family" skin="generalFamilyFont" /> + <u:style name="background-color" skin="panelBorderColor" /> + <u:style name="padding" value="2px 0px 1px 0px " /> + + <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="36px" /> + <f:attribute name="baseColor" skin="panelBorderColor" /> + </f:resource> + </u:style> + </u:selector> + + <u:selector name="button[type=&quot;button&quot;][disabled], button[type=&quot;reset&quot;][disabled], button[type=&quot;submit&quot;][disabled], + input[type=&quot;reset&quot;][disabled], input[type=&quot;submit&quot;][disabled], input[type=&quot;button&quot;][disabled]"> + <u:style name="font-weight" value="bold" /> + <u:style name="border-color" skin="panelBorderColor" /> + <u:style name="font-size" skin="generalSizeFont" /> + <u:style name="font-family" skin="generalFamilyFont" /> + <u:style name="background-color" skin="panelBorderColor" /> + <u:style name="padding" value="2px 0px 1px 0px " /> + + <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="36px" /> + <f:attribute name="baseColor" skin="panelBorderColor" /> + </f:resource> + </u:style> + </u:selector> + <u:selector name=".rich-input" > Modified: trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/tabPanel.xcss =================================================================== --- trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/tabPanel.xcss 2008-06-04 14:07:49 UTC (rev 8900) +++ trunk/sandbox/samples/darkX/src/main/resources/org/richfaces/skins/darkx/css/tabPanel.xcss 2008-06-04 14:58:48 UTC (rev 8901) @@ -17,7 +17,7 @@ </u:selector> <u:selector name=".rich-tab-active"> - <u:style name="color" skin="headerTextColor" /> + <u:style name="color" skin="generalTextColor" /> <u:style name="background-position" value="0% 0%" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> @@ -32,23 +32,25 @@ <u:selector name=".rich-tab-inactive"> <u:style name="background-position" value="0% 50%" /> + <u:style name="color" skin="generalTextColor" /> + <u:style name="background-color" skin="generalBackgroundColor" /> <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="22px" /> - <f:attribute name="baseColor" skin="headerBackgroundColor" /> + <f:attribute name="baseColor" skin="panelBorderColor" /> </f:resource> </u:style> </u:selector> <u:selector name=".rich-tab-disabled"> - <u:style name="color" skin="generalBackgroundColor" /> + <u:style name="color" skin="tabDisabledTextColor" /> <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="22px" /> - <f:attribute name="baseColor" skin="headerBackgroundColor" /> + <f:attribute name="baseColor" skin="panelBorderColor" /> </f:resource> </u:style> </u:selector>