[richfaces-svn-commits] JBoss Rich Faces SVN: r17173 - in root/core/trunk/impl/src/main: resources/META-INF/resources and 1 other directory.

Author: nbelaevski Date: 2010-05-21 09:05:57 -0400 (Fri, 21 May 2010) New Revision: 17173 Added: root/core/trunk/impl/src/main/resources/META-INF/resources/skinning.ecss root/core/trunk/impl/src/main/resources/META-INF/resources/skinning_both.ecss root/core/trunk/impl/src/main/resources/META-INF/resources/skinning_classes.ecss Removed: root/core/trunk/impl/src/main/resources/META-INF/resources/basic.ecss root/core/trunk/impl/src/main/resources/META-INF/resources/basic_both.ecss root/core/trunk/impl/src/main/resources/META-INF/resources/basic_classes.ecss root/core/trunk/impl/src/main/resources/META-INF/resources/extended.ecss root/core/trunk/impl/src/main/resources/META-INF/resources/extended_both.ecss root/core/trunk/impl/src/main/resources/META-INF/resources/extended_classes.ecss Modified: root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java Log: https://jira.jboss.org/browse/RF-8457 Modified: root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java =================================================================== --- root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java 2010-05-21 12:58:49 UTC (rev 17172) +++ root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java 2010-05-21 13:05:57 UTC (rev 17173) @@ -51,28 +51,28 @@ private static final String BOTH_ECSS = "_both.ecss"; - private static final String BASIC_CONTROLS; + private static final String CONTROLS_SKINNING; - private static final String BASIC_BOTH; + private static final String BOTH_SKINNING; - private static final String BASIC_CLASSES; + private static final String CLASSES_SKINNING; private static final String STYLESHEET_RENDERER = "javax.faces.resource.Stylesheet"; static { - String basicName = "basic"; + String skinningName = "skinning"; - BASIC_CONTROLS = basicName + ECSS; - BASIC_BOTH = basicName + BOTH_ECSS; - BASIC_CLASSES = basicName + CLASSES_ECSS; + CONTROLS_SKINNING = skinningName + ECSS; + BOTH_SKINNING = skinningName + BOTH_ECSS; + CLASSES_SKINNING = skinningName + CLASSES_ECSS; } - private static final class BasicResourceName extends BaseReadOnlyValueExpression { + private static final class SkinningResourceNameExpression extends BaseReadOnlyValueExpression { private static final long serialVersionUID = 7520575496522682120L; - public BasicResourceName() { + public SkinningResourceNameExpression() { super(String.class); } @@ -84,23 +84,23 @@ boolean classes = ContextInitParameters.isStandardControlSkinningClassesEnabled(facesContext); if (controls && classes) { - return BASIC_BOTH; + return BOTH_SKINNING; } if (classes) { - return BASIC_CLASSES; + return CLASSES_SKINNING; } - return BASIC_CONTROLS; + return CONTROLS_SKINNING; } } - private static final class BasicResourceRendered extends BaseReadOnlyValueExpression { + private static final class SkinningResourceRenderedExpression extends BaseReadOnlyValueExpression { private static final long serialVersionUID = -1579256471133808739L; - public BasicResourceRendered() { + public SkinningResourceRenderedExpression() { super(Boolean.TYPE); } @@ -138,8 +138,8 @@ attributes.put(RESOURCES_PROCESSED_MARKER, Boolean.TRUE); UIComponent basic = createComponentResource(context); - basic.setValueExpression("name", new BasicResourceName()); - basic.setValueExpression("rendered", new BasicResourceRendered()); + basic.setValueExpression("name", new SkinningResourceNameExpression()); + basic.setValueExpression("rendered", new SkinningResourceRenderedExpression()); viewRoot.addComponentResource(context, basic); } Deleted: root/core/trunk/impl/src/main/resources/META-INF/resources/basic.ecss =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources/basic.ecss 2010-05-21 12:58:49 UTC (rev 17172) +++ root/core/trunk/impl/src/main/resources/META-INF/resources/basic.ecss 2010-05-21 13:05:57 UTC (rev 17173) @@ -1,75 +0,0 @@ -/* basic skinning styles */ - -input, select, textarea, button, keygen, isindex, legend, a { - font-size : '#{richSkin.generalSizeFont}'; - font-family : '#{richSkin.generalFamilyFont}'; - color : '#{richSkin.controlTextColor}'; -} -fieldset { - border-width: 1px; - border-style: solid; - padding: 10px; - border-color : '#{richSkin.panelBorderColor}'; -} -hr { - border-width: 1px; - border-style: solid; - border-color : '#{richSkin.panelBorderColor}'; -} -a { - color : '#{richSkin.generalLinkColor}'; -} -a:hover { - color : '#{richSkin.hoverLinkColor}'; -} -a:visited { - color : '#{richSkin.visitedLinkColor}'; -} - -/* extended skinning styles */ - -input, select, textarea, button, keygen, isindex { - border-width: 1px; - border-color: '#{richSkin.panelBorderColor}'; - color: '#{richSkin.controlTextColor}'; -} - -button, input[type="reset"], input[type="submit"], input[type="button"] { - border-width: 1px; - border-color: '#{richSkin.panelBorderColor}'; - - font-size: '#{richSkin.generalSizeFont}'; - font-family: '#{richSkin.generalFamilyFont}'; - color: '#{richSkin.headerTextColor}'; - - background-repeat: repeat-x; - background-position: top left; - background-color: '#{richSkin.headerBackgroundColor}'; - background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; -} - -button[disabled], input[type="reset"][disabled], input[type="submit"][disabled], input[type="button"][disabled] { - color: '#{richSkin.tabDisabledTextColor}'; - border-color: '#{richSkin.tableFooterBackgroundColor}'; - background-color: '#{richSkin.tableFooterBackgroundColor}'; - background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})"; -} - -textarea, input[type="text"], input[type="password"], select { - border-width: 1px; - border-style: inset; - border-color: '#{richSkin.panelBorderColor}'; - - font-size: '#{richSkin.generalSizeFont}'; - font-family: '#{richSkin.generalFamilyFont}'; - color: '#{richSkin.controlTextColor}'; - - background-repeat: no-repeat; - background-position: 1px 1px; - background-color: '#{richSkin.controlBackgroundColor}'; - background-image: "url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})"; -} - -textarea[disabled], input[type="text"][disabled], input[type="password"][disabled], select[disabled] { - color: '#{richSkin.panelBorderColor}'; -} \ No newline at end of file Deleted: root/core/trunk/impl/src/main/resources/META-INF/resources/basic_both.ecss =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources/basic_both.ecss 2010-05-21 12:58:49 UTC (rev 17172) +++ root/core/trunk/impl/src/main/resources/META-INF/resources/basic_both.ecss 2010-05-21 13:05:57 UTC (rev 17173) @@ -1,2 +0,0 @@ -@import url("#{resource['basic.ecss']}"); -@import url("#{resource['basic_classes.ecss']}"); \ No newline at end of file Deleted: root/core/trunk/impl/src/main/resources/META-INF/resources/basic_classes.ecss =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources/basic_classes.ecss 2010-05-21 12:58:49 UTC (rev 17172) +++ root/core/trunk/impl/src/main/resources/META-INF/resources/basic_classes.ecss 2010-05-21 13:05:57 UTC (rev 17173) @@ -1,425 +0,0 @@ -/* basic skinning styles */ - -.rich-container input, .rich-input, .rich-container select, .rich-select, -.rich-container textarea, .rich-textarea, .rich-container button, .rich-button, -.rich-container keygen, .rich-keygen,.rich-container isindex, .rich-isindex, -.rich-container legend, .rich-legend,.rich-container a, .rich-link, -.rich-container fieldset, .rich-fieldset,.rich-field, .rich-field-edit, .rich-field-error, -.rich-button, .rich-button-disabled, .rich-button-over, .rich-button-press { - font-size : '#{richSkin.generalSizeFont}'; - font-family : '#{richSkin.generalFamilyFont}'; - color : '#{richSkin.controlTextColor}'; -} - -.rich-container fieldset, .rich-fieldset { - border-width: 1px; - border-style: solid; - padding: 10px; -} - -.rich-container hr, .rich-hr { - border-width: 1px; - border-style: solid; -} - -.rich-container legend, .rich-legend { - font-weight : bold; -} - -.rich-container form, .rich-form { - padding : 0px; - margin : 0px; -} - -.rich-container fieldset, .rich-fieldset{ - border-color : '#{richSkin.panelBorderColor}'; -} - -.rich-container hr, .rich-hr{ - border-color : '#{richSkin.panelBorderColor}'; -} - -.rich-container a, .rich-link{ - color: '#{richSkin.generalLinkColor}'; -} - -.rich-container a:hover, .rich-link:hover{ - color : '#{richSkin.hoverLinkColor}'; -} - -.rich-container a:visited, .rich-link:visited{ - color : '#{richSkin.visitedLinkColor}'; -} - -.rich-field, .rich-field-edit, .rich-field-error{ - border-width: 1px; - border-style: inset; - border-color: '#{richSkin.panelBorderColor}'; -} - -.rich-field{ - background-color : '#{richSkin.controlBackgroundColor}'; - background-image : "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; - background-repeat : no-repeat; - background-position : 1px 1px; -} - -.rich-field-edit{ - background-color : '#{richSkin.editBackgroundColor}'; -} - -.rich-field-error{ - background-color : '#{richSkin.warningBackgroundColor}'; - background-image : "url(#{resource['org.richfaces.renderkit.html.images.InputErrorIcon']})"; - background-repeat : no-repeat; - background-position : center left; - padding-left : 7px; -} - -.rich-button, .rich-button-disabled, .rich-button-over, .rich-button-press{ - border-width : 1px; - border-style : solid; - border-color : '#{richSkin.panelBorderColor}'; - background-color : '#{richSkin.trimColor}'; - padding : 2px 10px 2px 10px; - text-align : center; - cursor : pointer; - background-repeat : repeat-x; - background-position : top left; -} - -.rich-button{ - background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})"; -} - -.rich-button-disabled{ - background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})"; -} - -.rich-button-over{ - background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})"; -} - -.rich-button-press{ - background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonPressedBgImage']})"; - background-position : bottom left; -} - - /*border color styles*/ - -.rich-box-border-color-control-select{ - border-color : '#{richSkin.selectControlColor}'; -} - -.rich-box-border-color-subborder{ - border-color : '#{richSkin.subBorderColor}'; -} - -.rich-box-border-color-header{ - border-color : '#{richSkin.headerBackgroundColor}'; -} - -.rich-box-border-color-general{ - border-color : '#{richSkin.generalBackgroundColor}'; -} - -.rich-box-border-color-additional{ - border-color : '#{richSkin.additionalBackgroundColor}'; -} - -.rich-box-border-color-panel{ - border-color : '#{richSkin.panelBorderColor}'; -} - -.rich-box-border-color-tip{ - border-color : '#{richSkin.tipBorderColor}'; -} - -.rich-box-border-color-table{ - border-color : '#{richSkin.tableBorderColor}'; -} - -.rich-box-border-control-select, .rich-box-border-subborder, .rich-box-border-header, - .rich-box-border-general, .rich-box-border-additional, .rich-box-border-panel, .rich-box-border-tip, .rich-box-border-table{ - border-style : solid; - border-width : 1px; -} - -.rich-box-border-control-select{ - border-color : '#{richSkin.selectControlColor}'; -} - -.rich-box-border-subborder{ - border-color : '#{richSkin.subBorderColor}'; -} - -.rich-box-border-header{ - border-color : '#{richSkin.headerBackgroundColor}'; -} - -.rich-box-border-general{ - border-color : '#{richSkin.generalBackgroundColor}'; -} - -.rich-box-border-additional{ - border-color : '#{richSkin.additionalBackgroundColor}'; -} - -.rich-box-border-panel{ - border-color : '#{richSkin.panelBorderColor}'; -} - -.rich-box-border-tip{ - border-color : '#{richSkin.tipBorderColor}'; -} - -.rich-box-border-table{ - border-color : '#{richSkin.tableBorderColor}'; -} - - /*background color styles*/ - -.rich-box-bgcolor-header{ - background-color : '#{richSkin.headerBackgroundColor}'; -} - -.rich-box-bgcolor-general{ - background-color : '#{richSkin.generalBackgroundColor}'; -} - -.rich-box-bgcolor-additional{ - background-color : '#{richSkin.additionalBackgroundColor}'; -} - -.rich-box-bgcolor-panel{ - background-color : '#{richSkin.panelBorderColor}'; -} - -.rich-box-bgcolor-tab{ - background-color : '#{richSkin.tabBackgroundColor}'; -} - -.rich-box-bgcolor-trim{ - background-color : '#{richSkin.trimColor}'; -} - -.rich-box-bgcolor-tip{ - background-color : '#{richSkin.tipBackgroundColor}'; -} - -.rich-box-bgcolor-table{ - background-color : '#{richSkin.tableBackgroundColor}'; -} - -.rich-box-bgcolor-table-footer{ - background-color : '#{richSkin.tableFooterBackgroundColor}'; -} - -.rich-box-bgcolor-table-subfooter{ - background-color : '#{richSkin.tableSubfooterBackgroundColor}'; -} - -.rich-box-bgcolor-editor{ - background-color : '#{richSkin.editorBackgroundColor}'; -} - -.rich-box-bgcolor-edit{ - background-color : '#{richSkin.editBackgroundColor}'; -} - - /*text color styles*/ - -.rich-text-color-header{ - color : '#{richSkin.headerTextColor}'; -} - -.rich-text-color-general{ - color : '#{richSkin.generalTextColor}'; -} - -.rich-text-color-tab-disabled{ - color : '#{richSkin.tabDisabledTextColor}'; -} - -.rich-text-color-select{ - color : '#{richSkin.selectControlColor}'; -} - -.rich-text-color-link-general{ - color : '#{richSkin.generalLinkColor}'; -} - -.rich-text-color-link-hover{ - color : '#{richSkin.hoverLinkColor}'; -} - -.rich-text-color-link-visited{ - color : '#{richSkin.visitedLinkColor}'; -} - - /*font size styles*/ - -.rich-font-size-general{ - font-size : '#{richSkin.generalSizeFont}'; -} - -.rich-font-size-header{ - font-size : '#{richSkin.headerSizeFont}'; -} - - /*font family styles*/ - -.rich-font-family-general{ - font-family : '#{richSkin.generalFamilyFont}'; -} - -.rich-font-family-header{ - font-family : '#{richSkin.headerFamilyFont}'; -} - - /* text styles */ - -.rich-text-general{ - font-size : '#{richSkin.generalSizeFont}'; - font-family : '#{richSkin.generalFamilyFont}'; - color : '#{richSkin.generalTextColor}'; -} - -.rich-text-header{ - font-size : '#{richSkin.generalSizeFont}'; - font-family : '#{richSkin.headerFamilyFont}'; - color : '#{richSkin.headerTextColor}'; -} - -.rich-text-tab-disabled{ - font-size : '#{richSkin.generalSizeFont}'; - font-family : '#{richSkin.generalFamilyFont}'; - color : '#{richSkin.tabDisabledTextColor}'; -} - -.rich-text-control-select{ - font-size : '#{richSkin.generalSizeFont}'; - font-family : '#{richSkin.headerFamilyFont}; - color : '#{richSkin.selectControlColor}'; -} - - /*gradient styles*/ - -.rich-gradient-header-inverse{ - background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.HeaderInverseGradientImage']})"; - background-repeat : repeat-x; -} - -.rich-gradient-header{ - background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.HeaderGradientImage']})"; - background-repeat : repeat-x; -} - -.rich-gradient-tab{ - background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.TabGradientImage']})"; - background-repeat : repeat-x; -} - -.rich-gradient-tab-inverse{ - background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.TabInverseGradientImage']})"; - background-repeat : repeat-x; -} - -.rich-gradient-input{ - background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.InputGradientImage']})"; - background-repeat : repeat-x; -} - -.rich-gradient-menu-inverse{ - background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.MenuInverseGradientImage']})"; - background-repeat : repeat-x; -} - -.rich-gradient-menu{ - background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.MenuGradientImage']})"; - background-repeat : repeat-x; -} - -.rich-gradient-button-inverse{ - background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.ButtonInverseGradientImage']})"; - background-repeat : repeat-x; -} - -.rich-gradient-button{ - background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.ButtonGradientImage']})"; - background-repeat : repeat-x; -} - -/* extended skinning styles */ - -.rich-container input, .rich-input, -.rich-container select, .rich-select, -.rich-container textarea, .rich-textarea, -.rich-container button, .rich-button, -.rich-container keygen, .rich-keygen, -.rich-container isindex, .rich-isindex { - border-width:1px; - border-color:'#{richSkin.panelBorderColor}'; - color:'#{richSkin.controlTextColor}'; -} - -.rich-container button, .rich-button, -.rich-button-button, -.rich-button-reset, -.rich-button-submit, -.rich-container input[type="reset"], .rich-input-reset, -.rich-container input[type="submit"], .rich-input-submit, -.rich-container input[type="button"], .rich-input-button { - border-width: 1px; - border-color:'#{richSkin.panelBorderColor}'; - - background-repeat : repeat-x; - background-position : top left; - background-color:'#{richSkin.headerBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; - - font-size:'#{richSkin.generalSizeFont}'; - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.headerTextColor}'; -} - -.rich-container button[disabled], .rich-button-disabled, -.rich-button-button-disabled, -.rich-button-reset-disabled, -.rich-button-submit-disabled, -.rich-container input[type="reset"][disabled], .rich-input-reset-disabled, -.rich-container input[type="submit"][disabled], .rich-input-submit-disabled, -.rich-container input[type="button"][disabled], .rich-input-button-disabled { - color:'#{richSkin.tabDisabledTextColor}'; - background-color:'#{richSkin.tableFooterBackgroundColor}'; - border-color:'#{richSkin.tableFooterBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})"; -} - - -.rich-container textarea, .rich-textarea, -.rich-textarea-textarea, -.rich-container input[type="text"], .rich-input-text, -.rich-container input[type="password"], .rich-input-password, -.rich-container select, .rich-select { - border-width: 1px; - border-style : inset; - border-color:'#{richSkin.panelBorderColor}'; - - background-repeat : no-repeat; - background-position : 1px 1px; - background-color:'#{richSkin.controlBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})"; - - font-size:'#{richSkin.generalSizeFont}'; - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.controlTextColor}'; -} - -.rich-container textarea[disabled], .rich-textarea-disabled, -.rich-textarea-textarea-disabled, -.rich-container input[type="text"][disabled], .rich-input-text-disabled, -.rich-container input[type="password"][disabled], .rich-input-password-disabled, -.rich-container select[disabled], .rich-select-disabled { - color:'#{richSkin.panelBorderColor}'; -} \ No newline at end of file Deleted: root/core/trunk/impl/src/main/resources/META-INF/resources/extended.ecss =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources/extended.ecss 2010-05-21 12:58:49 UTC (rev 17172) +++ root/core/trunk/impl/src/main/resources/META-INF/resources/extended.ecss 2010-05-21 13:05:57 UTC (rev 17173) @@ -1,86 +0,0 @@ -input, select, textarea, button, keygen, isindex{ - border-width:1px; - border-color:'#{richSkin.panelBorderColor}'; - color:'#{richSkin.controlTextColor}'; -} - - - *|button { - border-width: 1px; - background-repeat : repeat-x; - background-position : top left; - } - - button[type="button"], button[type="reset"], button[type="submit"], input[type="reset"], input[type="submit"], input[type="button"] { - border-width: 1px; - background-repeat : repeat-x; - background-position : top left; - } - - - *|button{ - border-color:'#{richSkin.panelBorderColor}'; - font-size:'#{richSkin.generalSizeFont}'; - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.headerTextColor}'; - background-color:'#{richSkin.headerBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; -} -button[type="button"], button[type="reset"], button[type="submit"], input[type="reset"], input[type="submit"], input[type="button"]{ - border-color:'#{richSkin.panelBorderColor}'; - font-size:'#{richSkin.generalSizeFont}'; - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.headerTextColor}'; - background-color:'#{richSkin.headerBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; -} -*|button[disabled]{ - color:'#{richSkin.tabDisabledTextColor}'; - border-color:'#{richSkin.tableFooterBackgroundColor}'; - background-color:'#{richSkin.tableFooterBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})"; -} -button[type="button"][disabled], button[type="reset"][disabled], button[type="submit"][disabled], input[type="reset"][disabled], input[type="submit"][disabled], input[type="button"][disabled]{ - color:'#{richSkin.tabDisabledTextColor}'; - border-color:'#{richSkin.tableFooterBackgroundColor}'; - background-color:'#{richSkin.tableFooterBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})"; -} - - - *|textarea { - border-width: 1px; - border-style : inset; - background-repeat : no-repeat; - background-position : 1px 1px; - } - - textarea[type="textarea"], input[type="text"], input[type="password"], select { - border-width: 1px; - border-style : inset; - background-repeat : no-repeat; - background-position : 1px 1px; - } - - *|textarea{ - border-color:'#{richSkin.panelBorderColor}'; - font-size:'#{richSkin.generalSizeFont}'; - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.controlTextColor}'; - background-color:'#{richSkin.controlBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})"; -} -textarea[type="textarea"], input[type="text"], input[type="password"], select{ - border-color:'#{richSkin.panelBorderColor}'; - font-size:'#{richSkin.generalSizeFont}'; - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.controlTextColor}'; - background-color:'#{richSkin.controlBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})"; -} -*|textarea[disabled], *|select[disabled]{ - color:'#{richSkin.panelBorderColor}'; -} -textarea[type="textarea"][disabled], input[type="text"][disabled], input[type="password"][disabled], select[disabled]{ - color:'#{richSkin.panelBorderColor}'; -} \ No newline at end of file Deleted: root/core/trunk/impl/src/main/resources/META-INF/resources/extended_both.ecss =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources/extended_both.ecss 2010-05-21 12:58:49 UTC (rev 17172) +++ root/core/trunk/impl/src/main/resources/META-INF/resources/extended_both.ecss 2010-05-21 13:05:57 UTC (rev 17173) @@ -1,2 +0,0 @@ -@import url("#{resource['extended.ecss']}"); -@import url("#{resource['extended_classes.ecss']}"); \ No newline at end of file Deleted: root/core/trunk/impl/src/main/resources/META-INF/resources/extended_classes.ecss =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources/extended_classes.ecss 2010-05-21 12:58:49 UTC (rev 17172) +++ root/core/trunk/impl/src/main/resources/META-INF/resources/extended_classes.ecss 2010-05-21 13:05:57 UTC (rev 17173) @@ -1,96 +0,0 @@ -.rich-container input, .rich-input, .rich-container select, .rich-select, .rich-container textarea, .rich-textarea, .rich-container button, .rich-button, .rich-container keygen, .rich-keygen, .rich-container isindex, .rich-isindex{ - border-width:1px; - border-color:'#{richSkin.panelBorderColor}'; - color:'#{richSkin.controlTextColor}'; -} - - - .rich-container *|button, .rich-button { - border-width: 1px; - background-repeat : repeat-x; - background-position : top left; - } - - .rich-button, - .rich-container button[type="button"], .rich-button-button, - .rich-container button[type="reset"], .rich-button-reset, - .rich-container button[type="submit"], .rich-button-submit, - .rich-container input[type="reset"], .rich-input-reset, - .rich-container input[type="submit"], .rich-input-submit, - .rich-container input[type="button"], .rich-input-button { - border-width: 1px; - background-repeat : repeat-x; - background-position : top left; - } - - - .rich-container *|button, .rich-button{ - border-color:'#{richSkin.panelBorderColor}'; - font-size:'#{richSkin.generalSizeFont}'; - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.headerTextColor}'; - background-color:'#{richSkin.headerBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; -} - .rich-button, .rich-container button[type="button"], .rich-button-button, .rich-container button[type="reset"], .rich-button-reset, .rich-container button[type="submit"], .rich-button-submit, .rich-container input[type="reset"], .rich-input-reset, .rich-container input[type="submit"], .rich-input-submit, .rich-container input[type="button"], .rich-input-button { - border-color:'#{richSkin.panelBorderColor}'; - font-size:'#{richSkin.generalSizeFont}'; - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.headerTextColor}'; - background-color:'#{richSkin.headerBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; -} -.rich-container *|button[disabled]{ - color:'#{richSkin.tabDisabledTextColor}'; - background-color:'#{richSkin.tableFooterBackgroundColor}'; - border-color:'#{richSkin.tableFooterBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})"; -} -.rich-button-disabled, .rich-container button[type="button"][disabled], .rich-button-button-disabled, .rich-container button[type="reset"][disabled], .rich-button-reset-disabled, .rich-container button[type="submit"][disabled], .rich-button-submit-disabled, .rich-container input[type="reset"][disabled], .rich-input-reset-disabled, .rich-container input[type="submit"][disabled], .rich-input-submit-disabled, .rich-container input[type="button"][disabled], .rich-input-button-disabled{ - color:'#{richSkin.tabDisabledTextColor}'; - background-color:'#{richSkin.tableFooterBackgroundColor}'; - border-color:'#{richSkin.tableFooterBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})"; -} - - - .rich-container *|textarea { - border-width: 1px; - border-style : inset; - background-repeat : no-repeat; - background-position : 1px 1px; - } - - .rich-textarea, - .rich-container textarea[type="textarea"], .rich-textarea-textarea, - .rich-container input[type="text"], .rich-input-text, - .rich-container input[type="password"], .rich-input-password, - .rich-container select, .rich-select { - border-width: 1px; - border-style : inset; - background-repeat : no-repeat; - background-position : 1px 1px; - } - - .rich-container *|textarea{ - border-color:'#{richSkin.panelBorderColor}'; - font-size:'#{richSkin.generalSizeFont}'; - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.controlTextColor}'; - background-color:'#{richSkin.controlBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})"; -} -.rich-textarea, .rich-container textarea[type="textarea"], .rich-textarea-textarea, .rich-container input[type="text"], .rich-input-text, .rich-container input[type="password"], .rich-input-password, .rich-container select, .rich-select{ - border-color:'#{richSkin.panelBorderColor}'; - font-size:'#{richSkin.generalSizeFont}'; - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.controlTextColor}'; - background-color:'#{richSkin.controlBackgroundColor}'; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})"; -} -.rich-container *|textarea[disabled], .rich-container *|select[disabled]{ - color:'#{richSkin.panelBorderColor}'; -} -.rich-textarea-disabled, .rich-container textarea[type="textarea"][disabled], .rich-textarea-textarea-disabled, .rich-container input[type="text"][disabled], .rich-input-text-disabled, .rich-container input[type="password"][disabled], .rich-input-password-disabled, .rich-container select[disabled], .rich-select-disabled{ - color:'#{richSkin.panelBorderColor}'; -} \ No newline at end of file Copied: root/core/trunk/impl/src/main/resources/META-INF/resources/skinning.ecss (from rev 17172, root/core/trunk/impl/src/main/resources/META-INF/resources/basic.ecss) =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources/skinning.ecss (rev 0) +++ root/core/trunk/impl/src/main/resources/META-INF/resources/skinning.ecss 2010-05-21 13:05:57 UTC (rev 17173) @@ -0,0 +1,75 @@ +/* basic skinning styles */ + +input, select, textarea, button, keygen, isindex, legend, a { + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.generalFamilyFont}'; + color : '#{richSkin.controlTextColor}'; +} +fieldset { + border-width: 1px; + border-style: solid; + padding: 10px; + border-color : '#{richSkin.panelBorderColor}'; +} +hr { + border-width: 1px; + border-style: solid; + border-color : '#{richSkin.panelBorderColor}'; +} +a { + color : '#{richSkin.generalLinkColor}'; +} +a:hover { + color : '#{richSkin.hoverLinkColor}'; +} +a:visited { + color : '#{richSkin.visitedLinkColor}'; +} + +/* extended skinning styles */ + +input, select, textarea, button, keygen, isindex { + border-width: 1px; + border-color: '#{richSkin.panelBorderColor}'; + color: '#{richSkin.controlTextColor}'; +} + +button, input[type="reset"], input[type="submit"], input[type="button"] { + border-width: 1px; + border-color: '#{richSkin.panelBorderColor}'; + + font-size: '#{richSkin.generalSizeFont}'; + font-family: '#{richSkin.generalFamilyFont}'; + color: '#{richSkin.headerTextColor}'; + + background-repeat: repeat-x; + background-position: top left; + background-color: '#{richSkin.headerBackgroundColor}'; + background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; +} + +button[disabled], input[type="reset"][disabled], input[type="submit"][disabled], input[type="button"][disabled] { + color: '#{richSkin.tabDisabledTextColor}'; + border-color: '#{richSkin.tableFooterBackgroundColor}'; + background-color: '#{richSkin.tableFooterBackgroundColor}'; + background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})"; +} + +textarea, input[type="text"], input[type="password"], select { + border-width: 1px; + border-style: inset; + border-color: '#{richSkin.panelBorderColor}'; + + font-size: '#{richSkin.generalSizeFont}'; + font-family: '#{richSkin.generalFamilyFont}'; + color: '#{richSkin.controlTextColor}'; + + background-repeat: no-repeat; + background-position: 1px 1px; + background-color: '#{richSkin.controlBackgroundColor}'; + background-image: "url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})"; +} + +textarea[disabled], input[type="text"][disabled], input[type="password"][disabled], select[disabled] { + color: '#{richSkin.panelBorderColor}'; +} \ No newline at end of file Copied: root/core/trunk/impl/src/main/resources/META-INF/resources/skinning_both.ecss (from rev 17171, root/core/trunk/impl/src/main/resources/META-INF/resources/basic_both.ecss) =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources/skinning_both.ecss (rev 0) +++ root/core/trunk/impl/src/main/resources/META-INF/resources/skinning_both.ecss 2010-05-21 13:05:57 UTC (rev 17173) @@ -0,0 +1,2 @@ +@import url("#{resource['skinning.ecss']}"); +@import url("#{resource['skinning_classes.ecss']}"); \ No newline at end of file Copied: root/core/trunk/impl/src/main/resources/META-INF/resources/skinning_classes.ecss (from rev 17172, root/core/trunk/impl/src/main/resources/META-INF/resources/basic_classes.ecss) =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources/skinning_classes.ecss (rev 0) +++ root/core/trunk/impl/src/main/resources/META-INF/resources/skinning_classes.ecss 2010-05-21 13:05:57 UTC (rev 17173) @@ -0,0 +1,425 @@ +/* basic skinning styles */ + +.rich-container input, .rich-input, .rich-container select, .rich-select, +.rich-container textarea, .rich-textarea, .rich-container button, .rich-button, +.rich-container keygen, .rich-keygen,.rich-container isindex, .rich-isindex, +.rich-container legend, .rich-legend,.rich-container a, .rich-link, +.rich-container fieldset, .rich-fieldset,.rich-field, .rich-field-edit, .rich-field-error, +.rich-button, .rich-button-disabled, .rich-button-over, .rich-button-press { + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.generalFamilyFont}'; + color : '#{richSkin.controlTextColor}'; +} + +.rich-container fieldset, .rich-fieldset { + border-width: 1px; + border-style: solid; + padding: 10px; +} + +.rich-container hr, .rich-hr { + border-width: 1px; + border-style: solid; +} + +.rich-container legend, .rich-legend { + font-weight : bold; +} + +.rich-container form, .rich-form { + padding : 0px; + margin : 0px; +} + +.rich-container fieldset, .rich-fieldset{ + border-color : '#{richSkin.panelBorderColor}'; +} + +.rich-container hr, .rich-hr{ + border-color : '#{richSkin.panelBorderColor}'; +} + +.rich-container a, .rich-link{ + color: '#{richSkin.generalLinkColor}'; +} + +.rich-container a:hover, .rich-link:hover{ + color : '#{richSkin.hoverLinkColor}'; +} + +.rich-container a:visited, .rich-link:visited{ + color : '#{richSkin.visitedLinkColor}'; +} + +.rich-field, .rich-field-edit, .rich-field-error{ + border-width: 1px; + border-style: inset; + border-color: '#{richSkin.panelBorderColor}'; +} + +.rich-field{ + background-color : '#{richSkin.controlBackgroundColor}'; + background-image : "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; + background-repeat : no-repeat; + background-position : 1px 1px; +} + +.rich-field-edit{ + background-color : '#{richSkin.editBackgroundColor}'; +} + +.rich-field-error{ + background-color : '#{richSkin.warningBackgroundColor}'; + background-image : "url(#{resource['org.richfaces.renderkit.html.images.InputErrorIcon']})"; + background-repeat : no-repeat; + background-position : center left; + padding-left : 7px; +} + +.rich-button, .rich-button-disabled, .rich-button-over, .rich-button-press{ + border-width : 1px; + border-style : solid; + border-color : '#{richSkin.panelBorderColor}'; + background-color : '#{richSkin.trimColor}'; + padding : 2px 10px 2px 10px; + text-align : center; + cursor : pointer; + background-repeat : repeat-x; + background-position : top left; +} + +.rich-button{ + background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})"; +} + +.rich-button-disabled{ + background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})"; +} + +.rich-button-over{ + background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})"; +} + +.rich-button-press{ + background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonPressedBgImage']})"; + background-position : bottom left; +} + + /*border color styles*/ + +.rich-box-border-color-control-select{ + border-color : '#{richSkin.selectControlColor}'; +} + +.rich-box-border-color-subborder{ + border-color : '#{richSkin.subBorderColor}'; +} + +.rich-box-border-color-header{ + border-color : '#{richSkin.headerBackgroundColor}'; +} + +.rich-box-border-color-general{ + border-color : '#{richSkin.generalBackgroundColor}'; +} + +.rich-box-border-color-additional{ + border-color : '#{richSkin.additionalBackgroundColor}'; +} + +.rich-box-border-color-panel{ + border-color : '#{richSkin.panelBorderColor}'; +} + +.rich-box-border-color-tip{ + border-color : '#{richSkin.tipBorderColor}'; +} + +.rich-box-border-color-table{ + border-color : '#{richSkin.tableBorderColor}'; +} + +.rich-box-border-control-select, .rich-box-border-subborder, .rich-box-border-header, + .rich-box-border-general, .rich-box-border-additional, .rich-box-border-panel, .rich-box-border-tip, .rich-box-border-table{ + border-style : solid; + border-width : 1px; +} + +.rich-box-border-control-select{ + border-color : '#{richSkin.selectControlColor}'; +} + +.rich-box-border-subborder{ + border-color : '#{richSkin.subBorderColor}'; +} + +.rich-box-border-header{ + border-color : '#{richSkin.headerBackgroundColor}'; +} + +.rich-box-border-general{ + border-color : '#{richSkin.generalBackgroundColor}'; +} + +.rich-box-border-additional{ + border-color : '#{richSkin.additionalBackgroundColor}'; +} + +.rich-box-border-panel{ + border-color : '#{richSkin.panelBorderColor}'; +} + +.rich-box-border-tip{ + border-color : '#{richSkin.tipBorderColor}'; +} + +.rich-box-border-table{ + border-color : '#{richSkin.tableBorderColor}'; +} + + /*background color styles*/ + +.rich-box-bgcolor-header{ + background-color : '#{richSkin.headerBackgroundColor}'; +} + +.rich-box-bgcolor-general{ + background-color : '#{richSkin.generalBackgroundColor}'; +} + +.rich-box-bgcolor-additional{ + background-color : '#{richSkin.additionalBackgroundColor}'; +} + +.rich-box-bgcolor-panel{ + background-color : '#{richSkin.panelBorderColor}'; +} + +.rich-box-bgcolor-tab{ + background-color : '#{richSkin.tabBackgroundColor}'; +} + +.rich-box-bgcolor-trim{ + background-color : '#{richSkin.trimColor}'; +} + +.rich-box-bgcolor-tip{ + background-color : '#{richSkin.tipBackgroundColor}'; +} + +.rich-box-bgcolor-table{ + background-color : '#{richSkin.tableBackgroundColor}'; +} + +.rich-box-bgcolor-table-footer{ + background-color : '#{richSkin.tableFooterBackgroundColor}'; +} + +.rich-box-bgcolor-table-subfooter{ + background-color : '#{richSkin.tableSubfooterBackgroundColor}'; +} + +.rich-box-bgcolor-editor{ + background-color : '#{richSkin.editorBackgroundColor}'; +} + +.rich-box-bgcolor-edit{ + background-color : '#{richSkin.editBackgroundColor}'; +} + + /*text color styles*/ + +.rich-text-color-header{ + color : '#{richSkin.headerTextColor}'; +} + +.rich-text-color-general{ + color : '#{richSkin.generalTextColor}'; +} + +.rich-text-color-tab-disabled{ + color : '#{richSkin.tabDisabledTextColor}'; +} + +.rich-text-color-select{ + color : '#{richSkin.selectControlColor}'; +} + +.rich-text-color-link-general{ + color : '#{richSkin.generalLinkColor}'; +} + +.rich-text-color-link-hover{ + color : '#{richSkin.hoverLinkColor}'; +} + +.rich-text-color-link-visited{ + color : '#{richSkin.visitedLinkColor}'; +} + + /*font size styles*/ + +.rich-font-size-general{ + font-size : '#{richSkin.generalSizeFont}'; +} + +.rich-font-size-header{ + font-size : '#{richSkin.headerSizeFont}'; +} + + /*font family styles*/ + +.rich-font-family-general{ + font-family : '#{richSkin.generalFamilyFont}'; +} + +.rich-font-family-header{ + font-family : '#{richSkin.headerFamilyFont}'; +} + + /* text styles */ + +.rich-text-general{ + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.generalFamilyFont}'; + color : '#{richSkin.generalTextColor}'; +} + +.rich-text-header{ + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.headerFamilyFont}'; + color : '#{richSkin.headerTextColor}'; +} + +.rich-text-tab-disabled{ + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.generalFamilyFont}'; + color : '#{richSkin.tabDisabledTextColor}'; +} + +.rich-text-control-select{ + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.headerFamilyFont}; + color : '#{richSkin.selectControlColor}'; +} + + /*gradient styles*/ + +.rich-gradient-header-inverse{ + background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.HeaderInverseGradientImage']})"; + background-repeat : repeat-x; +} + +.rich-gradient-header{ + background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.HeaderGradientImage']})"; + background-repeat : repeat-x; +} + +.rich-gradient-tab{ + background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.TabGradientImage']})"; + background-repeat : repeat-x; +} + +.rich-gradient-tab-inverse{ + background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.TabInverseGradientImage']})"; + background-repeat : repeat-x; +} + +.rich-gradient-input{ + background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.InputGradientImage']})"; + background-repeat : repeat-x; +} + +.rich-gradient-menu-inverse{ + background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.MenuInverseGradientImage']})"; + background-repeat : repeat-x; +} + +.rich-gradient-menu{ + background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.MenuGradientImage']})"; + background-repeat : repeat-x; +} + +.rich-gradient-button-inverse{ + background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.ButtonInverseGradientImage']})"; + background-repeat : repeat-x; +} + +.rich-gradient-button{ + background-image : "url(#{resource['org.richfaces.renderkit.html.gradientimages.ButtonGradientImage']})"; + background-repeat : repeat-x; +} + +/* extended skinning styles */ + +.rich-container input, .rich-input, +.rich-container select, .rich-select, +.rich-container textarea, .rich-textarea, +.rich-container button, .rich-button, +.rich-container keygen, .rich-keygen, +.rich-container isindex, .rich-isindex { + border-width:1px; + border-color:'#{richSkin.panelBorderColor}'; + color:'#{richSkin.controlTextColor}'; +} + +.rich-container button, .rich-button, +.rich-button-button, +.rich-button-reset, +.rich-button-submit, +.rich-container input[type="reset"], .rich-input-reset, +.rich-container input[type="submit"], .rich-input-submit, +.rich-container input[type="button"], .rich-input-button { + border-width: 1px; + border-color:'#{richSkin.panelBorderColor}'; + + background-repeat : repeat-x; + background-position : top left; + background-color:'#{richSkin.headerBackgroundColor}'; + background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; + + font-size:'#{richSkin.generalSizeFont}'; + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.headerTextColor}'; +} + +.rich-container button[disabled], .rich-button-disabled, +.rich-button-button-disabled, +.rich-button-reset-disabled, +.rich-button-submit-disabled, +.rich-container input[type="reset"][disabled], .rich-input-reset-disabled, +.rich-container input[type="submit"][disabled], .rich-input-submit-disabled, +.rich-container input[type="button"][disabled], .rich-input-button-disabled { + color:'#{richSkin.tabDisabledTextColor}'; + background-color:'#{richSkin.tableFooterBackgroundColor}'; + border-color:'#{richSkin.tableFooterBackgroundColor}'; + background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})"; +} + + +.rich-container textarea, .rich-textarea, +.rich-textarea-textarea, +.rich-container input[type="text"], .rich-input-text, +.rich-container input[type="password"], .rich-input-password, +.rich-container select, .rich-select { + border-width: 1px; + border-style : inset; + border-color:'#{richSkin.panelBorderColor}'; + + background-repeat : no-repeat; + background-position : 1px 1px; + background-color:'#{richSkin.controlBackgroundColor}'; + background-image:"url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})"; + + font-size:'#{richSkin.generalSizeFont}'; + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.controlTextColor}'; +} + +.rich-container textarea[disabled], .rich-textarea-disabled, +.rich-textarea-textarea-disabled, +.rich-container input[type="text"][disabled], .rich-input-text-disabled, +.rich-container input[type="password"][disabled], .rich-input-password-disabled, +.rich-container select[disabled], .rich-select-disabled { + color:'#{richSkin.panelBorderColor}'; +} \ No newline at end of file