Author: nbelaevski
Date: 2008-05-20 13:48:52 -0400 (Tue, 20 May 2008)
New Revision: 8663
Modified:
trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss
trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss
Log:
http://jira.jboss.com/jira/browse/RF-3027
Modified: trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss
===================================================================
---
trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss 2008-05-20
17:35:55 UTC (rev 8662)
+++
trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss 2008-05-20
17:48:52 UTC (rev 8663)
@@ -52,8 +52,15 @@
</u:style>
</u:selector>
+ <u:selector name="*|button[disabled]">
+ <u:style name="color" skin="tabDisabledTextColor" />
+ </u:selector>
+
+ <u:selector name="button[type="button"][disabled],
button[type="reset"][disabled],
button[type="submit"][disabled],
+ input[type="reset"][disabled],
input[type="submit"][disabled],
input[type="button"][disabled]">
+ <u:style name="color" skin="tabDisabledTextColor" />
+ </u:selector>
-
<f:verbatim>
<![CDATA[
*|textarea {
@@ -95,5 +102,13 @@
<f:resource
f:key="org.richfaces.renderkit.html.images.InputBackgroundImage"/>
</u:style>
</u:selector>
-
+
+ <u:selector name="*|textarea[disabled]">
+ <u:style name="color" skin="tableBorderColor" />
+ </u:selector>
+
+ <u:selector name="textarea[type="textarea"][disabled],
input[type="text"][disabled],
input[type="password"][disabled]">
+ <u:style name="color" skin="tableBorderColor" />
+ </u:selector>
+
</f:template>
\ No newline at end of file
Modified:
trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss
===================================================================
---
trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss 2008-05-20
17:35:55 UTC (rev 8662)
+++
trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss 2008-05-20
17:48:52 UTC (rev 8663)
@@ -23,7 +23,7 @@
background-position : top left;
}
- .rich-button,
+ .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,
@@ -51,7 +51,7 @@
</u:selector>
<u:selector name="
- .rich-button,
+ .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,
@@ -71,20 +71,34 @@
</u:selector>
-
+ <u:selector name=".rich-container *|button[disabled]">
+ <u:style name="color" skin="tabDisabledTextColor" />
+ </u:selector>
+
+ <u:selector name=".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">
+ <u:style name="color" skin="tabDisabledTextColor" />
+ </u:selector>
+
+
<f:verbatim>
<![CDATA[
- .rich-container *|textarea, .rich-textarea {
+ .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-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;
@@ -94,7 +108,7 @@
]]>
</f:verbatim>
- <u:selector name=".rich-container *|textarea, .rich-textarea">
+ <u:selector name=".rich-container *|textarea">
<u:style name="border-color" skin="panelBorderColor" />
<u:style name="font-size" skin="generalSizeFont" />
<u:style name="font-family" skin="generalFamilyFont" />
@@ -106,10 +120,10 @@
</u:style>
</u:selector>
- <u:selector name=".rich-textarea,
+ <u:selector name=".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 input[type="password"], .rich-input-password,
.rich-container select, .rich-select">
<u:style name="border-color" skin="panelBorderColor" />
<u:style name="font-size" skin="generalSizeFont" />
@@ -121,4 +135,14 @@
<f:resource
f:key="org.richfaces.renderkit.html.images.InputBackgroundImage"/>
</u:style>
</u:selector>
+
+ <u:selector name=".rich-container *|textarea[disabled]">
+ <u:style name="color" skin="tableBorderColor" />
+ </u:selector>
+
+ <u:selector name=".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">
+ <u:style name="color" skin="tableBorderColor" />
+ </u:selector>
</f:template>
\ No newline at end of file